summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Common/Makefile.mk4
-rw-r--r--cpp/test/Common/TestHelper.cpp4
-rw-r--r--cpp/test/Glacier2/application/Callback.ice4
-rw-r--r--cpp/test/Glacier2/application/Client.cpp4
-rw-r--r--cpp/test/Glacier2/application/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/application/Server.cpp4
-rw-r--r--cpp/test/Glacier2/attack/Backend.ice4
-rw-r--r--cpp/test/Glacier2/attack/BackendI.cpp4
-rw-r--r--cpp/test/Glacier2/attack/BackendI.h4
-rw-r--r--cpp/test/Glacier2/attack/Client.cpp4
-rw-r--r--cpp/test/Glacier2/attack/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/attack/Server.cpp4
-rw-r--r--cpp/test/Glacier2/attack/test.py4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/BackendI.cpp4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/BackendI.h4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Client.cpp4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Server.cpp4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/SessionI.cpp4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/SessionI.h4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Test.ice4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/TestControllerI.h4
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/test.py4
-rw-r--r--cpp/test/Glacier2/hashpassword/test.py4
-rw-r--r--cpp/test/Glacier2/override/Callback.ice4
-rw-r--r--cpp/test/Glacier2/override/CallbackI.cpp4
-rw-r--r--cpp/test/Glacier2/override/CallbackI.h4
-rw-r--r--cpp/test/Glacier2/override/Client.cpp4
-rw-r--r--cpp/test/Glacier2/override/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/override/Server.cpp4
-rw-r--r--cpp/test/Glacier2/override/test.py4
-rw-r--r--cpp/test/Glacier2/router/Callback.ice4
-rw-r--r--cpp/test/Glacier2/router/CallbackI.cpp4
-rw-r--r--cpp/test/Glacier2/router/CallbackI.h4
-rw-r--r--cpp/test/Glacier2/router/Client.cpp4
-rw-r--r--cpp/test/Glacier2/router/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/router/Server.cpp4
-rw-r--r--cpp/test/Glacier2/sessionControl/Client.cpp4
-rw-r--r--cpp/test/Glacier2/sessionControl/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/sessionControl/Server.cpp4
-rw-r--r--cpp/test/Glacier2/sessionControl/Session.ice4
-rw-r--r--cpp/test/Glacier2/sessionControl/SessionI.cpp4
-rw-r--r--cpp/test/Glacier2/sessionControl/SessionI.h4
-rw-r--r--cpp/test/Glacier2/sessionControl/test.py4
-rw-r--r--cpp/test/Glacier2/sessionHelper/Callback.ice4
-rw-r--r--cpp/test/Glacier2/sessionHelper/Client.cpp4
-rw-r--r--cpp/test/Glacier2/sessionHelper/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/sessionHelper/Server.cpp4
-rw-r--r--cpp/test/Glacier2/ssl/Client.cpp4
-rw-r--r--cpp/test/Glacier2/ssl/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/ssl/Server.cpp4
-rw-r--r--cpp/test/Glacier2/ssl/test.py4
-rw-r--r--cpp/test/Glacier2/staticFiltering/Backend.ice4
-rw-r--r--cpp/test/Glacier2/staticFiltering/BackendI.cpp4
-rw-r--r--cpp/test/Glacier2/staticFiltering/BackendI.h4
-rw-r--r--cpp/test/Glacier2/staticFiltering/Client.cpp4
-rw-r--r--cpp/test/Glacier2/staticFiltering/Makefile.mk4
-rw-r--r--cpp/test/Glacier2/staticFiltering/Server.cpp4
-rw-r--r--cpp/test/Glacier2/staticFiltering/test.py4
-rw-r--r--cpp/test/Ice/acm/AllTests.cpp4
-rw-r--r--cpp/test/Ice/acm/Client.cpp4
-rw-r--r--cpp/test/Ice/acm/Server.cpp4
-rw-r--r--cpp/test/Ice/acm/Test.ice4
-rw-r--r--cpp/test/Ice/acm/TestI.cpp4
-rw-r--r--cpp/test/Ice/acm/TestI.h4
-rw-r--r--cpp/test/Ice/adapterDeactivation/AllTests.cpp4
-rw-r--r--cpp/test/Ice/adapterDeactivation/Client.cpp4
-rw-r--r--cpp/test/Ice/adapterDeactivation/Collocated.cpp4
-rw-r--r--cpp/test/Ice/adapterDeactivation/Makefile.mk4
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp4
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.h4
-rw-r--r--cpp/test/Ice/adapterDeactivation/Server.cpp4
-rw-r--r--cpp/test/Ice/adapterDeactivation/Test.ice4
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.cpp4
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.h4
-rw-r--r--cpp/test/Ice/admin/AllTests.cpp4
-rw-r--r--cpp/test/Ice/admin/Client.cpp4
-rw-r--r--cpp/test/Ice/admin/Server.cpp4
-rw-r--r--cpp/test/Ice/admin/Test.ice4
-rw-r--r--cpp/test/Ice/admin/TestI.cpp4
-rw-r--r--cpp/test/Ice/admin/TestI.h4
-rw-r--r--cpp/test/Ice/ami/AllTests.cpp4
-rw-r--r--cpp/test/Ice/ami/Client.cpp4
-rw-r--r--cpp/test/Ice/ami/Collocated.cpp4
-rw-r--r--cpp/test/Ice/ami/Server.cpp4
-rw-r--r--cpp/test/Ice/ami/Test.ice4
-rw-r--r--cpp/test/Ice/ami/TestI.cpp4
-rw-r--r--cpp/test/Ice/ami/TestI.h4
-rw-r--r--cpp/test/Ice/background/Acceptor.cpp4
-rw-r--r--cpp/test/Ice/background/Acceptor.h4
-rw-r--r--cpp/test/Ice/background/AllTests.cpp4
-rw-r--r--cpp/test/Ice/background/Client.cpp4
-rw-r--r--cpp/test/Ice/background/Configuration.cpp4
-rw-r--r--cpp/test/Ice/background/Configuration.h4
-rw-r--r--cpp/test/Ice/background/Connector.cpp4
-rw-r--r--cpp/test/Ice/background/Connector.h4
-rw-r--r--cpp/test/Ice/background/EndpointFactory.cpp4
-rw-r--r--cpp/test/Ice/background/EndpointFactory.h4
-rw-r--r--cpp/test/Ice/background/EndpointI.cpp4
-rw-r--r--cpp/test/Ice/background/EndpointI.h4
-rw-r--r--cpp/test/Ice/background/Makefile.mk4
-rw-r--r--cpp/test/Ice/background/PluginI.cpp4
-rw-r--r--cpp/test/Ice/background/PluginI.h4
-rw-r--r--cpp/test/Ice/background/Server.cpp4
-rw-r--r--cpp/test/Ice/background/Test.ice4
-rw-r--r--cpp/test/Ice/background/TestI.cpp4
-rw-r--r--cpp/test/Ice/background/TestI.h4
-rw-r--r--cpp/test/Ice/background/Transceiver.cpp4
-rw-r--r--cpp/test/Ice/background/Transceiver.h4
-rw-r--r--cpp/test/Ice/binding/AllTests.cpp4
-rw-r--r--cpp/test/Ice/binding/Client.cpp4
-rw-r--r--cpp/test/Ice/binding/Server.cpp4
-rw-r--r--cpp/test/Ice/binding/Test.ice4
-rw-r--r--cpp/test/Ice/binding/TestI.cpp4
-rw-r--r--cpp/test/Ice/binding/TestI.h4
-rw-r--r--cpp/test/Ice/checksum/AllTests.cpp4
-rw-r--r--cpp/test/Ice/checksum/Client.cpp4
-rw-r--r--cpp/test/Ice/checksum/ClientTypes.ice4
-rw-r--r--cpp/test/Ice/checksum/Makefile.mk4
-rw-r--r--cpp/test/Ice/checksum/Server.cpp4
-rw-r--r--cpp/test/Ice/checksum/ServerTypes.ice4
-rw-r--r--cpp/test/Ice/checksum/Test.ice4
-rw-r--r--cpp/test/Ice/checksum/TestI.cpp4
-rw-r--r--cpp/test/Ice/checksum/TestI.h4
-rw-r--r--cpp/test/Ice/custom/AllTests.cpp4
-rw-r--r--cpp/test/Ice/custom/Client.cpp4
-rw-r--r--cpp/test/Ice/custom/Collocated.cpp4
-rw-r--r--cpp/test/Ice/custom/CustomBuffer.h4
-rw-r--r--cpp/test/Ice/custom/CustomMap.h4
-rw-r--r--cpp/test/Ice/custom/Makefile.mk4
-rw-r--r--cpp/test/Ice/custom/MyByteSeq.cpp4
-rw-r--r--cpp/test/Ice/custom/MyByteSeq.h4
-rw-r--r--cpp/test/Ice/custom/Server.cpp4
-rw-r--r--cpp/test/Ice/custom/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/custom/StringConverterI.cpp4
-rw-r--r--cpp/test/Ice/custom/StringConverterI.h4
-rw-r--r--cpp/test/Ice/custom/StringView.h4
-rw-r--r--cpp/test/Ice/custom/Test.ice4
-rw-r--r--cpp/test/Ice/custom/TestAMD.ice4
-rw-r--r--cpp/test/Ice/custom/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/custom/TestAMDI.h4
-rw-r--r--cpp/test/Ice/custom/TestI.cpp4
-rw-r--r--cpp/test/Ice/custom/TestI.h4
-rw-r--r--cpp/test/Ice/custom/Wstring.ice4
-rw-r--r--cpp/test/Ice/custom/WstringAMD.ice4
-rw-r--r--cpp/test/Ice/custom/WstringAMDI.cpp4
-rw-r--r--cpp/test/Ice/custom/WstringAMDI.h4
-rw-r--r--cpp/test/Ice/custom/WstringI.cpp4
-rw-r--r--cpp/test/Ice/custom/WstringI.h4
-rw-r--r--cpp/test/Ice/defaultServant/AllTests.cpp4
-rw-r--r--cpp/test/Ice/defaultServant/Client.cpp4
-rw-r--r--cpp/test/Ice/defaultServant/Makefile.mk4
-rw-r--r--cpp/test/Ice/defaultServant/Test.ice4
-rw-r--r--cpp/test/Ice/defaultServant/TestI.cpp4
-rw-r--r--cpp/test/Ice/defaultServant/TestI.h4
-rw-r--r--cpp/test/Ice/defaultValue/AllTests.cpp4
-rw-r--r--cpp/test/Ice/defaultValue/Client.cpp4
-rw-r--r--cpp/test/Ice/defaultValue/Test.ice4
-rw-r--r--cpp/test/Ice/dispatcher/AllTests.cpp4
-rw-r--r--cpp/test/Ice/dispatcher/Client.cpp4
-rw-r--r--cpp/test/Ice/dispatcher/Collocated.cpp4
-rw-r--r--cpp/test/Ice/dispatcher/Dispatcher.cpp4
-rw-r--r--cpp/test/Ice/dispatcher/Dispatcher.h4
-rw-r--r--cpp/test/Ice/dispatcher/Makefile.mk4
-rw-r--r--cpp/test/Ice/dispatcher/Server.cpp4
-rw-r--r--cpp/test/Ice/dispatcher/Test.ice4
-rw-r--r--cpp/test/Ice/dispatcher/TestI.cpp4
-rw-r--r--cpp/test/Ice/dispatcher/TestI.h4
-rw-r--r--cpp/test/Ice/echo/BlobjectI.cpp4
-rw-r--r--cpp/test/Ice/echo/BlobjectI.h4
-rw-r--r--cpp/test/Ice/echo/Makefile.mk4
-rw-r--r--cpp/test/Ice/echo/Server.cpp4
-rw-r--r--cpp/test/Ice/echo/Test.ice4
-rw-r--r--cpp/test/Ice/echo/test.py4
-rw-r--r--cpp/test/Ice/enums/AllTests.cpp4
-rw-r--r--cpp/test/Ice/enums/Client.cpp4
-rw-r--r--cpp/test/Ice/enums/Server.cpp4
-rw-r--r--cpp/test/Ice/enums/Test.ice4
-rw-r--r--cpp/test/Ice/enums/TestI.cpp4
-rw-r--r--cpp/test/Ice/enums/TestI.h4
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp4
-rw-r--r--cpp/test/Ice/exceptions/Client.cpp4
-rw-r--r--cpp/test/Ice/exceptions/Collocated.cpp4
-rw-r--r--cpp/test/Ice/exceptions/ExceptionsI.cpp4
-rw-r--r--cpp/test/Ice/exceptions/Makefile.mk4
-rw-r--r--cpp/test/Ice/exceptions/Server.cpp4
-rw-r--r--cpp/test/Ice/exceptions/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/exceptions/Test.ice4
-rw-r--r--cpp/test/Ice/exceptions/TestAMD.ice4
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.h4
-rw-r--r--cpp/test/Ice/exceptions/TestI.cpp4
-rw-r--r--cpp/test/Ice/exceptions/TestI.h4
-rw-r--r--cpp/test/Ice/facets/AllTests.cpp4
-rw-r--r--cpp/test/Ice/facets/Client.cpp4
-rw-r--r--cpp/test/Ice/facets/Collocated.cpp4
-rw-r--r--cpp/test/Ice/facets/Server.cpp4
-rw-r--r--cpp/test/Ice/facets/Test.ice4
-rw-r--r--cpp/test/Ice/facets/TestI.cpp4
-rw-r--r--cpp/test/Ice/facets/TestI.h4
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp4
-rw-r--r--cpp/test/Ice/faultTolerance/Client.cpp4
-rw-r--r--cpp/test/Ice/faultTolerance/Server.cpp4
-rw-r--r--cpp/test/Ice/faultTolerance/Test.ice4
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.cpp4
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.h4
-rw-r--r--cpp/test/Ice/gc/Client.cpp4
-rw-r--r--cpp/test/Ice/gc/Test.ice4
-rw-r--r--cpp/test/Ice/gc/test.py4
-rw-r--r--cpp/test/Ice/hash/Client.cpp4
-rw-r--r--cpp/test/Ice/hash/Test.ice4
-rw-r--r--cpp/test/Ice/hold/AllTests.cpp4
-rw-r--r--cpp/test/Ice/hold/Client.cpp4
-rw-r--r--cpp/test/Ice/hold/Server.cpp4
-rw-r--r--cpp/test/Ice/hold/Test.ice4
-rw-r--r--cpp/test/Ice/hold/TestI.cpp4
-rw-r--r--cpp/test/Ice/hold/TestI.h4
-rw-r--r--cpp/test/Ice/impl/Makefile.mk4
-rw-r--r--cpp/test/Ice/impl/Server.cpp4
-rw-r--r--cpp/test/Ice/impl/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/impl/Test.ice4
-rw-r--r--cpp/test/Ice/impl/TestAMD.ice4
-rw-r--r--cpp/test/Ice/info/AllTests.cpp4
-rw-r--r--cpp/test/Ice/info/Client.cpp4
-rw-r--r--cpp/test/Ice/info/Makefile.mk4
-rw-r--r--cpp/test/Ice/info/Server.cpp4
-rw-r--r--cpp/test/Ice/info/Test.ice4
-rw-r--r--cpp/test/Ice/info/TestI.cpp4
-rw-r--r--cpp/test/Ice/info/TestI.h4
-rw-r--r--cpp/test/Ice/inheritance/AllTests.cpp4
-rw-r--r--cpp/test/Ice/inheritance/Client.cpp4
-rw-r--r--cpp/test/Ice/inheritance/Collocated.cpp4
-rw-r--r--cpp/test/Ice/inheritance/Server.cpp4
-rw-r--r--cpp/test/Ice/inheritance/Test.ice4
-rw-r--r--cpp/test/Ice/inheritance/TestI.cpp4
-rw-r--r--cpp/test/Ice/inheritance/TestI.h4
-rw-r--r--cpp/test/Ice/interceptor/AMDInterceptorI.cpp4
-rw-r--r--cpp/test/Ice/interceptor/AMDInterceptorI.h4
-rw-r--r--cpp/test/Ice/interceptor/Client.cpp4
-rw-r--r--cpp/test/Ice/interceptor/InterceptorI.cpp4
-rw-r--r--cpp/test/Ice/interceptor/InterceptorI.h4
-rw-r--r--cpp/test/Ice/interceptor/Makefile.mk4
-rw-r--r--cpp/test/Ice/interceptor/MyObjectI.cpp4
-rw-r--r--cpp/test/Ice/interceptor/MyObjectI.h4
-rw-r--r--cpp/test/Ice/interceptor/Test.ice4
-rw-r--r--cpp/test/Ice/interceptor/TestI.cpp4
-rw-r--r--cpp/test/Ice/invoke/AllTests.cpp4
-rw-r--r--cpp/test/Ice/invoke/BlobjectI.cpp4
-rw-r--r--cpp/test/Ice/invoke/BlobjectI.h4
-rw-r--r--cpp/test/Ice/invoke/Client.cpp4
-rw-r--r--cpp/test/Ice/invoke/Makefile.mk4
-rw-r--r--cpp/test/Ice/invoke/Server.cpp4
-rw-r--r--cpp/test/Ice/invoke/Test.ice4
-rw-r--r--cpp/test/Ice/library/AllTests.cpp4
-rw-r--r--cpp/test/Ice/library/Client.cpp4
-rw-r--r--cpp/test/Ice/library/Consumer.cpp4
-rw-r--r--cpp/test/Ice/library/Makefile.mk4
-rw-r--r--cpp/test/Ice/library/Test.ice4
-rw-r--r--cpp/test/Ice/library/test.py4
-rw-r--r--cpp/test/Ice/location/AllTests.cpp4
-rw-r--r--cpp/test/Ice/location/Client.cpp4
-rw-r--r--cpp/test/Ice/location/Makefile.mk4
-rw-r--r--cpp/test/Ice/location/Server.cpp4
-rw-r--r--cpp/test/Ice/location/ServerLocator.cpp4
-rw-r--r--cpp/test/Ice/location/ServerLocator.h4
-rw-r--r--cpp/test/Ice/location/Test.ice4
-rw-r--r--cpp/test/Ice/location/TestI.cpp4
-rw-r--r--cpp/test/Ice/location/TestI.h4
-rw-r--r--cpp/test/Ice/logger/Client1.cpp4
-rw-r--r--cpp/test/Ice/logger/Client2.cpp4
-rw-r--r--cpp/test/Ice/logger/Client3.cpp4
-rw-r--r--cpp/test/Ice/logger/Client4.cpp4
-rw-r--r--cpp/test/Ice/logger/Client5.cpp4
-rw-r--r--cpp/test/Ice/logger/Makefile.mk4
-rw-r--r--cpp/test/Ice/logger/test.py4
-rw-r--r--cpp/test/Ice/metrics/AllTests.cpp4
-rw-r--r--cpp/test/Ice/metrics/Client.cpp4
-rw-r--r--cpp/test/Ice/metrics/Collocated.cpp4
-rw-r--r--cpp/test/Ice/metrics/InstrumentationI.h4
-rw-r--r--cpp/test/Ice/metrics/Server.cpp4
-rw-r--r--cpp/test/Ice/metrics/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/metrics/Test.ice4
-rw-r--r--cpp/test/Ice/metrics/TestAMD.ice4
-rw-r--r--cpp/test/Ice/metrics/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/metrics/TestAMDI.h4
-rw-r--r--cpp/test/Ice/metrics/TestI.cpp4
-rw-r--r--cpp/test/Ice/metrics/TestI.h4
-rw-r--r--cpp/test/Ice/networkProxy/AllTests.cpp4
-rw-r--r--cpp/test/Ice/networkProxy/Client.cpp4
-rw-r--r--cpp/test/Ice/networkProxy/Server.cpp4
-rw-r--r--cpp/test/Ice/networkProxy/Test.ice4
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp4
-rw-r--r--cpp/test/Ice/objects/Client.cpp4
-rw-r--r--cpp/test/Ice/objects/Collocated.cpp4
-rw-r--r--cpp/test/Ice/objects/Derived.ice4
-rw-r--r--cpp/test/Ice/objects/DerivedEx.ice4
-rw-r--r--cpp/test/Ice/objects/Makefile.mk4
-rw-r--r--cpp/test/Ice/objects/Server.cpp4
-rw-r--r--cpp/test/Ice/objects/Test.ice4
-rw-r--r--cpp/test/Ice/objects/TestI.cpp4
-rw-r--r--cpp/test/Ice/objects/TestI.h4
-rw-r--r--cpp/test/Ice/objects/TestIntfI.cpp4
-rw-r--r--cpp/test/Ice/operations/AllTests.cpp4
-rw-r--r--cpp/test/Ice/operations/BatchOneways.cpp4
-rw-r--r--cpp/test/Ice/operations/BatchOnewaysAMI.cpp4
-rw-r--r--cpp/test/Ice/operations/Client.cpp4
-rw-r--r--cpp/test/Ice/operations/Collocated.cpp4
-rw-r--r--cpp/test/Ice/operations/Makefile.mk4
-rw-r--r--cpp/test/Ice/operations/Oneways.cpp4
-rw-r--r--cpp/test/Ice/operations/OnewaysAMI.cpp4
-rw-r--r--cpp/test/Ice/operations/Server.cpp4
-rw-r--r--cpp/test/Ice/operations/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/operations/Test.ice4
-rw-r--r--cpp/test/Ice/operations/TestAMD.ice4
-rw-r--r--cpp/test/Ice/operations/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/operations/TestAMDI.h4
-rw-r--r--cpp/test/Ice/operations/TestI.cpp4
-rw-r--r--cpp/test/Ice/operations/TestI.h4
-rw-r--r--cpp/test/Ice/operations/Twoways.cpp4
-rw-r--r--cpp/test/Ice/operations/TwowaysAMI.cpp4
-rw-r--r--cpp/test/Ice/optional/AllTests.cpp4
-rw-r--r--cpp/test/Ice/optional/Client.cpp4
-rw-r--r--cpp/test/Ice/optional/CustomMap.h4
-rw-r--r--cpp/test/Ice/optional/Server.cpp4
-rw-r--r--cpp/test/Ice/optional/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/optional/StringView.h4
-rw-r--r--cpp/test/Ice/optional/Test.ice4
-rw-r--r--cpp/test/Ice/optional/TestAMD.ice4
-rw-r--r--cpp/test/Ice/optional/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/optional/TestAMDI.h4
-rw-r--r--cpp/test/Ice/optional/TestI.cpp4
-rw-r--r--cpp/test/Ice/optional/TestI.h4
-rw-r--r--cpp/test/Ice/plugin/Client.cpp4
-rw-r--r--cpp/test/Ice/plugin/Makefile.mk4
-rw-r--r--cpp/test/Ice/plugin/Plugin.cpp4
-rw-r--r--cpp/test/Ice/plugin/test.py4
-rw-r--r--cpp/test/Ice/properties/Client.cpp4
-rw-r--r--cpp/test/Ice/proxy/AllTests.cpp4
-rw-r--r--cpp/test/Ice/proxy/Client.cpp4
-rw-r--r--cpp/test/Ice/proxy/Collocated.cpp4
-rw-r--r--cpp/test/Ice/proxy/Server.cpp4
-rw-r--r--cpp/test/Ice/proxy/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/proxy/Test.ice4
-rw-r--r--cpp/test/Ice/proxy/TestAMD.ice4
-rw-r--r--cpp/test/Ice/proxy/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/proxy/TestAMDI.h4
-rw-r--r--cpp/test/Ice/proxy/TestI.cpp4
-rw-r--r--cpp/test/Ice/proxy/TestI.h4
-rw-r--r--cpp/test/Ice/retry/AllTests.cpp4
-rw-r--r--cpp/test/Ice/retry/Client.cpp4
-rw-r--r--cpp/test/Ice/retry/Collocated.cpp4
-rw-r--r--cpp/test/Ice/retry/InstrumentationI.cpp4
-rw-r--r--cpp/test/Ice/retry/InstrumentationI.h4
-rw-r--r--cpp/test/Ice/retry/Makefile.mk4
-rw-r--r--cpp/test/Ice/retry/Server.cpp4
-rw-r--r--cpp/test/Ice/retry/SystemFailure.h4
-rw-r--r--cpp/test/Ice/retry/Test.ice4
-rw-r--r--cpp/test/Ice/retry/TestI.cpp4
-rw-r--r--cpp/test/Ice/retry/TestI.h4
-rw-r--r--cpp/test/Ice/scope/AllTests.cpp4
-rw-r--r--cpp/test/Ice/scope/Client.cpp4
-rw-r--r--cpp/test/Ice/scope/Server.cpp4
-rw-r--r--cpp/test/Ice/scope/Test.ice4
-rw-r--r--cpp/test/Ice/servantLocator/AllTests.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/Client.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/Collocated.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/Makefile.mk4
-rw-r--r--cpp/test/Ice/servantLocator/ServantLocatorI.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/ServantLocatorI.h4
-rw-r--r--cpp/test/Ice/servantLocator/Server.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/Test.ice4
-rw-r--r--cpp/test/Ice/servantLocator/TestAMD.ice4
-rw-r--r--cpp/test/Ice/servantLocator/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/TestAMDI.h4
-rw-r--r--cpp/test/Ice/servantLocator/TestI.cpp4
-rw-r--r--cpp/test/Ice/servantLocator/TestI.h4
-rw-r--r--cpp/test/Ice/services/AllTests.cpp4
-rw-r--r--cpp/test/Ice/services/Client.cpp4
-rw-r--r--cpp/test/Ice/services/Makefile.mk4
-rw-r--r--cpp/test/Ice/services/Test.ice4
-rw-r--r--cpp/test/Ice/slicing/exceptions/AllTests.cpp4
-rw-r--r--cpp/test/Ice/slicing/exceptions/Client.cpp4
-rw-r--r--cpp/test/Ice/slicing/exceptions/ClientPrivate.ice4
-rw-r--r--cpp/test/Ice/slicing/exceptions/Makefile.mk4
-rw-r--r--cpp/test/Ice/slicing/exceptions/Server.cpp4
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivate.ice4
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice4
-rw-r--r--cpp/test/Ice/slicing/exceptions/Test.ice4
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMD.ice4
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.h4
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.cpp4
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.h4
-rw-r--r--cpp/test/Ice/slicing/objects/AllTests.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/Client.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/ClientPrivate.ice4
-rw-r--r--cpp/test/Ice/slicing/objects/Makefile.mk4
-rw-r--r--cpp/test/Ice/slicing/objects/Server.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/ServerAMD.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivate.ice4
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice4
-rw-r--r--cpp/test/Ice/slicing/objects/Test.ice4
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMD.ice4
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.h4
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.h4
-rw-r--r--cpp/test/Ice/stream/Client.cpp4
-rw-r--r--cpp/test/Ice/stream/Test.ice4
-rw-r--r--cpp/test/Ice/stringConverter/Client.cpp4
-rw-r--r--cpp/test/Ice/stringConverter/Makefile.mk4
-rw-r--r--cpp/test/Ice/stringConverter/Server.cpp4
-rw-r--r--cpp/test/Ice/stringConverter/Test.ice4
-rw-r--r--cpp/test/Ice/threadPoolPriority/AllTests.cpp4
-rw-r--r--cpp/test/Ice/threadPoolPriority/Client.cpp4
-rw-r--r--cpp/test/Ice/threadPoolPriority/Makefile.mk4
-rw-r--r--cpp/test/Ice/threadPoolPriority/Server.cpp4
-rw-r--r--cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp4
-rw-r--r--cpp/test/Ice/threadPoolPriority/Test.ice4
-rw-r--r--cpp/test/Ice/threadPoolPriority/TestI.cpp4
-rw-r--r--cpp/test/Ice/threadPoolPriority/TestI.h4
-rw-r--r--cpp/test/Ice/threadPoolPriority/test.py4
-rw-r--r--cpp/test/Ice/timeout/AllTests.cpp4
-rw-r--r--cpp/test/Ice/timeout/Client.cpp4
-rw-r--r--cpp/test/Ice/timeout/Makefile.mk4
-rw-r--r--cpp/test/Ice/timeout/Server.cpp4
-rw-r--r--cpp/test/Ice/timeout/Test.ice4
-rw-r--r--cpp/test/Ice/timeout/TestI.cpp4
-rw-r--r--cpp/test/Ice/timeout/TestI.h4
-rw-r--r--cpp/test/Ice/udp/AllTests.cpp4
-rw-r--r--cpp/test/Ice/udp/Client.cpp4
-rw-r--r--cpp/test/Ice/udp/Server.cpp4
-rw-r--r--cpp/test/Ice/udp/Test.ice4
-rw-r--r--cpp/test/Ice/udp/TestI.cpp4
-rw-r--r--cpp/test/Ice/udp/TestI.h4
-rw-r--r--cpp/test/IceBox/admin/AllTests.cpp4
-rw-r--r--cpp/test/IceBox/admin/Client.cpp4
-rw-r--r--cpp/test/IceBox/admin/Makefile.mk4
-rw-r--r--cpp/test/IceBox/admin/Service.cpp4
-rw-r--r--cpp/test/IceBox/admin/Test.ice4
-rw-r--r--cpp/test/IceBox/admin/TestI.cpp4
-rw-r--r--cpp/test/IceBox/admin/TestI.h4
-rw-r--r--cpp/test/IceBox/configuration/AllTests.cpp4
-rw-r--r--cpp/test/IceBox/configuration/Client.cpp4
-rw-r--r--cpp/test/IceBox/configuration/Makefile.mk4
-rw-r--r--cpp/test/IceBox/configuration/Service.cpp4
-rw-r--r--cpp/test/IceBox/configuration/Test.ice4
-rw-r--r--cpp/test/IceBox/configuration/TestI.cpp4
-rw-r--r--cpp/test/IceBox/configuration/TestI.h4
-rw-r--r--cpp/test/IceBridge/simple/AllTests.cpp4
-rw-r--r--cpp/test/IceBridge/simple/Client.cpp4
-rw-r--r--cpp/test/IceBridge/simple/Server.cpp4
-rw-r--r--cpp/test/IceBridge/simple/Test.ice4
-rw-r--r--cpp/test/IceBridge/simple/TestI.cpp4
-rw-r--r--cpp/test/IceBridge/simple/TestI.h4
-rw-r--r--cpp/test/IceBridge/simple/test.py4
-rw-r--r--cpp/test/IceDiscovery/simple/AllTests.cpp4
-rw-r--r--cpp/test/IceDiscovery/simple/Client.cpp4
-rw-r--r--cpp/test/IceDiscovery/simple/Makefile.mk4
-rw-r--r--cpp/test/IceDiscovery/simple/Server.cpp4
-rw-r--r--cpp/test/IceDiscovery/simple/Test.ice4
-rw-r--r--cpp/test/IceDiscovery/simple/TestI.cpp4
-rw-r--r--cpp/test/IceDiscovery/simple/TestI.h4
-rw-r--r--cpp/test/IceGrid/activation/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/activation/Client.cpp4
-rw-r--r--cpp/test/IceGrid/activation/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/activation/Server.cpp4
-rw-r--r--cpp/test/IceGrid/activation/Test.ice4
-rw-r--r--cpp/test/IceGrid/activation/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/activation/TestI.h4
-rw-r--r--cpp/test/IceGrid/activation/test.py4
-rw-r--r--cpp/test/IceGrid/admin/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/admin/Server.cpp4
-rw-r--r--cpp/test/IceGrid/admin/test.py4
-rw-r--r--cpp/test/IceGrid/allocation/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/allocation/Client.cpp4
-rw-r--r--cpp/test/IceGrid/allocation/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/allocation/PermissionsVerifier.cpp4
-rw-r--r--cpp/test/IceGrid/allocation/Server.cpp4
-rw-r--r--cpp/test/IceGrid/allocation/Test.ice4
-rw-r--r--cpp/test/IceGrid/allocation/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/allocation/TestI.h4
-rw-r--r--cpp/test/IceGrid/allocation/test.py4
-rw-r--r--cpp/test/IceGrid/deployer/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/deployer/Client.cpp4
-rw-r--r--cpp/test/IceGrid/deployer/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/deployer/Server.cpp4
-rw-r--r--cpp/test/IceGrid/deployer/Service.cpp4
-rw-r--r--cpp/test/IceGrid/deployer/Test.ice4
-rw-r--r--cpp/test/IceGrid/deployer/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/deployer/TestI.h4
-rw-r--r--cpp/test/IceGrid/deployer/test.py4
-rw-r--r--cpp/test/IceGrid/distribution/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/distribution/Client.cpp4
-rw-r--r--cpp/test/IceGrid/distribution/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/distribution/Server.cpp4
-rw-r--r--cpp/test/IceGrid/distribution/Test.ice4
-rw-r--r--cpp/test/IceGrid/distribution/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/distribution/TestI.h4
-rw-r--r--cpp/test/IceGrid/distribution/test.py4
-rw-r--r--cpp/test/IceGrid/fileLock/test.py4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Client.cpp4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Server.cpp4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Service.cpp4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Test.ice4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/TestI.h4
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/test.py4
-rw-r--r--cpp/test/IceGrid/replicaGroup/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/replicaGroup/Client.cpp4
-rw-r--r--cpp/test/IceGrid/replicaGroup/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp4
-rw-r--r--cpp/test/IceGrid/replicaGroup/Server.cpp4
-rw-r--r--cpp/test/IceGrid/replicaGroup/Service.cpp4
-rw-r--r--cpp/test/IceGrid/replicaGroup/Test.ice4
-rw-r--r--cpp/test/IceGrid/replicaGroup/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/replicaGroup/TestI.h4
-rw-r--r--cpp/test/IceGrid/replicaGroup/test.py4
-rw-r--r--cpp/test/IceGrid/replication/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/replication/Client.cpp4
-rw-r--r--cpp/test/IceGrid/replication/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/replication/Server.cpp4
-rw-r--r--cpp/test/IceGrid/replication/Test.ice4
-rw-r--r--cpp/test/IceGrid/replication/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/replication/TestI.h4
-rw-r--r--cpp/test/IceGrid/replication/test.py4
-rw-r--r--cpp/test/IceGrid/session/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/session/Client.cpp4
-rw-r--r--cpp/test/IceGrid/session/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/session/PermissionsVerifier.cpp4
-rw-r--r--cpp/test/IceGrid/session/Server.cpp4
-rw-r--r--cpp/test/IceGrid/session/Test.ice4
-rw-r--r--cpp/test/IceGrid/session/test.py4
-rw-r--r--cpp/test/IceGrid/simple/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/simple/Client.cpp4
-rw-r--r--cpp/test/IceGrid/simple/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/simple/Server.cpp4
-rw-r--r--cpp/test/IceGrid/simple/Test.ice4
-rw-r--r--cpp/test/IceGrid/simple/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/simple/TestI.h4
-rw-r--r--cpp/test/IceGrid/update/AllTests.cpp4
-rw-r--r--cpp/test/IceGrid/update/Client.cpp4
-rw-r--r--cpp/test/IceGrid/update/Makefile.mk4
-rw-r--r--cpp/test/IceGrid/update/Server.cpp4
-rw-r--r--cpp/test/IceGrid/update/Test.ice4
-rw-r--r--cpp/test/IceGrid/update/TestI.cpp4
-rw-r--r--cpp/test/IceGrid/update/TestI.h4
-rw-r--r--cpp/test/IceGrid/update/test.py4
-rwxr-xr-xcpp/test/IceSSL/certs/makecerts.py2
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp4
-rw-r--r--cpp/test/IceSSL/configuration/Client.cpp4
-rw-r--r--cpp/test/IceSSL/configuration/Makefile.mk4
-rw-r--r--cpp/test/IceSSL/configuration/Server.cpp4
-rw-r--r--cpp/test/IceSSL/configuration/Test.ice4
-rw-r--r--cpp/test/IceSSL/configuration/TestI.cpp4
-rw-r--r--cpp/test/IceSSL/configuration/TestI.h4
-rw-r--r--cpp/test/IceStorm/federation/Event.ice4
-rw-r--r--cpp/test/IceStorm/federation/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/federation/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/federation/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/federation/test.py4
-rw-r--r--cpp/test/IceStorm/federation2/Event.ice4
-rw-r--r--cpp/test/IceStorm/federation2/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/federation2/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/federation2/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/federation2/test.py4
-rw-r--r--cpp/test/IceStorm/persistent/Client.cpp4
-rw-r--r--cpp/test/IceStorm/persistent/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/persistent/test.py4
-rw-r--r--cpp/test/IceStorm/rep1/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/rep1/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/rep1/Single.ice4
-rw-r--r--cpp/test/IceStorm/rep1/Sub.cpp4
-rw-r--r--cpp/test/IceStorm/rep1/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/rep1/test.py4
-rw-r--r--cpp/test/IceStorm/repgrid/Client.cpp4
-rw-r--r--cpp/test/IceStorm/repgrid/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/repgrid/Single.ice4
-rw-r--r--cpp/test/IceStorm/repgrid/application.xml8
-rw-r--r--cpp/test/IceStorm/repgrid/test.py4
-rw-r--r--cpp/test/IceStorm/repstress/Control.cpp4
-rw-r--r--cpp/test/IceStorm/repstress/Controller.ice4
-rw-r--r--cpp/test/IceStorm/repstress/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/repstress/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/repstress/Single.ice4
-rw-r--r--cpp/test/IceStorm/repstress/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/repstress/test.py4
-rw-r--r--cpp/test/IceStorm/single/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/single/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/single/Single.ice4
-rw-r--r--cpp/test/IceStorm/single/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/single/test.py4
-rw-r--r--cpp/test/IceStorm/stress/Event.ice4
-rw-r--r--cpp/test/IceStorm/stress/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/stress/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/stress/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/stress/test.py4
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Client.cpp4
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Makefile.mk4
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/test.py4
-rw-r--r--cpp/test/IceUtil/inputUtil/Client.cpp4
-rw-r--r--cpp/test/IceUtil/priority/Client.cpp4
-rw-r--r--cpp/test/IceUtil/priority/Makefile.mk4
-rw-r--r--cpp/test/IceUtil/priority/PriorityInversion.cpp4
-rw-r--r--cpp/test/IceUtil/priority/PriorityInversion.h4
-rw-r--r--cpp/test/IceUtil/priority/TestBase.cpp4
-rw-r--r--cpp/test/IceUtil/priority/TestBase.h4
-rw-r--r--cpp/test/IceUtil/priority/TestSuite.cpp4
-rw-r--r--cpp/test/IceUtil/priority/TestSuite.h4
-rw-r--r--cpp/test/IceUtil/priority/ThreadPriority.cpp4
-rw-r--r--cpp/test/IceUtil/priority/ThreadPriority.h4
-rw-r--r--cpp/test/IceUtil/priority/TimerPriority.cpp4
-rw-r--r--cpp/test/IceUtil/priority/TimerPriority.h4
-rw-r--r--cpp/test/IceUtil/priority/test.py4
-rw-r--r--cpp/test/IceUtil/sha1/Client.cpp4
-rw-r--r--cpp/test/IceUtil/stacktrace/Client.cpp4
-rw-r--r--cpp/test/IceUtil/stacktrace/test.py4
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.h4
-rw-r--r--cpp/test/IceUtil/thread/Client.cpp4
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.h4
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.h4
-rw-r--r--cpp/test/IceUtil/thread/Makefile.mk4
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.h4
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.h4
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.h4
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.h4
-rw-r--r--cpp/test/IceUtil/thread/SleepTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/SleepTest.h4
-rw-r--r--cpp/test/IceUtil/thread/StartTest.cpp4
-rw-r--r--cpp/test/IceUtil/thread/StartTest.h4
-rw-r--r--cpp/test/IceUtil/thread/TestBase.cpp4
-rw-r--r--cpp/test/IceUtil/thread/TestBase.h4
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.cpp4
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.h4
-rw-r--r--cpp/test/IceUtil/timer/Client.cpp4
-rw-r--r--cpp/test/IceUtil/unicode/Client.cpp4
-rw-r--r--cpp/test/IceUtil/unicode/test.py4
-rw-r--r--cpp/test/IceUtil/uuid/Client.cpp4
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.ice4
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice4
-rw-r--r--cpp/test/Slice/errorDetection/ClassRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DataMemberRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DeclaratorMissing.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DictionaryRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateParameter.ice4
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateThrows.ice4
-rw-r--r--cpp/test/Slice/errorDetection/EnumEmpty.ice4
-rw-r--r--cpp/test/Slice/errorDetection/EnumRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorDuplication.ice4
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorValues.ice4
-rw-r--r--cpp/test/Slice/errorDetection/ExceptionRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDeclaration.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalIdentifier.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.ice4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice4
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceMismatch.ice4
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/LocalMismatch.ice4
-rw-r--r--cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice4
-rw-r--r--cpp/test/Slice/errorDetection/NotClassOrInterface.ice4
-rw-r--r--cpp/test/Slice/errorDetection/NotException.ice4
-rw-r--r--cpp/test/Slice/errorDetection/NotType.ice4
-rw-r--r--cpp/test/Slice/errorDetection/OperationRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/OptionalMembers.ice4
-rw-r--r--cpp/test/Slice/errorDetection/OptionalParams.ice4
-rw-r--r--cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsClass.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsModule.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice4
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.ice4
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.ice4
-rw-r--r--cpp/test/Slice/errorDetection/SequenceRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.ice4
-rw-r--r--cpp/test/Slice/errorDetection/StructRedefinition.ice4
-rw-r--r--cpp/test/Slice/errorDetection/Undefined.ice4
-rw-r--r--cpp/test/Slice/errorDetection/WarningClassProxy.ice4
-rw-r--r--cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice4
-rw-r--r--cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice4
-rw-r--r--cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice4
-rw-r--r--cpp/test/Slice/errorDetection/WrongProxyType.ice4
-rw-r--r--cpp/test/Slice/errorDetection/include/IcePrefix.ice4
-rw-r--r--cpp/test/Slice/errorDetection/test.py4
-rw-r--r--cpp/test/Slice/escape/Clash.ice4
-rw-r--r--cpp/test/Slice/escape/Client.cpp4
-rw-r--r--cpp/test/Slice/escape/Key.ice4
-rw-r--r--cpp/test/Slice/escape/Makefile.mk4
-rw-r--r--cpp/test/Slice/headers/test.py4
-rw-r--r--cpp/test/Slice/macros/Client.cpp4
-rw-r--r--cpp/test/Slice/macros/Test.ice4
-rw-r--r--cpp/test/Slice/parser/CircularA.ice4
-rw-r--r--cpp/test/Slice/parser/CircularB.ice4
-rw-r--r--cpp/test/Slice/structure/Client.cpp4
-rw-r--r--cpp/test/Slice/structure/Test.ice4
-rw-r--r--cpp/test/Slice/unicodePaths/test.py4
-rw-r--r--cpp/test/Slice/utf8BOM/Test.ice4
-rw-r--r--cpp/test/include/TestHelper.h4
-rw-r--r--cpp/test/ios/controller/Bundle/ControllerI.mm4
-rw-r--r--cpp/test/ios/controller/Classes/AppDelegate.h4
-rw-r--r--cpp/test/ios/controller/Classes/AppDelegate.m4
-rw-r--r--cpp/test/ios/controller/Classes/ControllerView.h4
-rw-r--r--cpp/test/ios/controller/Classes/ControllerView.m4
-rw-r--r--cpp/test/ios/controller/Classes/main.m4
-rw-r--r--cpp/test/ios/controller/Makefile.mk4
-rw-r--r--cpp/test/uwp/controller/App.xaml.cpp4
-rw-r--r--cpp/test/uwp/controller/App.xaml.h4
-rw-r--r--cpp/test/uwp/controller/ControllerView.xaml2
-rw-r--r--cpp/test/uwp/controller/ControllerView.xaml.cpp4
-rw-r--r--cpp/test/uwp/controller/ControllerView.xaml.h4
733 files changed, 732 insertions, 2200 deletions
diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk
index 81dcf84fcec..825d71e5f8b 100644
--- a/cpp/test/Common/Makefile.mk
+++ b/cpp/test/Common/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = TestCommon
$(project)_caninstall := no
diff --git a/cpp/test/Common/TestHelper.cpp b/cpp/test/Common/TestHelper.cpp
index 13b44569633..304dea939b0 100644
--- a/cpp/test/Common/TestHelper.cpp
+++ b/cpp/test/Common/TestHelper.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestHelper.h>
#include <Ice/RegisterPlugins.h>
diff --git a/cpp/test/Glacier2/application/Callback.ice b/cpp/test/Glacier2/application/Callback.ice
index 31a809f526c..260386c31b5 100644
--- a/cpp/test/Glacier2/application/Callback.ice
+++ b/cpp/test/Glacier2/application/Callback.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp
index 52e96a3bd14..beed2de0ec6 100644
--- a/cpp/test/Glacier2/application/Client.cpp
+++ b/cpp/test/Glacier2/application/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/application/Makefile.mk b/cpp/test/Glacier2/application/Makefile.mk
index d96e8f5da5c..23916e5dece 100644
--- a/cpp/test/Glacier2/application/Makefile.mk
+++ b/cpp/test/Glacier2/application/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp Callback.ice
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/application/Server.cpp b/cpp/test/Glacier2/application/Server.cpp
index 93ad30b1a20..0f3170e7933 100644
--- a/cpp/test/Glacier2/application/Server.cpp
+++ b/cpp/test/Glacier2/application/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/attack/Backend.ice b/cpp/test/Glacier2/attack/Backend.ice
index c59dddf09ad..6d4ed9e5a07 100644
--- a/cpp/test/Glacier2/attack/Backend.ice
+++ b/cpp/test/Glacier2/attack/Backend.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/attack/BackendI.cpp b/cpp/test/Glacier2/attack/BackendI.cpp
index baaeeadb5fc..a2488a231e9 100644
--- a/cpp/test/Glacier2/attack/BackendI.cpp
+++ b/cpp/test/Glacier2/attack/BackendI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <BackendI.h>
diff --git a/cpp/test/Glacier2/attack/BackendI.h b/cpp/test/Glacier2/attack/BackendI.h
index f25e6c12799..a22383abb94 100644
--- a/cpp/test/Glacier2/attack/BackendI.h
+++ b/cpp/test/Glacier2/attack/BackendI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef BACKEND_I_H
#define BACKEND_I_H
diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index 7a6c4a765ba..f0fe833161e 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/attack/Makefile.mk b/cpp/test/Glacier2/attack/Makefile.mk
index 70c2c54f5a3..8bf356086ec 100644
--- a/cpp/test/Glacier2/attack/Makefile.mk
+++ b/cpp/test/Glacier2/attack/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp
index 9622c73a684..7fa07896709 100644
--- a/cpp/test/Glacier2/attack/Server.cpp
+++ b/cpp/test/Glacier2/attack/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Glacier2/attack/test.py b/cpp/test/Glacier2/attack/test.py
index ac7bacae855..a67cc5333d6 100644
--- a/cpp/test/Glacier2/attack/test.py
+++ b/cpp/test/Glacier2/attack/test.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
Glacier2TestSuite(__name__, routerProps = { "Glacier2.RoutingTable.MaxSize" : 10 })
diff --git a/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp b/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
index 9506851b99e..b8e580d3489 100644
--- a/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <BackendI.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/BackendI.h b/cpp/test/Glacier2/dynamicFiltering/BackendI.h
index aea247656df..bf17a14fa6a 100644
--- a/cpp/test/Glacier2/dynamicFiltering/BackendI.h
+++ b/cpp/test/Glacier2/dynamicFiltering/BackendI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef BACKEND_I_H
#define BACKEND_I_H
diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index 37494cf179a..87acfd20165 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/Router.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
index 2083403f867..4232e898687 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
+++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = Glacier2 Ice TestCommon
diff --git a/cpp/test/Glacier2/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp
index 8483183b76f..02781f7e8b9 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Locator.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp b/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
index 41df60f37a1..af7f4f04428 100644
--- a/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <SessionI.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.h b/cpp/test/Glacier2/dynamicFiltering/SessionI.h
index 882aa77baad..0e5ba644553 100644
--- a/cpp/test/Glacier2/dynamicFiltering/SessionI.h
+++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SESSION_I_H
#define SESSION_I_H
diff --git a/cpp/test/Glacier2/dynamicFiltering/Test.ice b/cpp/test/Glacier2/dynamicFiltering/Test.ice
index b5bb31fc2ba..8b740d297da 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Test.ice
+++ b/cpp/test/Glacier2/dynamicFiltering/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
index bf3dccd8d2c..b95aa4ffa07 100644
--- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestControllerI.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
index 4a06d7d9785..371992ebb89 100644
--- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
+++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_CONTROLLER_H
#define TEST_CONTROLLER_H
diff --git a/cpp/test/Glacier2/dynamicFiltering/test.py b/cpp/test/Glacier2/dynamicFiltering/test.py
index 73de5147cc4..8de08a255ac 100644
--- a/cpp/test/Glacier2/dynamicFiltering/test.py
+++ b/cpp/test/Glacier2/dynamicFiltering/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Note: we limit the send buffer size with Ice.TCP.SndSize, the
diff --git a/cpp/test/Glacier2/hashpassword/test.py b/cpp/test/Glacier2/hashpassword/test.py
index cdf6881ed60..9e4cc80f861 100644
--- a/cpp/test/Glacier2/hashpassword/test.py
+++ b/cpp/test/Glacier2/hashpassword/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class Glacier2HashPasswordTestCase(ClientTestCase):
diff --git a/cpp/test/Glacier2/override/Callback.ice b/cpp/test/Glacier2/override/Callback.ice
index 963607d1b80..6f5c8bb3b13 100644
--- a/cpp/test/Glacier2/override/Callback.ice
+++ b/cpp/test/Glacier2/override/Callback.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/override/CallbackI.cpp b/cpp/test/Glacier2/override/CallbackI.cpp
index 2d06f4ea50b..53968ee4bea 100644
--- a/cpp/test/Glacier2/override/CallbackI.cpp
+++ b/cpp/test/Glacier2/override/CallbackI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <CallbackI.h>
diff --git a/cpp/test/Glacier2/override/CallbackI.h b/cpp/test/Glacier2/override/CallbackI.h
index e14f0af2569..2dbfac8750b 100644
--- a/cpp/test/Glacier2/override/CallbackI.h
+++ b/cpp/test/Glacier2/override/CallbackI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp
index 6000ce33b34..1b8d5833b36 100644
--- a/cpp/test/Glacier2/override/Client.cpp
+++ b/cpp/test/Glacier2/override/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/override/Makefile.mk b/cpp/test/Glacier2/override/Makefile.mk
index 75d21ccdaaf..ca2fc4153cf 100644
--- a/cpp/test/Glacier2/override/Makefile.mk
+++ b/cpp/test/Glacier2/override/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/override/Server.cpp b/cpp/test/Glacier2/override/Server.cpp
index 6d2fb59713f..61df40c3658 100644
--- a/cpp/test/Glacier2/override/Server.cpp
+++ b/cpp/test/Glacier2/override/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Glacier2/override/test.py b/cpp/test/Glacier2/override/test.py
index 436df6e3a2b..232283fe93c 100644
--- a/cpp/test/Glacier2/override/test.py
+++ b/cpp/test/Glacier2/override/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Note: we limit the send buffer size with Ice.TCP.SndSize, the
diff --git a/cpp/test/Glacier2/router/Callback.ice b/cpp/test/Glacier2/router/Callback.ice
index 6761dc5d965..fb68a474a17 100644
--- a/cpp/test/Glacier2/router/Callback.ice
+++ b/cpp/test/Glacier2/router/Callback.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/router/CallbackI.cpp b/cpp/test/Glacier2/router/CallbackI.cpp
index 37b931b1ff9..eba5aa33b2a 100644
--- a/cpp/test/Glacier2/router/CallbackI.cpp
+++ b/cpp/test/Glacier2/router/CallbackI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <CallbackI.h>
diff --git a/cpp/test/Glacier2/router/CallbackI.h b/cpp/test/Glacier2/router/CallbackI.h
index c9b503fa039..31ea2c3ecd3 100644
--- a/cpp/test/Glacier2/router/CallbackI.h
+++ b/cpp/test/Glacier2/router/CallbackI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index 4dac1978b43..24d496b34f1 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Glacier2/router/Makefile.mk b/cpp/test/Glacier2/router/Makefile.mk
index 75d21ccdaaf..ca2fc4153cf 100644
--- a/cpp/test/Glacier2/router/Makefile.mk
+++ b/cpp/test/Glacier2/router/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp
index 7138278c7ef..3b7afc5a76b 100644
--- a/cpp/test/Glacier2/router/Server.cpp
+++ b/cpp/test/Glacier2/router/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index d66a0df828e..b6592cde343 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/Router.h>
diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mk b/cpp/test/Glacier2/sessionControl/Makefile.mk
index 09a3be879e5..c379934940b 100644
--- a/cpp/test/Glacier2/sessionControl/Makefile.mk
+++ b/cpp/test/Glacier2/sessionControl/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = Glacier2 Ice TestCommon
diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp
index ca7a69f13a8..0e05292edc4 100644
--- a/cpp/test/Glacier2/sessionControl/Server.cpp
+++ b/cpp/test/Glacier2/sessionControl/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Glacier2/sessionControl/Session.ice b/cpp/test/Glacier2/sessionControl/Session.ice
index 237b9a03531..5b6f178012e 100644
--- a/cpp/test/Glacier2/sessionControl/Session.ice
+++ b/cpp/test/Glacier2/sessionControl/Session.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/sessionControl/SessionI.cpp b/cpp/test/Glacier2/sessionControl/SessionI.cpp
index cb6d8716c6a..5d25ab239ae 100644
--- a/cpp/test/Glacier2/sessionControl/SessionI.cpp
+++ b/cpp/test/Glacier2/sessionControl/SessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <SessionI.h>
diff --git a/cpp/test/Glacier2/sessionControl/SessionI.h b/cpp/test/Glacier2/sessionControl/SessionI.h
index 88e295468e2..d325ea3ff7d 100644
--- a/cpp/test/Glacier2/sessionControl/SessionI.h
+++ b/cpp/test/Glacier2/sessionControl/SessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SESSION_I_H
#define SESSION_I_H
diff --git a/cpp/test/Glacier2/sessionControl/test.py b/cpp/test/Glacier2/sessionControl/test.py
index 8aa036c782a..44fb393f929 100644
--- a/cpp/test/Glacier2/sessionControl/test.py
+++ b/cpp/test/Glacier2/sessionControl/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Note: we limit the send buffer size with Ice.TCP.SndSize, the
diff --git a/cpp/test/Glacier2/sessionHelper/Callback.ice b/cpp/test/Glacier2/sessionHelper/Callback.ice
index 235566777ad..72f73cf3f06 100644
--- a/cpp/test/Glacier2/sessionHelper/Callback.ice
+++ b/cpp/test/Glacier2/sessionHelper/Callback.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index dbacadef475..be2b034caae 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/sessionHelper/Makefile.mk b/cpp/test/Glacier2/sessionHelper/Makefile.mk
index d96e8f5da5c..23916e5dece 100644
--- a/cpp/test/Glacier2/sessionHelper/Makefile.mk
+++ b/cpp/test/Glacier2/sessionHelper/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp Callback.ice
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/sessionHelper/Server.cpp b/cpp/test/Glacier2/sessionHelper/Server.cpp
index c454afde95b..dd510c28337 100644
--- a/cpp/test/Glacier2/sessionHelper/Server.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp
index ea5e6b4ee3a..bace1ce9100 100644
--- a/cpp/test/Glacier2/ssl/Client.cpp
+++ b/cpp/test/Glacier2/ssl/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/Router.h>
diff --git a/cpp/test/Glacier2/ssl/Makefile.mk b/cpp/test/Glacier2/ssl/Makefile.mk
index 03a5d38c669..b777bea87f1 100644
--- a/cpp/test/Glacier2/ssl/Makefile.mk
+++ b/cpp/test/Glacier2/ssl/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_dependencies = Glacier2
$(test)_server_dependencies = Glacier2 IceSSL
diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp
index a3c59a304dc..cec0703fe1a 100644
--- a/cpp/test/Glacier2/ssl/Server.cpp
+++ b/cpp/test/Glacier2/ssl/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/test/Glacier2/ssl/test.py b/cpp/test/Glacier2/ssl/test.py
index 8eed2d1f7c7..fb3135b0761 100644
--- a/cpp/test/Glacier2/ssl/test.py
+++ b/cpp/test/Glacier2/ssl/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
routerProps = lambda process, current : {
'Ice.Warn.Dispatch' : '0',
diff --git a/cpp/test/Glacier2/staticFiltering/Backend.ice b/cpp/test/Glacier2/staticFiltering/Backend.ice
index c59dddf09ad..6d4ed9e5a07 100644
--- a/cpp/test/Glacier2/staticFiltering/Backend.ice
+++ b/cpp/test/Glacier2/staticFiltering/Backend.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/staticFiltering/BackendI.cpp b/cpp/test/Glacier2/staticFiltering/BackendI.cpp
index baaeeadb5fc..a2488a231e9 100644
--- a/cpp/test/Glacier2/staticFiltering/BackendI.cpp
+++ b/cpp/test/Glacier2/staticFiltering/BackendI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <BackendI.h>
diff --git a/cpp/test/Glacier2/staticFiltering/BackendI.h b/cpp/test/Glacier2/staticFiltering/BackendI.h
index f25e6c12799..a22383abb94 100644
--- a/cpp/test/Glacier2/staticFiltering/BackendI.h
+++ b/cpp/test/Glacier2/staticFiltering/BackendI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef BACKEND_I_H
#define BACKEND_I_H
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index 7063fadfc8b..6d50ee00c89 100644
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/Router.h>
diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mk b/cpp/test/Glacier2/staticFiltering/Makefile.mk
index 70c2c54f5a3..8bf356086ec 100644
--- a/cpp/test/Glacier2/staticFiltering/Makefile.mk
+++ b/cpp/test/Glacier2/staticFiltering/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp
index e614396633a..93446b0575f 100644
--- a/cpp/test/Glacier2/staticFiltering/Server.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <BackendI.h>
diff --git a/cpp/test/Glacier2/staticFiltering/test.py b/cpp/test/Glacier2/staticFiltering/test.py
index 762de66e8bf..d4517bb0242 100644
--- a/cpp/test/Glacier2/staticFiltering/test.py
+++ b/cpp/test/Glacier2/staticFiltering/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import os
diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp
index 30d8faebfba..f9ca74170f4 100644
--- a/cpp/test/Ice/acm/AllTests.cpp
+++ b/cpp/test/Ice/acm/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/acm/Client.cpp b/cpp/test/Ice/acm/Client.cpp
index 9df3dd42b5c..49433933ba3 100644
--- a/cpp/test/Ice/acm/Client.cpp
+++ b/cpp/test/Ice/acm/Client.cpp
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
-// **********************************************************************
+// Copyright (c) ZeroC, Inc. All rights reserved.
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp
index ec15591059d..76800f17d7f 100644
--- a/cpp/test/Ice/acm/Server.cpp
+++ b/cpp/test/Ice/acm/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/acm/Test.ice b/cpp/test/Ice/acm/Test.ice
index b68c5f3bffe..94bafde6dbf 100644
--- a/cpp/test/Ice/acm/Test.ice
+++ b/cpp/test/Ice/acm/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp
index 7561d9ed8f0..92690a432e4 100644
--- a/cpp/test/Ice/acm/TestI.cpp
+++ b/cpp/test/Ice/acm/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/acm/TestI.h b/cpp/test/Ice/acm/TestI.h
index 8b09480b41e..cd0a5aa511f 100644
--- a/cpp/test/Ice/acm/TestI.h
+++ b/cpp/test/Ice/acm/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index a16bf5fd372..b9f70661088 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index 92dc35fc2a2..8af6c47d4c5 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 772c071e3bd..1f6563e24a6 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mk b/cpp/test/Ice/adapterDeactivation/Makefile.mk
index 91997fe4e5e..50393a5e493 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile.mk
+++ b/cpp/test/Ice/adapterDeactivation/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = Server.cpp TestI.cpp Test.ice ServantLocatorI.cpp
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
index 16d54bb5adf..8541917dc04 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
index 997da11bd36..32c56dfb532 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 ab3e485cafb..3a404bbfe77 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice
index e617afd08f7..e1dbeb61c5f 100644
--- a/cpp/test/Ice/adapterDeactivation/Test.ice
+++ b/cpp/test/Ice/adapterDeactivation/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index 73837ea5f7a..55a165da5e2 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h
index df40053483d..e7aeeb53017 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.h
+++ b/cpp/test/Ice/adapterDeactivation/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp
index a4c003d93ac..6d2c87b1124 100644
--- a/cpp/test/Ice/admin/AllTests.cpp
+++ b/cpp/test/Ice/admin/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/admin/Client.cpp b/cpp/test/Ice/admin/Client.cpp
index 360928642fd..0f421cd802d 100644
--- a/cpp/test/Ice/admin/Client.cpp
+++ b/cpp/test/Ice/admin/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp
index d4c46250e17..dbcd8708b85 100644
--- a/cpp/test/Ice/admin/Server.cpp
+++ b/cpp/test/Ice/admin/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/admin/Test.ice b/cpp/test/Ice/admin/Test.ice
index ccdd2129e4d..da8dedb5382 100644
--- a/cpp/test/Ice/admin/Test.ice
+++ b/cpp/test/Ice/admin/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp
index b08d6a2c0ef..aca510ba0da 100644
--- a/cpp/test/Ice/admin/TestI.cpp
+++ b/cpp/test/Ice/admin/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/admin/TestI.h b/cpp/test/Ice/admin/TestI.h
index 3f670667fb6..df32e65d07d 100644
--- a/cpp/test/Ice/admin/TestI.h
+++ b/cpp/test/Ice/admin/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
index d1e8e260a69..cb980d1d083 100644
--- a/cpp/test/Ice/ami/AllTests.cpp
+++ b/cpp/test/Ice/ami/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp
index a163a4ff77c..3118643f09d 100644
--- a/cpp/test/Ice/ami/Client.cpp
+++ b/cpp/test/Ice/ami/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp
index 7f26d7e466b..1a414087fc4 100644
--- a/cpp/test/Ice/ami/Collocated.cpp
+++ b/cpp/test/Ice/ami/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp
index 2f96e4cea27..7972222a805 100644
--- a/cpp/test/Ice/ami/Server.cpp
+++ b/cpp/test/Ice/ami/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice
index 421decca079..0d3c21ce789 100644
--- a/cpp/test/Ice/ami/Test.ice
+++ b/cpp/test/Ice/ami/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp
index aca0f3e9d9d..20317379558 100644
--- a/cpp/test/Ice/ami/TestI.cpp
+++ b/cpp/test/Ice/ami/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
index c49f2d96dc4..ab27eee7b6d 100644
--- a/cpp/test/Ice/ami/TestI.h
+++ b/cpp/test/Ice/ami/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/background/Acceptor.cpp b/cpp/test/Ice/background/Acceptor.cpp
index d860275400f..96666fce577 100644
--- a/cpp/test/Ice/background/Acceptor.cpp
+++ b/cpp/test/Ice/background/Acceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Acceptor.h b/cpp/test/Ice/background/Acceptor.h
index a6bf6a9bab7..aea0a940337 100644
--- a/cpp/test/Ice/background/Acceptor.h
+++ b/cpp/test/Ice/background/Acceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_ACCEPTOR_H
#define TEST_ACCEPTOR_H
diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp
index 203f86f05ff..adc5cbc6af6 100644
--- a/cpp/test/Ice/background/AllTests.cpp
+++ b/cpp/test/Ice/background/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp
index 908939dee44..08156ef4410 100644
--- a/cpp/test/Ice/background/Client.cpp
+++ b/cpp/test/Ice/background/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/background/Configuration.cpp b/cpp/test/Ice/background/Configuration.cpp
index 768a81facf4..8fbc8c11fad 100644
--- a/cpp/test/Ice/background/Configuration.cpp
+++ b/cpp/test/Ice/background/Configuration.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h
index b45577cf75f..49f2bd38660 100644
--- a/cpp/test/Ice/background/Configuration.h
+++ b/cpp/test/Ice/background/Configuration.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_CONFIGURATION_H
#define TEST_CONFIGURATION_H
diff --git a/cpp/test/Ice/background/Connector.cpp b/cpp/test/Ice/background/Connector.cpp
index c8bffb50fa5..6c55110b6b1 100644
--- a/cpp/test/Ice/background/Connector.cpp
+++ b/cpp/test/Ice/background/Connector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Connector.h b/cpp/test/Ice/background/Connector.h
index a1e9c44b1d4..eab74be6280 100644
--- a/cpp/test/Ice/background/Connector.h
+++ b/cpp/test/Ice/background/Connector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_CONNECTOR_H
#define TEST_CONNECTOR_H
diff --git a/cpp/test/Ice/background/EndpointFactory.cpp b/cpp/test/Ice/background/EndpointFactory.cpp
index 7d2683c924e..5638aa56e92 100644
--- a/cpp/test/Ice/background/EndpointFactory.cpp
+++ b/cpp/test/Ice/background/EndpointFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/EndpointFactory.h b/cpp/test/Ice/background/EndpointFactory.h
index 1ae6e88b7b6..4cf7d0e707b 100644
--- a/cpp/test/Ice/background/EndpointFactory.h
+++ b/cpp/test/Ice/background/EndpointFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_ENDPOINT_FACTORY_H
#define TEST_ENDPOINT_FACTORY_H
diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp
index 060f5f8fb5c..16b513bc0c3 100644
--- a/cpp/test/Ice/background/EndpointI.cpp
+++ b/cpp/test/Ice/background/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h
index 402d2827faf..62539c0af7c 100644
--- a/cpp/test/Ice/background/EndpointI.h
+++ b/cpp/test/Ice/background/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_ENDPOINT_I_H
#define TEST_ENDPOINT_I_H
diff --git a/cpp/test/Ice/background/Makefile.mk b/cpp/test/Ice/background/Makefile.mk
index 4a122e25118..a6147f52ecc 100644
--- a/cpp/test/Ice/background/Makefile.mk
+++ b/cpp/test/Ice/background/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestTransport
$(test)_cppflags := -I$(srcdir)
diff --git a/cpp/test/Ice/background/PluginI.cpp b/cpp/test/Ice/background/PluginI.cpp
index 35cc139ec88..71186b34970 100644
--- a/cpp/test/Ice/background/PluginI.cpp
+++ b/cpp/test/Ice/background/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/PluginI.h b/cpp/test/Ice/background/PluginI.h
index aa45418bd08..870a8881077 100644
--- a/cpp/test/Ice/background/PluginI.h
+++ b/cpp/test/Ice/background/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_PLUGIN_H
#define TEST_PLUGIN_H
diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp
index 6fd2f985ad5..84bc7830f03 100644
--- a/cpp/test/Ice/background/Server.cpp
+++ b/cpp/test/Ice/background/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/background/Test.ice b/cpp/test/Ice/background/Test.ice
index b71c554f08c..e65098899eb 100644
--- a/cpp/test/Ice/background/Test.ice
+++ b/cpp/test/Ice/background/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/background/TestI.cpp b/cpp/test/Ice/background/TestI.cpp
index 2036f565bdb..de55833882c 100644
--- a/cpp/test/Ice/background/TestI.cpp
+++ b/cpp/test/Ice/background/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/background/TestI.h b/cpp/test/Ice/background/TestI.h
index 48134d14ada..83a1283252f 100644
--- a/cpp/test/Ice/background/TestI.h
+++ b/cpp/test/Ice/background/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/background/Transceiver.cpp b/cpp/test/Ice/background/Transceiver.cpp
index 1cddedce2f1..f0ab957c01d 100644
--- a/cpp/test/Ice/background/Transceiver.cpp
+++ b/cpp/test/Ice/background/Transceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Transceiver.h b/cpp/test/Ice/background/Transceiver.h
index 93a4597f4fb..16b00799a4f 100644
--- a/cpp/test/Ice/background/Transceiver.h
+++ b/cpp/test/Ice/background/Transceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_TRANSCEIVER_H
#define TEST_TRANSCEIVER_H
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index d6fa1e27d0e..b499d119951 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/binding/Client.cpp b/cpp/test/Ice/binding/Client.cpp
index 360928642fd..0f421cd802d 100644
--- a/cpp/test/Ice/binding/Client.cpp
+++ b/cpp/test/Ice/binding/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp
index 476652d9576..13129c13976 100644
--- a/cpp/test/Ice/binding/Server.cpp
+++ b/cpp/test/Ice/binding/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/binding/Test.ice b/cpp/test/Ice/binding/Test.ice
index 81601a8f60a..a93e5cc08d9 100644
--- a/cpp/test/Ice/binding/Test.ice
+++ b/cpp/test/Ice/binding/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp
index 89d96b691bd..29a252784ec 100644
--- a/cpp/test/Ice/binding/TestI.cpp
+++ b/cpp/test/Ice/binding/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/binding/TestI.h b/cpp/test/Ice/binding/TestI.h
index 59b47e893af..0a70d28ff7c 100644
--- a/cpp/test/Ice/binding/TestI.h
+++ b/cpp/test/Ice/binding/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/checksum/AllTests.cpp b/cpp/test/Ice/checksum/AllTests.cpp
index f1cc344aadc..1d76abfb2ec 100644
--- a/cpp/test/Ice/checksum/AllTests.cpp
+++ b/cpp/test/Ice/checksum/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/checksum/Client.cpp b/cpp/test/Ice/checksum/Client.cpp
index 17e4958dfb5..74e136c8a7b 100644
--- a/cpp/test/Ice/checksum/Client.cpp
+++ b/cpp/test/Ice/checksum/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/checksum/ClientTypes.ice b/cpp/test/Ice/checksum/ClientTypes.ice
index c4f972f0233..0c4052d76b0 100644
--- a/cpp/test/Ice/checksum/ClientTypes.ice
+++ b/cpp/test/Ice/checksum/ClientTypes.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/checksum/Makefile.mk b/cpp/test/Ice/checksum/Makefile.mk
index af0c8c1444b..c4f9599b6b5 100644
--- a/cpp/test/Ice/checksum/Makefile.mk
+++ b/cpp/test/Ice/checksum/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_sliceflags = --checksum
$(test)_client_sources = $(test-client-sources) ClientTypes.ice
diff --git a/cpp/test/Ice/checksum/Server.cpp b/cpp/test/Ice/checksum/Server.cpp
index 2ff107d5811..ebefed26bf4 100644
--- a/cpp/test/Ice/checksum/Server.cpp
+++ b/cpp/test/Ice/checksum/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/checksum/ServerTypes.ice b/cpp/test/Ice/checksum/ServerTypes.ice
index 076b7ece96b..91ebef57d43 100644
--- a/cpp/test/Ice/checksum/ServerTypes.ice
+++ b/cpp/test/Ice/checksum/ServerTypes.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/checksum/Test.ice b/cpp/test/Ice/checksum/Test.ice
index aaa305e5e23..eef4fe6b1e3 100644
--- a/cpp/test/Ice/checksum/Test.ice
+++ b/cpp/test/Ice/checksum/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/checksum/TestI.cpp b/cpp/test/Ice/checksum/TestI.cpp
index 1bb00ccbe66..90d251dd42a 100644
--- a/cpp/test/Ice/checksum/TestI.cpp
+++ b/cpp/test/Ice/checksum/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/SliceChecksums.h>
diff --git a/cpp/test/Ice/checksum/TestI.h b/cpp/test/Ice/checksum/TestI.h
index 9c4a12aa2bc..8f9fdbb9de5 100644
--- a/cpp/test/Ice/checksum/TestI.h
+++ b/cpp/test/Ice/checksum/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index feb5eb110d5..d5255a187a9 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Iterator.h>
diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp
index 9bc36a3ae53..2f58d0e1773 100644
--- a/cpp/test/Ice/custom/Client.cpp
+++ b/cpp/test/Ice/custom/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp
index 6ce25027452..d998e2f5ef3 100644
--- a/cpp/test/Ice/custom/Collocated.cpp
+++ b/cpp/test/Ice/custom/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/custom/CustomBuffer.h b/cpp/test/Ice/custom/CustomBuffer.h
index dafa058895a..c5e81565075 100644
--- a/cpp/test/Ice/custom/CustomBuffer.h
+++ b/cpp/test/Ice/custom/CustomBuffer.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CUSTOM_BUFFER_H
#define CUSTOM_BUFFER_H
diff --git a/cpp/test/Ice/custom/CustomMap.h b/cpp/test/Ice/custom/CustomMap.h
index b099f7b45b5..bde12a29777 100644
--- a/cpp/test/Ice/custom/CustomMap.h
+++ b/cpp/test/Ice/custom/CustomMap.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CUSTOM_MAP_H
#define CUSTOM_MAP_H
diff --git a/cpp/test/Ice/custom/Makefile.mk b/cpp/test/Ice/custom/Makefile.mk
index bb7a6bed236..d0c442bfc97 100644
--- a/cpp/test/Ice/custom/Makefile.mk
+++ b/cpp/test/Ice/custom/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp \
AllTests.cpp \
diff --git a/cpp/test/Ice/custom/MyByteSeq.cpp b/cpp/test/Ice/custom/MyByteSeq.cpp
index 57823082e54..5e81f8121fa 100644
--- a/cpp/test/Ice/custom/MyByteSeq.cpp
+++ b/cpp/test/Ice/custom/MyByteSeq.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <MyByteSeq.h>
diff --git a/cpp/test/Ice/custom/MyByteSeq.h b/cpp/test/Ice/custom/MyByteSeq.h
index fc9afb1dae9..ff0df591517 100644
--- a/cpp/test/Ice/custom/MyByteSeq.h
+++ b/cpp/test/Ice/custom/MyByteSeq.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_MY_BYTE_SEQ_H
#define TEST_MY_BYTE_SEQ_H
diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp
index a3eb27bc7d1..c206a669bbe 100644
--- a/cpp/test/Ice/custom/Server.cpp
+++ b/cpp/test/Ice/custom/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index 01d993b8efe..c5deb710ff5 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp
index 42e20410fe7..ded10b7b228 100644
--- a/cpp/test/Ice/custom/StringConverterI.cpp
+++ b/cpp/test/Ice/custom/StringConverterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <StringConverterI.h>
diff --git a/cpp/test/Ice/custom/StringConverterI.h b/cpp/test/Ice/custom/StringConverterI.h
index 20b7f612421..626c5fc428c 100644
--- a/cpp/test/Ice/custom/StringConverterI.h
+++ b/cpp/test/Ice/custom/StringConverterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef STRING_CONVERTER_I_H
#define STRING_CONVERTER_I_H
diff --git a/cpp/test/Ice/custom/StringView.h b/cpp/test/Ice/custom/StringView.h
index ef1d28230f6..c202d3ce8d7 100644
--- a/cpp/test/Ice/custom/StringView.h
+++ b/cpp/test/Ice/custom/StringView.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef STRING_VIEW_H
#define STRING_VIEW_H
diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice
index df0d8f58496..7a60b54eff4 100644
--- a/cpp/test/Ice/custom/Test.ice
+++ b/cpp/test/Ice/custom/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice
index d6ed4372b38..2c950b6c58e 100644
--- a/cpp/test/Ice/custom/TestAMD.ice
+++ b/cpp/test/Ice/custom/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp
index 6e225831a4f..92091a2c0ee 100644
--- a/cpp/test/Ice/custom/TestAMDI.cpp
+++ b/cpp/test/Ice/custom/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h
index 7b3ae3dd083..1a29ce971af 100644
--- a/cpp/test/Ice/custom/TestAMDI.h
+++ b/cpp/test/Ice/custom/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp
index 69bea0b4779..7507868fbd1 100644
--- a/cpp/test/Ice/custom/TestI.cpp
+++ b/cpp/test/Ice/custom/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h
index 62e603b4e11..058072d43c1 100644
--- a/cpp/test/Ice/custom/TestI.h
+++ b/cpp/test/Ice/custom/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/custom/Wstring.ice b/cpp/test/Ice/custom/Wstring.ice
index 37adafbc923..5bf8f368582 100644
--- a/cpp/test/Ice/custom/Wstring.ice
+++ b/cpp/test/Ice/custom/Wstring.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/WstringAMD.ice b/cpp/test/Ice/custom/WstringAMD.ice
index a233f6f82c4..abacf6ffce0 100644
--- a/cpp/test/Ice/custom/WstringAMD.ice
+++ b/cpp/test/Ice/custom/WstringAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp
index 118ac725a8f..24b44670a30 100644
--- a/cpp/test/Ice/custom/WstringAMDI.cpp
+++ b/cpp/test/Ice/custom/WstringAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <WstringAMDI.h>
diff --git a/cpp/test/Ice/custom/WstringAMDI.h b/cpp/test/Ice/custom/WstringAMDI.h
index 7b92eb5472f..a6268130b52 100644
--- a/cpp/test/Ice/custom/WstringAMDI.h
+++ b/cpp/test/Ice/custom/WstringAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef WSTRINGAMD_I_H
#define WSTRINGAMD_I_H
diff --git a/cpp/test/Ice/custom/WstringI.cpp b/cpp/test/Ice/custom/WstringI.cpp
index a847d0dbefe..38515ac06c8 100644
--- a/cpp/test/Ice/custom/WstringI.cpp
+++ b/cpp/test/Ice/custom/WstringI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <WstringI.h>
diff --git a/cpp/test/Ice/custom/WstringI.h b/cpp/test/Ice/custom/WstringI.h
index 01319294a1e..f95cee15c9c 100644
--- a/cpp/test/Ice/custom/WstringI.h
+++ b/cpp/test/Ice/custom/WstringI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef WSTRING_I_H
#define WSTRING_I_H
diff --git a/cpp/test/Ice/defaultServant/AllTests.cpp b/cpp/test/Ice/defaultServant/AllTests.cpp
index 6a0133ecfb0..6ff5aa584a3 100644
--- a/cpp/test/Ice/defaultServant/AllTests.cpp
+++ b/cpp/test/Ice/defaultServant/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/defaultServant/Client.cpp b/cpp/test/Ice/defaultServant/Client.cpp
index 1a24f916bf1..2d596beb2e9 100644
--- a/cpp/test/Ice/defaultServant/Client.cpp
+++ b/cpp/test/Ice/defaultServant/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/defaultServant/Makefile.mk b/cpp/test/Ice/defaultServant/Makefile.mk
index 8be04e0e7ff..99cda2f4236 100644
--- a/cpp/test/Ice/defaultServant/Makefile.mk
+++ b/cpp/test/Ice/defaultServant/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp
diff --git a/cpp/test/Ice/defaultServant/Test.ice b/cpp/test/Ice/defaultServant/Test.ice
index 885d3dd5399..db13e864bd8 100644
--- a/cpp/test/Ice/defaultServant/Test.ice
+++ b/cpp/test/Ice/defaultServant/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/defaultServant/TestI.cpp b/cpp/test/Ice/defaultServant/TestI.cpp
index 86def233827..e439c46e264 100644
--- a/cpp/test/Ice/defaultServant/TestI.cpp
+++ b/cpp/test/Ice/defaultServant/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/defaultServant/TestI.h b/cpp/test/Ice/defaultServant/TestI.h
index 0c842cba754..f838b4061c3 100644
--- a/cpp/test/Ice/defaultServant/TestI.h
+++ b/cpp/test/Ice/defaultServant/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/defaultValue/AllTests.cpp b/cpp/test/Ice/defaultValue/AllTests.cpp
index 72f2e00cb99..65fe014a735 100644
--- a/cpp/test/Ice/defaultValue/AllTests.cpp
+++ b/cpp/test/Ice/defaultValue/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/defaultValue/Client.cpp b/cpp/test/Ice/defaultValue/Client.cpp
index c8cc2b4b9c3..383c17ab2ec 100644
--- a/cpp/test/Ice/defaultValue/Client.cpp
+++ b/cpp/test/Ice/defaultValue/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/defaultValue/Test.ice b/cpp/test/Ice/defaultValue/Test.ice
index 3f1ea2a919c..9e591c2b442 100644
--- a/cpp/test/Ice/defaultValue/Test.ice
+++ b/cpp/test/Ice/defaultValue/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp
index 48219e295a9..04fe52b423c 100644
--- a/cpp/test/Ice/dispatcher/AllTests.cpp
+++ b/cpp/test/Ice/dispatcher/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index fa1377a9add..219b5b19710 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp
index 5488daf173d..52fda1a572c 100644
--- a/cpp/test/Ice/dispatcher/Collocated.cpp
+++ b/cpp/test/Ice/dispatcher/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp
index 54f77652ba0..aacac27056d 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.cpp
+++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Dispatcher.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h
index d581b133572..9f5e7de3672 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.h
+++ b/cpp/test/Ice/dispatcher/Dispatcher.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef DISPATCHER_I_H
#define DISPATCHER_I_H
diff --git a/cpp/test/Ice/dispatcher/Makefile.mk b/cpp/test/Ice/dispatcher/Makefile.mk
index 7faa84cfac5..43b3bb1dd05 100644
--- a/cpp/test/Ice/dispatcher/Makefile.mk
+++ b/cpp/test/Ice/dispatcher/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = $(test-client-sources) Dispatcher.cpp
$(test)_server_sources = $(test-server-sources) Dispatcher.cpp
diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp
index 26a140b2245..712e237677d 100644
--- a/cpp/test/Ice/dispatcher/Server.cpp
+++ b/cpp/test/Ice/dispatcher/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/dispatcher/Test.ice b/cpp/test/Ice/dispatcher/Test.ice
index 0ece0f0cded..efe8686040d 100644
--- a/cpp/test/Ice/dispatcher/Test.ice
+++ b/cpp/test/Ice/dispatcher/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/dispatcher/TestI.cpp b/cpp/test/Ice/dispatcher/TestI.cpp
index eb74f5941bf..c6afa5ab403 100644
--- a/cpp/test/Ice/dispatcher/TestI.cpp
+++ b/cpp/test/Ice/dispatcher/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h
index 5fc9ac8b106..2cb1dacd778 100644
--- a/cpp/test/Ice/dispatcher/TestI.h
+++ b/cpp/test/Ice/dispatcher/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/echo/BlobjectI.cpp b/cpp/test/Ice/echo/BlobjectI.cpp
index 67099732320..320f01b63db 100644
--- a/cpp/test/Ice/echo/BlobjectI.cpp
+++ b/cpp/test/Ice/echo/BlobjectI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <BlobjectI.h>
diff --git a/cpp/test/Ice/echo/BlobjectI.h b/cpp/test/Ice/echo/BlobjectI.h
index 9148df698d6..9616154db39 100644
--- a/cpp/test/Ice/echo/BlobjectI.h
+++ b/cpp/test/Ice/echo/BlobjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef BLOBJECT_H
#define BLOBJECT_H
diff --git a/cpp/test/Ice/echo/Makefile.mk b/cpp/test/Ice/echo/Makefile.mk
index 1923663a2c4..22130f1d2e7 100644
--- a/cpp/test/Ice/echo/Makefile.mk
+++ b/cpp/test/Ice/echo/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp
diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp
index af3523abbb4..0d725c2705c 100644
--- a/cpp/test/Ice/echo/Server.cpp
+++ b/cpp/test/Ice/echo/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/echo/Test.ice b/cpp/test/Ice/echo/Test.ice
index f9684eb6186..09e56a31e25 100644
--- a/cpp/test/Ice/echo/Test.ice
+++ b/cpp/test/Ice/echo/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/echo/test.py b/cpp/test/Ice/echo/test.py
index 6372520856c..8740a4f05fe 100644
--- a/cpp/test/Ice/echo/test.py
+++ b/cpp/test/Ice/echo/test.py
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class EchoServerTestCase(ClientServerTestCase):
diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp
index c3e0d1a86e8..251a665864a 100644
--- a/cpp/test/Ice/enums/AllTests.cpp
+++ b/cpp/test/Ice/enums/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp
index 625d866578c..00afd5e43e7 100644
--- a/cpp/test/Ice/enums/Client.cpp
+++ b/cpp/test/Ice/enums/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp
index e4eb53ca0be..f8149492aa0 100644
--- a/cpp/test/Ice/enums/Server.cpp
+++ b/cpp/test/Ice/enums/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/enums/Test.ice b/cpp/test/Ice/enums/Test.ice
index d65c86e4d53..6ef00930842 100644
--- a/cpp/test/Ice/enums/Test.ice
+++ b/cpp/test/Ice/enums/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/enums/TestI.cpp b/cpp/test/Ice/enums/TestI.cpp
index 73e3dc86479..9636e59c6f7 100644
--- a/cpp/test/Ice/enums/TestI.cpp
+++ b/cpp/test/Ice/enums/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/enums/TestI.h b/cpp/test/Ice/enums/TestI.h
index 11acbd75127..b2a3a00a10c 100644
--- a/cpp/test/Ice/enums/TestI.h
+++ b/cpp/test/Ice/enums/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index d2418765683..5c7acaebe10 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index 86128abcd1b..56809fa5ab1 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index de20c505011..bd6ce8477d5 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/exceptions/ExceptionsI.cpp b/cpp/test/Ice/exceptions/ExceptionsI.cpp
index bc0ee55ad21..b076c0a5d36 100644
--- a/cpp/test/Ice/exceptions/ExceptionsI.cpp
+++ b/cpp/test/Ice/exceptions/ExceptionsI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef ICE_AMD_TEST
# include <TestAMD.h>
diff --git a/cpp/test/Ice/exceptions/Makefile.mk b/cpp/test/Ice/exceptions/Makefile.mk
index 9492690c29b..0425f27c021 100644
--- a/cpp/test/Ice/exceptions/Makefile.mk
+++ b/cpp/test/Ice/exceptions/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = $(test-client-sources) ExceptionsI.cpp
$(test)_server_sources = $(test-server-sources) ExceptionsI.cpp
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 5979bf4164a..c157365b29e 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 6f35d073364..310343a874a 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice
index 29646921a5f..01c86f7243c 100644
--- a/cpp/test/Ice/exceptions/Test.ice
+++ b/cpp/test/Ice/exceptions/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice
index c2f70754ab1..60c3191c4d6 100644
--- a/cpp/test/Ice/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/exceptions/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp
index af5b8dcb4e5..159e36ba754 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/exceptions/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h
index e2f04e691bc..3366c462411 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/exceptions/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 e83b7a58cce..d9f1b122098 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h
index 599e879a4d1..773440a5d66 100644
--- a/cpp/test/Ice/exceptions/TestI.h
+++ b/cpp/test/Ice/exceptions/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index d60d3c573ce..88dde541efb 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index e5553e1dcfc..f5f5a62d45a 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index 03ec2755064..297e3b4a986 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index eddff3b0c80..4cca1fbbba0 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice
index 9c2049dde9e..3c5da35dd6c 100644
--- a/cpp/test/Ice/facets/Test.ice
+++ b/cpp/test/Ice/facets/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp
index 6d406d02306..2f51f2288c3 100644
--- a/cpp/test/Ice/facets/TestI.cpp
+++ b/cpp/test/Ice/facets/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h
index a7f61c92661..d3f3025c605 100644
--- a/cpp/test/Ice/facets/TestI.h
+++ b/cpp/test/Ice/facets/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 6ba197b066a..70c075f8b63 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp
index 61197ee2012..d099844ec2a 100644
--- a/cpp/test/Ice/faultTolerance/Client.cpp
+++ b/cpp/test/Ice/faultTolerance/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp
index ee3cf850c9b..f25b42e5ac6 100644
--- a/cpp/test/Ice/faultTolerance/Server.cpp
+++ b/cpp/test/Ice/faultTolerance/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice
index 7d155bcd297..72226e6ac2a 100644
--- a/cpp/test/Ice/faultTolerance/Test.ice
+++ b/cpp/test/Ice/faultTolerance/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 0ea21dfbe74..943e63f5e9d 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h
index b12b5ee5c69..408faa9e9b6 100644
--- a/cpp/test/Ice/faultTolerance/TestI.h
+++ b/cpp/test/Ice/faultTolerance/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index bb71d561661..4bf38d8aa86 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <IceUtil/Mutex.h>
diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice
index 07ec46cf0a9..1b34a90c7b2 100644
--- a/cpp/test/Ice/gc/Test.ice
+++ b/cpp/test/Ice/gc/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/gc/test.py b/cpp/test/Ice/gc/test.py
index 3ce21186bc9..3636632dd89 100644
--- a/cpp/test/Ice/gc/test.py
+++ b/cpp/test/Ice/gc/test.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
TestSuite(__name__, options = { "cpp11" : [False] })
diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp
index 3e08534dc0a..f379f8ebfa5 100644
--- a/cpp/test/Ice/hash/Client.cpp
+++ b/cpp/test/Ice/hash/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/Ice/hash/Test.ice b/cpp/test/Ice/hash/Test.ice
index 5849f27272c..9eca1e22764 100644
--- a/cpp/test/Ice/hash/Test.ice
+++ b/cpp/test/Ice/hash/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp
index d8616a20e7b..ed2242f863c 100644
--- a/cpp/test/Ice/hold/AllTests.cpp
+++ b/cpp/test/Ice/hold/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp
index 1a24f916bf1..2d596beb2e9 100644
--- a/cpp/test/Ice/hold/Client.cpp
+++ b/cpp/test/Ice/hold/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp
index af66c0687a0..662f821e1b5 100644
--- a/cpp/test/Ice/hold/Server.cpp
+++ b/cpp/test/Ice/hold/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/hold/Test.ice b/cpp/test/Ice/hold/Test.ice
index 66ac16fdcbe..7f097ad5d30 100644
--- a/cpp/test/Ice/hold/Test.ice
+++ b/cpp/test/Ice/hold/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/hold/TestI.cpp b/cpp/test/Ice/hold/TestI.cpp
index 54a635c3ca7..0e7f44f8430 100644
--- a/cpp/test/Ice/hold/TestI.cpp
+++ b/cpp/test/Ice/hold/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/hold/TestI.h b/cpp/test/Ice/hold/TestI.h
index 37e1d554f28..93bb3e8f942 100644
--- a/cpp/test/Ice/hold/TestI.h
+++ b/cpp/test/Ice/hold/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/impl/Makefile.mk b/cpp/test/Ice/impl/Makefile.mk
index 6fb01213eb9..e0b294005f9 100644
--- a/cpp/test/Ice/impl/Makefile.mk
+++ b/cpp/test/Ice/impl/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_impl = Test
$(test)_serveramd_impl = TestAMD
diff --git a/cpp/test/Ice/impl/Server.cpp b/cpp/test/Ice/impl/Server.cpp
index d6ac0be17ed..2ad4d4f8714 100644
--- a/cpp/test/Ice/impl/Server.cpp
+++ b/cpp/test/Ice/impl/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/impl/ServerAMD.cpp b/cpp/test/Ice/impl/ServerAMD.cpp
index 06f235c16c6..d631e1a2e83 100644
--- a/cpp/test/Ice/impl/ServerAMD.cpp
+++ b/cpp/test/Ice/impl/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/impl/Test.ice b/cpp/test/Ice/impl/Test.ice
index 58a867270d9..46bb22ed4ed 100644
--- a/cpp/test/Ice/impl/Test.ice
+++ b/cpp/test/Ice/impl/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/impl/TestAMD.ice b/cpp/test/Ice/impl/TestAMD.ice
index 61f7740962b..edc56f85375 100644
--- a/cpp/test/Ice/impl/TestAMD.ice
+++ b/cpp/test/Ice/impl/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp
index d33be6bfe86..acbde197f8e 100644
--- a/cpp/test/Ice/info/AllTests.cpp
+++ b/cpp/test/Ice/info/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceSSL/IceSSL.h>
diff --git a/cpp/test/Ice/info/Client.cpp b/cpp/test/Ice/info/Client.cpp
index 360928642fd..0f421cd802d 100644
--- a/cpp/test/Ice/info/Client.cpp
+++ b/cpp/test/Ice/info/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/info/Makefile.mk b/cpp/test/Ice/info/Makefile.mk
index 729158fd235..b25325f88cc 100644
--- a/cpp/test/Ice/info/Makefile.mk
+++ b/cpp/test/Ice/info/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp
$(test)_dependencies = TestCommon IceSSL Ice
diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp
index 5c14f9e9e9d..58dcf737c2c 100644
--- a/cpp/test/Ice/info/Server.cpp
+++ b/cpp/test/Ice/info/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/info/Test.ice b/cpp/test/Ice/info/Test.ice
index 000e1ac62d0..58d8a045a33 100644
--- a/cpp/test/Ice/info/Test.ice
+++ b/cpp/test/Ice/info/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/info/TestI.cpp b/cpp/test/Ice/info/TestI.cpp
index 9f5dcd8cadd..815304edd14 100644
--- a/cpp/test/Ice/info/TestI.cpp
+++ b/cpp/test/Ice/info/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceSSL/IceSSL.h>
diff --git a/cpp/test/Ice/info/TestI.h b/cpp/test/Ice/info/TestI.h
index 31644b2ed1e..0009ea2c8a4 100644
--- a/cpp/test/Ice/info/TestI.h
+++ b/cpp/test/Ice/info/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index a57ea041410..e74d51c1f5f 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index cc6cbf292b9..0b922d34855 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 88b39c0c5dc..668ed47f157 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index 9c52cf02403..c676112da14 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice
index 6c22cca9133..7172d4b8570 100644
--- a/cpp/test/Ice/inheritance/Test.ice
+++ b/cpp/test/Ice/inheritance/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp
index 940fc58734d..779a9d3f75a 100644
--- a/cpp/test/Ice/inheritance/TestI.cpp
+++ b/cpp/test/Ice/inheritance/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index 3c9a7b76ccd..b0684c7642b 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
index 3fa676eca35..33cfb5e0b38 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <AMDInterceptorI.h>
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.h b/cpp/test/Ice/interceptor/AMDInterceptorI.h
index 4a0c382f9fa..e3180773560 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.h
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef AMD_INTERCEPTOR_I_H
#define AMD_INTERCEPTOR_I_H
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index e6d778bf1de..fd7c8314d26 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/interceptor/InterceptorI.cpp b/cpp/test/Ice/interceptor/InterceptorI.cpp
index 7d6c921e8e2..04b60f7a8f6 100644
--- a/cpp/test/Ice/interceptor/InterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/InterceptorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <InterceptorI.h>
#include <Test.h>
diff --git a/cpp/test/Ice/interceptor/InterceptorI.h b/cpp/test/Ice/interceptor/InterceptorI.h
index a91753e352c..3360af8408b 100644
--- a/cpp/test/Ice/interceptor/InterceptorI.h
+++ b/cpp/test/Ice/interceptor/InterceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INTERCEPTOR_I_H
#define INTERCEPTOR_I_H
diff --git a/cpp/test/Ice/interceptor/Makefile.mk b/cpp/test/Ice/interceptor/Makefile.mk
index a87ea2f9e3f..9cd3052fa4e 100644
--- a/cpp/test/Ice/interceptor/Makefile.mk
+++ b/cpp/test/Ice/interceptor/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp Test.ice TestI.cpp MyObjectI.cpp InterceptorI.cpp AMDInterceptorI.cpp
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index 531856020de..b21c01c7a9b 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <MyObjectI.h>
diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h
index 7de63b4b285..10e2966c582 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.h
+++ b/cpp/test/Ice/interceptor/MyObjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef MY_OBJECT_I_H
#define MY_OBJECT_I_H
diff --git a/cpp/test/Ice/interceptor/Test.ice b/cpp/test/Ice/interceptor/Test.ice
index e2d10f86b66..02ae9a9a690 100644
--- a/cpp/test/Ice/interceptor/Test.ice
+++ b/cpp/test/Ice/interceptor/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/interceptor/TestI.cpp b/cpp/test/Ice/interceptor/TestI.cpp
index d363599e492..785063c7115 100644
--- a/cpp/test/Ice/interceptor/TestI.cpp
+++ b/cpp/test/Ice/interceptor/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INTERCEPTOR_TEST_API_EXPORTS
# define INTERCEPTOR_TEST_API_EXPORTS
diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp
index 7f758d862f1..0940a3f23f2 100644
--- a/cpp/test/Ice/invoke/AllTests.cpp
+++ b/cpp/test/Ice/invoke/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
index f1785e75fec..a12601f8175 100644
--- a/cpp/test/Ice/invoke/BlobjectI.cpp
+++ b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <BlobjectI.h>
diff --git a/cpp/test/Ice/invoke/BlobjectI.h b/cpp/test/Ice/invoke/BlobjectI.h
index a10b9f91fab..2dd4a79bdf8 100644
--- a/cpp/test/Ice/invoke/BlobjectI.h
+++ b/cpp/test/Ice/invoke/BlobjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef BLOBJECT_H
#define BLOBJECT_H
diff --git a/cpp/test/Ice/invoke/Client.cpp b/cpp/test/Ice/invoke/Client.cpp
index 490a992b417..c6026ef3271 100644
--- a/cpp/test/Ice/invoke/Client.cpp
+++ b/cpp/test/Ice/invoke/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/invoke/Makefile.mk b/cpp/test/Ice/invoke/Makefile.mk
index dace4acad22..86cf1a3a91b 100644
--- a/cpp/test/Ice/invoke/Makefile.mk
+++ b/cpp/test/Ice/invoke/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = Server.cpp Test.ice BlobjectI.cpp
diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp
index 0abb10dbb65..93debfdfe77 100644
--- a/cpp/test/Ice/invoke/Server.cpp
+++ b/cpp/test/Ice/invoke/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/invoke/Test.ice b/cpp/test/Ice/invoke/Test.ice
index 3fb8d3df4a9..b45ec485bb9 100644
--- a/cpp/test/Ice/invoke/Test.ice
+++ b/cpp/test/Ice/invoke/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/library/AllTests.cpp b/cpp/test/Ice/library/AllTests.cpp
index 7731ccd960f..ea1f5e57588 100644
--- a/cpp/test/Ice/library/AllTests.cpp
+++ b/cpp/test/Ice/library/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Test.h>
diff --git a/cpp/test/Ice/library/Client.cpp b/cpp/test/Ice/library/Client.cpp
index 720dccdf328..6fa1fd2de70 100644
--- a/cpp/test/Ice/library/Client.cpp
+++ b/cpp/test/Ice/library/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/library/Consumer.cpp b/cpp/test/Ice/library/Consumer.cpp
index 8ebbab4d4ea..f7877d831c6 100644
--- a/cpp/test/Ice/library/Consumer.cpp
+++ b/cpp/test/Ice/library/Consumer.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Test.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/library/Makefile.mk b/cpp/test/Ice/library/Makefile.mk
index 38f54ee5083..1de787395d2 100644
--- a/cpp/test/Ice/library/Makefile.mk
+++ b/cpp/test/Ice/library/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_GenCode $(test)_Consumer $(test)_AllTests
diff --git a/cpp/test/Ice/library/Test.ice b/cpp/test/Ice/library/Test.ice
index 87c0683fc6f..cfec425ca64 100644
--- a/cpp/test/Ice/library/Test.ice
+++ b/cpp/test/Ice/library/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/library/test.py b/cpp/test/Ice/library/test.py
index d85bcd502c8..72ef94d6052 100644
--- a/cpp/test/Ice/library/test.py
+++ b/cpp/test/Ice/library/test.py
@@ -1,7 +1,5 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
TestSuite(__file__, libDirs=["gencode", "consumer", "alltests"])
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index fc2ef64a454..0e94428dacc 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Router.h>
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index 1d5f1390f25..776dd2a5825 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/location/Makefile.mk b/cpp/test/Ice/location/Makefile.mk
index f132663ff11..3292fedf6a5 100644
--- a/cpp/test/Ice/location/Makefile.mk
+++ b/cpp/test/Ice/location/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = $(test-server-sources) ServerLocator.cpp
diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index b5bfae7152d..88769ffcf09 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <ServerLocator.h>
diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp
index 40797c7e35a..2d44ad0c7e4 100644
--- a/cpp/test/Ice/location/ServerLocator.cpp
+++ b/cpp/test/Ice/location/ServerLocator.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/BuiltinSequences.h>
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h
index dcd798d33d2..573c15f0c11 100644
--- a/cpp/test/Ice/location/ServerLocator.h
+++ b/cpp/test/Ice/location/ServerLocator.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 4480ddb4d34..00bc7b3aedb 100644
--- a/cpp/test/Ice/location/Test.ice
+++ b/cpp/test/Ice/location/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp
index 26c626650eb..06dbbe3781a 100644
--- a/cpp/test/Ice/location/TestI.cpp
+++ b/cpp/test/Ice/location/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Locator.h>
diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h
index 1e659891ef7..748bf58c1e9 100644
--- a/cpp/test/Ice/location/TestI.h
+++ b/cpp/test/Ice/location/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/logger/Client1.cpp b/cpp/test/Ice/logger/Client1.cpp
index bd18cd2150a..3207f0134be 100644
--- a/cpp/test/Ice/logger/Client1.cpp
+++ b/cpp/test/Ice/logger/Client1.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/logger/Client2.cpp b/cpp/test/Ice/logger/Client2.cpp
index 492a853a03d..dc24df9d83e 100644
--- a/cpp/test/Ice/logger/Client2.cpp
+++ b/cpp/test/Ice/logger/Client2.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/logger/Client3.cpp b/cpp/test/Ice/logger/Client3.cpp
index 0923ace8833..b3278c78720 100644
--- a/cpp/test/Ice/logger/Client3.cpp
+++ b/cpp/test/Ice/logger/Client3.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/logger/Client4.cpp b/cpp/test/Ice/logger/Client4.cpp
index 863e10112e6..f3ba600af5f 100644
--- a/cpp/test/Ice/logger/Client4.cpp
+++ b/cpp/test/Ice/logger/Client4.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/logger/Client5.cpp b/cpp/test/Ice/logger/Client5.cpp
index 0ddcb3200a1..19cc947bbf1 100644
--- a/cpp/test/Ice/logger/Client5.cpp
+++ b/cpp/test/Ice/logger/Client5.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk
index 4e56a9068ec..12c5f0d6b56 100644
--- a/cpp/test/Ice/logger/Makefile.mk
+++ b/cpp/test/Ice/logger/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = client1 client2 client3 client4 client5
$(test)_libs = iconv
diff --git a/cpp/test/Ice/logger/test.py b/cpp/test/Ice/logger/test.py
index 34eed746f01..d81917a5d88 100644
--- a/cpp/test/Ice/logger/test.py
+++ b/cpp/test/Ice/logger/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import glob
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index d4e8c9a8bb1..2bc48f03f60 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/metrics/Client.cpp b/cpp/test/Ice/metrics/Client.cpp
index faede5a3147..b18327febf3 100644
--- a/cpp/test/Ice/metrics/Client.cpp
+++ b/cpp/test/Ice/metrics/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp
index f8acb90b78d..e5ba7df8bf1 100644
--- a/cpp/test/Ice/metrics/Collocated.cpp
+++ b/cpp/test/Ice/metrics/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/metrics/InstrumentationI.h b/cpp/test/Ice/metrics/InstrumentationI.h
index 263357327ba..a6085725a5c 100644
--- a/cpp/test/Ice/metrics/InstrumentationI.h
+++ b/cpp/test/Ice/metrics/InstrumentationI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INSTRUMENTATION_I_H
#define INSTRUMENTATION_I_H
diff --git a/cpp/test/Ice/metrics/Server.cpp b/cpp/test/Ice/metrics/Server.cpp
index 24c61391537..45d8609ec8a 100644
--- a/cpp/test/Ice/metrics/Server.cpp
+++ b/cpp/test/Ice/metrics/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/metrics/ServerAMD.cpp b/cpp/test/Ice/metrics/ServerAMD.cpp
index 88298a44a91..43934df599f 100644
--- a/cpp/test/Ice/metrics/ServerAMD.cpp
+++ b/cpp/test/Ice/metrics/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/metrics/Test.ice b/cpp/test/Ice/metrics/Test.ice
index 49538e5f5b0..257e113aa59 100644
--- a/cpp/test/Ice/metrics/Test.ice
+++ b/cpp/test/Ice/metrics/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/metrics/TestAMD.ice b/cpp/test/Ice/metrics/TestAMD.ice
index f042f81108a..499d95f23c6 100644
--- a/cpp/test/Ice/metrics/TestAMD.ice
+++ b/cpp/test/Ice/metrics/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/metrics/TestAMDI.cpp b/cpp/test/Ice/metrics/TestAMDI.cpp
index 45d7038f593..2292193071e 100644
--- a/cpp/test/Ice/metrics/TestAMDI.cpp
+++ b/cpp/test/Ice/metrics/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/metrics/TestAMDI.h b/cpp/test/Ice/metrics/TestAMDI.h
index 362b4c02312..4468386930b 100644
--- a/cpp/test/Ice/metrics/TestAMDI.h
+++ b/cpp/test/Ice/metrics/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/metrics/TestI.cpp b/cpp/test/Ice/metrics/TestI.cpp
index 19f8946569b..385d413ce72 100644
--- a/cpp/test/Ice/metrics/TestI.cpp
+++ b/cpp/test/Ice/metrics/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/metrics/TestI.h b/cpp/test/Ice/metrics/TestI.h
index cf1ade529a5..8916133e7f3 100644
--- a/cpp/test/Ice/metrics/TestI.h
+++ b/cpp/test/Ice/metrics/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/networkProxy/AllTests.cpp b/cpp/test/Ice/networkProxy/AllTests.cpp
index ee6c5d1f4b5..b979812be1a 100644
--- a/cpp/test/Ice/networkProxy/AllTests.cpp
+++ b/cpp/test/Ice/networkProxy/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/networkProxy/Client.cpp b/cpp/test/Ice/networkProxy/Client.cpp
index 1a24f916bf1..2d596beb2e9 100644
--- a/cpp/test/Ice/networkProxy/Client.cpp
+++ b/cpp/test/Ice/networkProxy/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/networkProxy/Server.cpp b/cpp/test/Ice/networkProxy/Server.cpp
index b0f5aefd182..96336f468e2 100644
--- a/cpp/test/Ice/networkProxy/Server.cpp
+++ b/cpp/test/Ice/networkProxy/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/networkProxy/Test.ice b/cpp/test/Ice/networkProxy/Test.ice
index 3bbeb49af45..5c177138752 100644
--- a/cpp/test/Ice/networkProxy/Test.ice
+++ b/cpp/test/Ice/networkProxy/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index b104624112c..b47403572e3 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 436197dca9c..4d5dc868b83 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index ed28cbbd32f..077cc2784a1 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/objects/Derived.ice b/cpp/test/Ice/objects/Derived.ice
index d72edb6d4cb..57c75cb5906 100644
--- a/cpp/test/Ice/objects/Derived.ice
+++ b/cpp/test/Ice/objects/Derived.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/DerivedEx.ice b/cpp/test/Ice/objects/DerivedEx.ice
index d37c1af7499..49a06129a65 100644
--- a/cpp/test/Ice/objects/DerivedEx.ice
+++ b/cpp/test/Ice/objects/DerivedEx.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk
index 6ebf64041a5..2a5886d03dd 100644
--- a/cpp/test/Ice/objects/Makefile.mk
+++ b/cpp/test/Ice/objects/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_sliceflags := -I$(test)
$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index d57bdabb05c..e1fad115ab3 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice
index fbd054a8a2a..f019333c638 100644
--- a/cpp/test/Ice/objects/Test.ice
+++ b/cpp/test/Ice/objects/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index 7627de738a4..df86685aa88 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index ee89a5bda6a..4a55bb337f6 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/objects/TestIntfI.cpp b/cpp/test/Ice/objects/TestIntfI.cpp
index eeb8afe2cfe..88b92f4edf6 100644
--- a/cpp/test/Ice/objects/TestIntfI.cpp
+++ b/cpp/test/Ice/objects/TestIntfI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 6038d90b725..b498d5c23f7 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Locator.h>
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp
index 9fd411ce29f..7c23c863f82 100644
--- a/cpp/test/Ice/operations/BatchOneways.cpp
+++ b/cpp/test/Ice/operations/BatchOneways.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
index 02b169ab493..9684545a6ac 100644
--- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index e4831aed0b4..7dedff5ea0d 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index c1d9bea4e07..3f4d00dd484 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/Makefile.mk b/cpp/test/Ice/operations/Makefile.mk
index d7fd0b11d25..0d85c328f27 100644
--- a/cpp/test/Ice/operations/Makefile.mk
+++ b/cpp/test/Ice/operations/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Test.ice \
Client.cpp \
diff --git a/cpp/test/Ice/operations/Oneways.cpp b/cpp/test/Ice/operations/Oneways.cpp
index f0e18b55d0e..7513faf096a 100644
--- a/cpp/test/Ice/operations/Oneways.cpp
+++ b/cpp/test/Ice/operations/Oneways.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp
index 8ccc19d189a..bd3fc9241f7 100644
--- a/cpp/test/Ice/operations/OnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/OnewaysAMI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index d3dd5d36e26..450e1d3adeb 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 2080c69e2cb..0e3194d70c9 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index d63a62068bf..69ff785f765 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice
index 878e3e0c9dc..a07b31a9547 100644
--- a/cpp/test/Ice/operations/TestAMD.ice
+++ b/cpp/test/Ice/operations/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index 247d845f7b9..cea51a31519 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h
index 214287a872a..7137dd6d785 100644
--- a/cpp/test/Ice/operations/TestAMDI.h
+++ b/cpp/test/Ice/operations/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 60824262665..4e17266f8a7 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index 9825970aea2..6c0f204a68e 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 1a7cf10d191..900ea4b4a26 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 2596a5eb2e1..f37ce43077a 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp
index e20a672c7a5..80fa70cc3c3 100644
--- a/cpp/test/Ice/optional/AllTests.cpp
+++ b/cpp/test/Ice/optional/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef _MSC_VER
# pragma warning(disable:4244) // '=': conversion from x to y, possible loss of data
diff --git a/cpp/test/Ice/optional/Client.cpp b/cpp/test/Ice/optional/Client.cpp
index d917e797b41..1f2bb2edb45 100644
--- a/cpp/test/Ice/optional/Client.cpp
+++ b/cpp/test/Ice/optional/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/optional/CustomMap.h b/cpp/test/Ice/optional/CustomMap.h
index 4ac4b16ab97..472d0bfa28f 100644
--- a/cpp/test/Ice/optional/CustomMap.h
+++ b/cpp/test/Ice/optional/CustomMap.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CUSTOM_MAP_H
#define CUSTOM_MAP_H
diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp
index 81d0eaf5a86..f526d0355d9 100644
--- a/cpp/test/Ice/optional/Server.cpp
+++ b/cpp/test/Ice/optional/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/optional/ServerAMD.cpp b/cpp/test/Ice/optional/ServerAMD.cpp
index 602937c18c6..bdc012694ce 100644
--- a/cpp/test/Ice/optional/ServerAMD.cpp
+++ b/cpp/test/Ice/optional/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/optional/StringView.h b/cpp/test/Ice/optional/StringView.h
index 0317f2158b3..5e642f57153 100644
--- a/cpp/test/Ice/optional/StringView.h
+++ b/cpp/test/Ice/optional/StringView.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef STRING_VIEW_H
#define STRING_VIEW_H
diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice
index 249b15d03a1..070f8e6a231 100644
--- a/cpp/test/Ice/optional/Test.ice
+++ b/cpp/test/Ice/optional/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice
index ca499ed91a7..26ce2f7a6fb 100644
--- a/cpp/test/Ice/optional/TestAMD.ice
+++ b/cpp/test/Ice/optional/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp
index 973a0eea0a8..8375cf90399 100644
--- a/cpp/test/Ice/optional/TestAMDI.cpp
+++ b/cpp/test/Ice/optional/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h
index 6ff02150a72..ff98fe77c9e 100644
--- a/cpp/test/Ice/optional/TestAMDI.h
+++ b/cpp/test/Ice/optional/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp
index 56bbde3a857..8e7a1599849 100644
--- a/cpp/test/Ice/optional/TestI.cpp
+++ b/cpp/test/Ice/optional/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h
index 670fb62a547..7fed3dcbe29 100644
--- a/cpp/test/Ice/optional/TestI.h
+++ b/cpp/test/Ice/optional/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp
index 695ebc27bd4..61268db366c 100644
--- a/cpp/test/Ice/plugin/Client.cpp
+++ b/cpp/test/Ice/plugin/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/plugin/Makefile.mk b/cpp/test/Ice/plugin/Makefile.mk
index 38abaaa9705..e48333f8866 100644
--- a/cpp/test/Ice/plugin/Makefile.mk
+++ b/cpp/test/Ice/plugin/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestPlugin
diff --git a/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp
index 44bf8042271..d18dea3d7d0 100644
--- a/cpp/test/Ice/plugin/Plugin.cpp
+++ b/cpp/test/Ice/plugin/Plugin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/plugin/test.py b/cpp/test/Ice/plugin/test.py
index 195c9ac54d8..109fc352e10 100644
--- a/cpp/test/Ice/plugin/test.py
+++ b/cpp/test/Ice/plugin/test.py
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
TestSuite(__file__,
[ClientTestCase(client=SimpleClient(args=lambda process, current: [current.getBuildDir("testplugin")]))],
diff --git a/cpp/test/Ice/properties/Client.cpp b/cpp/test/Ice/properties/Client.cpp
index 07b726e7fae..d779106aa2b 100644
--- a/cpp/test/Ice/properties/Client.cpp
+++ b/cpp/test/Ice/properties/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index a19f5efa7fc..147726defb0 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Locator.h>
diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp
index 37e0e5c1898..9e5ba0cb4f5 100644
--- a/cpp/test/Ice/proxy/Client.cpp
+++ b/cpp/test/Ice/proxy/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp
index 456561cb3d1..7ffe243a50b 100644
--- a/cpp/test/Ice/proxy/Collocated.cpp
+++ b/cpp/test/Ice/proxy/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp
index 2badef6e45b..67059dfdb60 100644
--- a/cpp/test/Ice/proxy/Server.cpp
+++ b/cpp/test/Ice/proxy/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp
index 2a95d77ce46..8e6159fc209 100644
--- a/cpp/test/Ice/proxy/ServerAMD.cpp
+++ b/cpp/test/Ice/proxy/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/proxy/Test.ice b/cpp/test/Ice/proxy/Test.ice
index d659df358b9..9d716cceb35 100644
--- a/cpp/test/Ice/proxy/Test.ice
+++ b/cpp/test/Ice/proxy/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/proxy/TestAMD.ice b/cpp/test/Ice/proxy/TestAMD.ice
index 1bff898e32d..4674d1f5384 100644
--- a/cpp/test/Ice/proxy/TestAMD.ice
+++ b/cpp/test/Ice/proxy/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index 5bf630903ff..cdc78693a93 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h
index 2d26786c7d0..2a656b914f4 100644
--- a/cpp/test/Ice/proxy/TestAMDI.h
+++ b/cpp/test/Ice/proxy/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_AMD_I_H
#define TEST_AMD_I_H
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp
index b5f54ca71cc..dede32e4477 100644
--- a/cpp/test/Ice/proxy/TestI.cpp
+++ b/cpp/test/Ice/proxy/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/proxy/TestI.h b/cpp/test/Ice/proxy/TestI.h
index 32349b4e6d7..4460241f9b1 100644
--- a/cpp/test/Ice/proxy/TestI.h
+++ b/cpp/test/Ice/proxy/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp
index 37caf39dafa..7b9fa9d375f 100644
--- a/cpp/test/Ice/retry/AllTests.cpp
+++ b/cpp/test/Ice/retry/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp
index 1e67678b422..feafb4305c6 100644
--- a/cpp/test/Ice/retry/Client.cpp
+++ b/cpp/test/Ice/retry/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/retry/Collocated.cpp b/cpp/test/Ice/retry/Collocated.cpp
index d611e613ceb..07ddb54677b 100644
--- a/cpp/test/Ice/retry/Collocated.cpp
+++ b/cpp/test/Ice/retry/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/retry/InstrumentationI.cpp b/cpp/test/Ice/retry/InstrumentationI.cpp
index 2fc1fcccb07..64c03c7e0d1 100644
--- a/cpp/test/Ice/retry/InstrumentationI.cpp
+++ b/cpp/test/Ice/retry/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/retry/InstrumentationI.h b/cpp/test/Ice/retry/InstrumentationI.h
index e447fb2491f..8c8146f6b72 100644
--- a/cpp/test/Ice/retry/InstrumentationI.h
+++ b/cpp/test/Ice/retry/InstrumentationI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INSTRUMENTATION_I_H
#define INSTRUMENTATION_I_H
diff --git a/cpp/test/Ice/retry/Makefile.mk b/cpp/test/Ice/retry/Makefile.mk
index b5b41efa027..322275b0fe4 100644
--- a/cpp/test/Ice/retry/Makefile.mk
+++ b/cpp/test/Ice/retry/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp
diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp
index abcc0243b72..83f3f1031a7 100644
--- a/cpp/test/Ice/retry/Server.cpp
+++ b/cpp/test/Ice/retry/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/retry/SystemFailure.h b/cpp/test/Ice/retry/SystemFailure.h
index c6916aabfb3..2f379cd662e 100644
--- a/cpp/test/Ice/retry/SystemFailure.h
+++ b/cpp/test/Ice/retry/SystemFailure.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SYSTEMFAILURE_H
#define SYSTEMFAILURE_H
diff --git a/cpp/test/Ice/retry/Test.ice b/cpp/test/Ice/retry/Test.ice
index c55eabdba5c..d64ebef31b8 100644
--- a/cpp/test/Ice/retry/Test.ice
+++ b/cpp/test/Ice/retry/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/retry/TestI.cpp b/cpp/test/Ice/retry/TestI.cpp
index 0f36df219d3..03a38780ba3 100644
--- a/cpp/test/Ice/retry/TestI.cpp
+++ b/cpp/test/Ice/retry/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/retry/TestI.h b/cpp/test/Ice/retry/TestI.h
index bc9eb032808..93e842907ad 100644
--- a/cpp/test/Ice/retry/TestI.h
+++ b/cpp/test/Ice/retry/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/scope/AllTests.cpp b/cpp/test/Ice/scope/AllTests.cpp
index 5cb29e9e40e..eed8c7e343b 100644
--- a/cpp/test/Ice/scope/AllTests.cpp
+++ b/cpp/test/Ice/scope/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Locator.h>
diff --git a/cpp/test/Ice/scope/Client.cpp b/cpp/test/Ice/scope/Client.cpp
index 5eabc266a83..5056556c80b 100644
--- a/cpp/test/Ice/scope/Client.cpp
+++ b/cpp/test/Ice/scope/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/scope/Server.cpp b/cpp/test/Ice/scope/Server.cpp
index 401cb01d1ca..1e4d4f9f438 100644
--- a/cpp/test/Ice/scope/Server.cpp
+++ b/cpp/test/Ice/scope/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/scope/Test.ice b/cpp/test/Ice/scope/Test.ice
index 278977e680b..e2197329562 100644
--- a/cpp/test/Ice/scope/Test.ice
+++ b/cpp/test/Ice/scope/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp
index cb726da7e12..310a6df446b 100644
--- a/cpp/test/Ice/servantLocator/AllTests.cpp
+++ b/cpp/test/Ice/servantLocator/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/servantLocator/Client.cpp b/cpp/test/Ice/servantLocator/Client.cpp
index 972143cb0ea..98b76bd6831 100644
--- a/cpp/test/Ice/servantLocator/Client.cpp
+++ b/cpp/test/Ice/servantLocator/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp
index 2714e07060e..22a586adef6 100644
--- a/cpp/test/Ice/servantLocator/Collocated.cpp
+++ b/cpp/test/Ice/servantLocator/Collocated.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/servantLocator/Makefile.mk b/cpp/test/Ice/servantLocator/Makefile.mk
index 62d5a9b7746..1e2e7067a58 100644
--- a/cpp/test/Ice/servantLocator/Makefile.mk
+++ b/cpp/test/Ice/servantLocator/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = $(test-client-sources) ServantLocatorI.cpp
$(test)_server_sources = $(test-server-sources) ServantLocatorI.cpp
diff --git a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
index 6456f024276..2282aaca474 100644
--- a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
+++ b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#ifdef ICE_AMD_TEST
diff --git a/cpp/test/Ice/servantLocator/ServantLocatorI.h b/cpp/test/Ice/servantLocator/ServantLocatorI.h
index 986c32e9ee8..5023b37a653 100644
--- a/cpp/test/Ice/servantLocator/ServantLocatorI.h
+++ b/cpp/test/Ice/servantLocator/ServantLocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SERVANT_LOCATOR_I_H
#define SERVANT_LOCATOR_I_H
diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp
index d7cad081d8c..642dd46c17e 100644
--- a/cpp/test/Ice/servantLocator/Server.cpp
+++ b/cpp/test/Ice/servantLocator/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp
index d708f4fae6a..f34ac66efbe 100644
--- a/cpp/test/Ice/servantLocator/ServerAMD.cpp
+++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServantLocatorI.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/servantLocator/Test.ice b/cpp/test/Ice/servantLocator/Test.ice
index d09e2899fdd..56e2dfa5abb 100644
--- a/cpp/test/Ice/servantLocator/Test.ice
+++ b/cpp/test/Ice/servantLocator/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/servantLocator/TestAMD.ice b/cpp/test/Ice/servantLocator/TestAMD.ice
index f5e625cd8ea..87489a38427 100644
--- a/cpp/test/Ice/servantLocator/TestAMD.ice
+++ b/cpp/test/Ice/servantLocator/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/servantLocator/TestAMDI.cpp b/cpp/test/Ice/servantLocator/TestAMDI.cpp
index f9292abc4b0..1091eb0f816 100644
--- a/cpp/test/Ice/servantLocator/TestAMDI.cpp
+++ b/cpp/test/Ice/servantLocator/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/servantLocator/TestAMDI.h b/cpp/test/Ice/servantLocator/TestAMDI.h
index 27b2b39195f..d6ab8b32fd6 100644
--- a/cpp/test/Ice/servantLocator/TestAMDI.h
+++ b/cpp/test/Ice/servantLocator/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TESTAMD_I_H
#define TESTAMD_I_H
diff --git a/cpp/test/Ice/servantLocator/TestI.cpp b/cpp/test/Ice/servantLocator/TestI.cpp
index ac0ec44f906..092fbe06822 100644
--- a/cpp/test/Ice/servantLocator/TestI.cpp
+++ b/cpp/test/Ice/servantLocator/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/servantLocator/TestI.h b/cpp/test/Ice/servantLocator/TestI.h
index 1270894697c..bf4fa4fb02c 100644
--- a/cpp/test/Ice/servantLocator/TestI.h
+++ b/cpp/test/Ice/servantLocator/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/services/AllTests.cpp b/cpp/test/Ice/services/AllTests.cpp
index d2bed35e92e..43dad9bca23 100644
--- a/cpp/test/Ice/services/AllTests.cpp
+++ b/cpp/test/Ice/services/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/Glacier2.h>
diff --git a/cpp/test/Ice/services/Client.cpp b/cpp/test/Ice/services/Client.cpp
index 35058bb08f0..bafd94ff11d 100644
--- a/cpp/test/Ice/services/Client.cpp
+++ b/cpp/test/Ice/services/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/services/Makefile.mk b/cpp/test/Ice/services/Makefile.mk
index 0b93676d1b7..8862c788eee 100644
--- a/cpp/test/Ice/services/Makefile.mk
+++ b/cpp/test/Ice/services/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = Glacier2 IceStorm IceGrid TestCommon IceSSL Ice
diff --git a/cpp/test/Ice/services/Test.ice b/cpp/test/Ice/services/Test.ice
index e96862a4dcb..37bf69c749d 100644
--- a/cpp/test/Ice/services/Test.ice
+++ b/cpp/test/Ice/services/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
index 38678a1caec..aa68e511994 100644
--- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp
index d4b443e7b7e..72a3a9ac9da 100644
--- a/cpp/test/Ice/slicing/exceptions/Client.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice b/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
index 1c8c679241b..552e9b14337 100644
--- a/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
+++ b/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk
index e744046ae74..746e565c5a8 100644
--- a/cpp/test/Ice/slicing/exceptions/Makefile.mk
+++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_sliceflags := -I$(test)
$(test)_client_sources = $(test-client-sources) ClientPrivate.ice
diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp
index 90dfefed4b3..dbf6b27ac42 100644
--- a/cpp/test/Ice/slicing/exceptions/Server.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 0e0620903a1..ce47c54ee87 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 1a5f265cfe1..843b57a6a0f 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index 61eadd9f44d..1acbe0b6442 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice
index a5bd83a10b5..a16c2319ea7 100644
--- a/cpp/test/Ice/slicing/exceptions/Test.ice
+++ b/cpp/test/Ice/slicing/exceptions/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
index 9d35f8f5f28..1fb00655b11 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
index a8e1a9c58f0..564cb9954e9 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 5879bd8531d..97408707814 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 72c392145ab..edf9680e6bd 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 537843f3f17..9f1092e3b86 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index de880b1279c..04e376c7dc9 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp
index 435e0f40f3c..537d7e9d216 100644
--- a/cpp/test/Ice/slicing/objects/Client.cpp
+++ b/cpp/test/Ice/slicing/objects/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/slicing/objects/ClientPrivate.ice b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
index d3a5e4252ac..cd5e1ec84ea 100644
--- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk
index 966beb1a793..114f7fa2b99 100644
--- a/cpp/test/Ice/slicing/objects/Makefile.mk
+++ b/cpp/test/Ice/slicing/objects/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_sliceflags := -I$(test)
$(test)_client_sources = $(test-client-sources) ClientPrivate.ice
diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp
index 5829beca8ab..f1cd93e6ae3 100644
--- a/cpp/test/Ice/slicing/objects/Server.cpp
+++ b/cpp/test/Ice/slicing/objects/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 6f82472d7e2..ab4df8a0f5e 100644
--- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 9e1f77444ff..10d11274b01 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivate.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
index be5e170c628..9a3286c7d0d 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice
index 41f8b5401b9..b50a94d0c7a 100644
--- a/cpp/test/Ice/slicing/objects/Test.ice
+++ b/cpp/test/Ice/slicing/objects/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice
index 706906ff05c..d961598b0d1 100644
--- a/cpp/test/Ice/slicing/objects/TestAMD.ice
+++ b/cpp/test/Ice/slicing/objects/TestAMD.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
index a3c4bf5a2f2..636346e9ff5 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestAMDI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h
index 2e525918f50..f12a7bee5be 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.h
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 312f22fdcb0..8b8e3a648cd 100644
--- a/cpp/test/Ice/slicing/objects/TestI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h
index 337e3164155..6e5468f7f2d 100644
--- a/cpp/test/Ice/slicing/objects/TestI.h
+++ b/cpp/test/Ice/slicing/objects/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index fc723cfc691..6f23a511211 100644
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef _MSC_VER
# pragma warning(disable:4244) // '=': conversion from 'int' to 'Ice::Short', possible loss of data
diff --git a/cpp/test/Ice/stream/Test.ice b/cpp/test/Ice/stream/Test.ice
index 8cb5ec438ec..e682c0abb32 100644
--- a/cpp/test/Ice/stream/Test.ice
+++ b/cpp/test/Ice/stream/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index 6e70a92a6e8..bc746df14ca 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/stringConverter/Makefile.mk b/cpp/test/Ice/stringConverter/Makefile.mk
index c57a06bdd22..22c6a4d2ef0 100644
--- a/cpp/test/Ice/stringConverter/Makefile.mk
+++ b/cpp/test/Ice/stringConverter/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_ldflags = $(iconv_ldflags)
diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp
index 63d85404efd..f43a1dc5aef 100644
--- a/cpp/test/Ice/stringConverter/Server.cpp
+++ b/cpp/test/Ice/stringConverter/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/stringConverter/Test.ice b/cpp/test/Ice/stringConverter/Test.ice
index b2cbe890593..e71a4c75413 100644
--- a/cpp/test/Ice/stringConverter/Test.ice
+++ b/cpp/test/Ice/stringConverter/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/threadPoolPriority/AllTests.cpp b/cpp/test/Ice/threadPoolPriority/AllTests.cpp
index 325c1960920..822b4465239 100644
--- a/cpp/test/Ice/threadPoolPriority/AllTests.cpp
+++ b/cpp/test/Ice/threadPoolPriority/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/Locator.h>
diff --git a/cpp/test/Ice/threadPoolPriority/Client.cpp b/cpp/test/Ice/threadPoolPriority/Client.cpp
index feddf370e0f..1b2b56a372c 100644
--- a/cpp/test/Ice/threadPoolPriority/Client.cpp
+++ b/cpp/test/Ice/threadPoolPriority/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk
index 06fd699bc58..abc71d84865 100644
--- a/cpp/test/Ice/threadPoolPriority/Makefile.mk
+++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs := client server servercustom
diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp
index 7a5b6520d30..0d1ceabad36 100644
--- a/cpp/test/Ice/threadPoolPriority/Server.cpp
+++ b/cpp/test/Ice/threadPoolPriority/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
index 676b2a717bd..f10d5ab8a03 100644
--- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
+++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/threadPoolPriority/Test.ice b/cpp/test/Ice/threadPoolPriority/Test.ice
index bf918628948..6245c3b749d 100644
--- a/cpp/test/Ice/threadPoolPriority/Test.ice
+++ b/cpp/test/Ice/threadPoolPriority/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/threadPoolPriority/TestI.cpp b/cpp/test/Ice/threadPoolPriority/TestI.cpp
index 16f42cceaef..5f51afa1f21 100644
--- a/cpp/test/Ice/threadPoolPriority/TestI.cpp
+++ b/cpp/test/Ice/threadPoolPriority/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/threadPoolPriority/TestI.h b/cpp/test/Ice/threadPoolPriority/TestI.h
index 06ff1b98fb5..7971a46e0a4 100644
--- a/cpp/test/Ice/threadPoolPriority/TestI.h
+++ b/cpp/test/Ice/threadPoolPriority/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/threadPoolPriority/test.py b/cpp/test/Ice/threadPoolPriority/test.py
index 4bd3ab451d1..5ccb55bbbfe 100644
--- a/cpp/test/Ice/threadPoolPriority/test.py
+++ b/cpp/test/Ice/threadPoolPriority/test.py
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
if not isinstance(platform, Darwin) and (isinstance(platform, Windows) or os.getuid() == 0):
TestSuite(__file__, [
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index d8c3d036a24..2bc0146470b 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp
index fa448d9abc1..58d2bf238df 100644
--- a/cpp/test/Ice/timeout/Client.cpp
+++ b/cpp/test/Ice/timeout/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/timeout/Makefile.mk b/cpp/test/Ice/timeout/Makefile.mk
index 4d910135e76..07e63b16a72 100644
--- a/cpp/test/Ice/timeout/Makefile.mk
+++ b/cpp/test/Ice/timeout/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = $(test-client-sources) TestI.cpp
diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp
index 7d5ea402723..5491cdb2e43 100644
--- a/cpp/test/Ice/timeout/Server.cpp
+++ b/cpp/test/Ice/timeout/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/timeout/Test.ice b/cpp/test/Ice/timeout/Test.ice
index db6a9d326fb..1e007e5ec91 100644
--- a/cpp/test/Ice/timeout/Test.ice
+++ b/cpp/test/Ice/timeout/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/timeout/TestI.cpp b/cpp/test/Ice/timeout/TestI.cpp
index dfbd44b37d6..00fb0c2dbed 100644
--- a/cpp/test/Ice/timeout/TestI.cpp
+++ b/cpp/test/Ice/timeout/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/timeout/TestI.h b/cpp/test/Ice/timeout/TestI.h
index 60e7e27af36..36447ae9f4a 100644
--- a/cpp/test/Ice/timeout/TestI.h
+++ b/cpp/test/Ice/timeout/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index 3a56136ed1c..c7c8dc1ce1d 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/udp/Client.cpp b/cpp/test/Ice/udp/Client.cpp
index e0695fbf13a..96370363bdb 100644
--- a/cpp/test/Ice/udp/Client.cpp
+++ b/cpp/test/Ice/udp/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp
index ca98745f3b2..34113776aba 100644
--- a/cpp/test/Ice/udp/Server.cpp
+++ b/cpp/test/Ice/udp/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Ice/udp/Test.ice b/cpp/test/Ice/udp/Test.ice
index bb031720e30..c93e9f40e47 100644
--- a/cpp/test/Ice/udp/Test.ice
+++ b/cpp/test/Ice/udp/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/udp/TestI.cpp b/cpp/test/Ice/udp/TestI.cpp
index 6674b6323cb..b89fe3866b1 100644
--- a/cpp/test/Ice/udp/TestI.cpp
+++ b/cpp/test/Ice/udp/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/udp/TestI.h b/cpp/test/Ice/udp/TestI.h
index fe9098b77e3..c6e79200b5f 100644
--- a/cpp/test/Ice/udp/TestI.h
+++ b/cpp/test/Ice/udp/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceBox/admin/AllTests.cpp b/cpp/test/IceBox/admin/AllTests.cpp
index a6621d391aa..cd1564cb2cf 100644
--- a/cpp/test/IceBox/admin/AllTests.cpp
+++ b/cpp/test/IceBox/admin/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceBox/admin/Client.cpp b/cpp/test/IceBox/admin/Client.cpp
index 5bc0756a241..90b64663012 100644
--- a/cpp/test/IceBox/admin/Client.cpp
+++ b/cpp/test/IceBox/admin/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceBox/admin/Makefile.mk b/cpp/test/IceBox/admin/Makefile.mk
index 60c7408f2a9..f643165612a 100644
--- a/cpp/test/IceBox/admin/Makefile.mk
+++ b/cpp/test/IceBox/admin/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceBox/admin/Service.cpp b/cpp/test/IceBox/admin/Service.cpp
index 7571fffee5e..d3e44986853 100644
--- a/cpp/test/IceBox/admin/Service.cpp
+++ b/cpp/test/IceBox/admin/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/test/IceBox/admin/Test.ice b/cpp/test/IceBox/admin/Test.ice
index 80c5e1f1b8d..00f4ea09f1f 100644
--- a/cpp/test/IceBox/admin/Test.ice
+++ b/cpp/test/IceBox/admin/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/IceBox/admin/TestI.cpp b/cpp/test/IceBox/admin/TestI.cpp
index b36c5cd02f7..4c72801ef0b 100644
--- a/cpp/test/IceBox/admin/TestI.cpp
+++ b/cpp/test/IceBox/admin/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceBox/admin/TestI.h b/cpp/test/IceBox/admin/TestI.h
index 6c30b2d73e8..076d677aa8a 100644
--- a/cpp/test/IceBox/admin/TestI.h
+++ b/cpp/test/IceBox/admin/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceBox/configuration/AllTests.cpp b/cpp/test/IceBox/configuration/AllTests.cpp
index 4697178b9e9..8889dd696b7 100644
--- a/cpp/test/IceBox/configuration/AllTests.cpp
+++ b/cpp/test/IceBox/configuration/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceBox/configuration/Client.cpp b/cpp/test/IceBox/configuration/Client.cpp
index 2298c47b811..c60ba901734 100644
--- a/cpp/test/IceBox/configuration/Client.cpp
+++ b/cpp/test/IceBox/configuration/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk
index 60c7408f2a9..f643165612a 100644
--- a/cpp/test/IceBox/configuration/Makefile.mk
+++ b/cpp/test/IceBox/configuration/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceBox/configuration/Service.cpp b/cpp/test/IceBox/configuration/Service.cpp
index 77ef1bc8706..2a4be64571e 100644
--- a/cpp/test/IceBox/configuration/Service.cpp
+++ b/cpp/test/IceBox/configuration/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/test/IceBox/configuration/Test.ice b/cpp/test/IceBox/configuration/Test.ice
index bf9ad4f2ccb..949a6d2c3dc 100644
--- a/cpp/test/IceBox/configuration/Test.ice
+++ b/cpp/test/IceBox/configuration/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceBox/configuration/TestI.cpp b/cpp/test/IceBox/configuration/TestI.cpp
index 625db46c491..c871469c936 100644
--- a/cpp/test/IceBox/configuration/TestI.cpp
+++ b/cpp/test/IceBox/configuration/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceBox/configuration/TestI.h b/cpp/test/IceBox/configuration/TestI.h
index 7cde66b63ad..57f1f6b66cb 100644
--- a/cpp/test/IceBox/configuration/TestI.h
+++ b/cpp/test/IceBox/configuration/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceBridge/simple/AllTests.cpp b/cpp/test/IceBridge/simple/AllTests.cpp
index e29e57d2b55..0f66b77f277 100644
--- a/cpp/test/IceBridge/simple/AllTests.cpp
+++ b/cpp/test/IceBridge/simple/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceBridge/simple/Client.cpp b/cpp/test/IceBridge/simple/Client.cpp
index e8b99a70e8a..392150634e3 100644
--- a/cpp/test/IceBridge/simple/Client.cpp
+++ b/cpp/test/IceBridge/simple/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceBridge/simple/Server.cpp b/cpp/test/IceBridge/simple/Server.cpp
index 351793c6562..4b51e5d132b 100644
--- a/cpp/test/IceBridge/simple/Server.cpp
+++ b/cpp/test/IceBridge/simple/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceBridge/simple/Test.ice b/cpp/test/IceBridge/simple/Test.ice
index 5709d52e811..182c470a795 100644
--- a/cpp/test/IceBridge/simple/Test.ice
+++ b/cpp/test/IceBridge/simple/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceBridge/simple/TestI.cpp b/cpp/test/IceBridge/simple/TestI.cpp
index 68857eb5b9f..23166c77a91 100644
--- a/cpp/test/IceBridge/simple/TestI.cpp
+++ b/cpp/test/IceBridge/simple/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceBridge/simple/TestI.h b/cpp/test/IceBridge/simple/TestI.h
index ecd12354594..7ad0dec1b88 100644
--- a/cpp/test/IceBridge/simple/TestI.h
+++ b/cpp/test/IceBridge/simple/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceBridge/simple/test.py b/cpp/test/IceBridge/simple/test.py
index 5cf45ba998e..d29c20adb86 100644
--- a/cpp/test/IceBridge/simple/test.py
+++ b/cpp/test/IceBridge/simple/test.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
TestSuite(__file__, [ClientServerTestCase(servers=[IceBridge(), Server()])])
diff --git a/cpp/test/IceDiscovery/simple/AllTests.cpp b/cpp/test/IceDiscovery/simple/AllTests.cpp
index 7f332cbfc8d..7f9bc23861c 100644
--- a/cpp/test/IceDiscovery/simple/AllTests.cpp
+++ b/cpp/test/IceDiscovery/simple/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceDiscovery/simple/Client.cpp b/cpp/test/IceDiscovery/simple/Client.cpp
index e6fd3694b64..9717228364c 100644
--- a/cpp/test/IceDiscovery/simple/Client.cpp
+++ b/cpp/test/IceDiscovery/simple/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceDiscovery/simple/Makefile.mk b/cpp/test/IceDiscovery/simple/Makefile.mk
index d6e49f3650f..be9267180e2 100644
--- a/cpp/test/IceDiscovery/simple/Makefile.mk
+++ b/cpp/test/IceDiscovery/simple/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = IceDiscovery TestCommon IceSSL Ice
diff --git a/cpp/test/IceDiscovery/simple/Server.cpp b/cpp/test/IceDiscovery/simple/Server.cpp
index cb0d416acf0..3d72b7f2e8b 100644
--- a/cpp/test/IceDiscovery/simple/Server.cpp
+++ b/cpp/test/IceDiscovery/simple/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceDiscovery/simple/Test.ice b/cpp/test/IceDiscovery/simple/Test.ice
index 70767992eda..735c5cd8661 100644
--- a/cpp/test/IceDiscovery/simple/Test.ice
+++ b/cpp/test/IceDiscovery/simple/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceDiscovery/simple/TestI.cpp b/cpp/test/IceDiscovery/simple/TestI.cpp
index ae2290d4341..ee7df68446f 100644
--- a/cpp/test/IceDiscovery/simple/TestI.cpp
+++ b/cpp/test/IceDiscovery/simple/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceDiscovery/simple/TestI.h b/cpp/test/IceDiscovery/simple/TestI.h
index f4ec7c90688..f9968f53353 100644
--- a/cpp/test/IceDiscovery/simple/TestI.h
+++ b/cpp/test/IceDiscovery/simple/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp
index 867a246270a..152a3e38a6b 100644
--- a/cpp/test/IceGrid/activation/AllTests.cpp
+++ b/cpp/test/IceGrid/activation/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/IceGrid.h>
diff --git a/cpp/test/IceGrid/activation/Client.cpp b/cpp/test/IceGrid/activation/Client.cpp
index 1a24f916bf1..2d596beb2e9 100644
--- a/cpp/test/IceGrid/activation/Client.cpp
+++ b/cpp/test/IceGrid/activation/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/activation/Makefile.mk b/cpp/test/IceGrid/activation/Makefile.mk
index 799336c371c..351ed573e7e 100644
--- a/cpp/test/IceGrid/activation/Makefile.mk
+++ b/cpp/test/IceGrid/activation/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/activation/Server.cpp b/cpp/test/IceGrid/activation/Server.cpp
index 74a9b72a5c3..2b683cd5176 100644
--- a/cpp/test/IceGrid/activation/Server.cpp
+++ b/cpp/test/IceGrid/activation/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceGrid/activation/Test.ice b/cpp/test/IceGrid/activation/Test.ice
index 5632195c229..a2e331ba331 100644
--- a/cpp/test/IceGrid/activation/Test.ice
+++ b/cpp/test/IceGrid/activation/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/activation/TestI.cpp b/cpp/test/IceGrid/activation/TestI.cpp
index 81f9a8fea1f..f7f1ed192f0 100644
--- a/cpp/test/IceGrid/activation/TestI.cpp
+++ b/cpp/test/IceGrid/activation/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/activation/TestI.h b/cpp/test/IceGrid/activation/TestI.h
index 2c99a01ba73..35dc14c474c 100644
--- a/cpp/test/IceGrid/activation/TestI.h
+++ b/cpp/test/IceGrid/activation/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/activation/test.py b/cpp/test/IceGrid/activation/test.py
index 6aef5ddc961..140eefb5dfb 100644
--- a/cpp/test/IceGrid/activation/test.py
+++ b/cpp/test/IceGrid/activation/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
TestSuite(__file__, [IceGridTestCase()], multihost=False)
diff --git a/cpp/test/IceGrid/admin/Makefile.mk b/cpp/test/IceGrid/admin/Makefile.mk
index 35080fff73b..4cb033736a1 100644
--- a/cpp/test/IceGrid/admin/Makefile.mk
+++ b/cpp/test/IceGrid/admin/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
# This Makefile.mk is necessary to get this test to build because the
# test doesn't have a Client.cpp file.
diff --git a/cpp/test/IceGrid/admin/Server.cpp b/cpp/test/IceGrid/admin/Server.cpp
index ca0cd93cb30..0267760d951 100644
--- a/cpp/test/IceGrid/admin/Server.cpp
+++ b/cpp/test/IceGrid/admin/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/admin/test.py b/cpp/test/IceGrid/admin/test.py
index 14ce5b42f53..173c5149ee2 100644
--- a/cpp/test/IceGrid/admin/test.py
+++ b/cpp/test/IceGrid/admin/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceGridAdminTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp
index ac3b407b8c3..d0a9646372c 100644
--- a/cpp/test/IceGrid/allocation/AllTests.cpp
+++ b/cpp/test/IceGrid/allocation/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/IceGrid/allocation/Client.cpp b/cpp/test/IceGrid/allocation/Client.cpp
index 743ca53baac..0d88f5c27be 100644
--- a/cpp/test/IceGrid/allocation/Client.cpp
+++ b/cpp/test/IceGrid/allocation/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/allocation/Makefile.mk b/cpp/test/IceGrid/allocation/Makefile.mk
index a0a32c03802..f389535de1e 100644
--- a/cpp/test/IceGrid/allocation/Makefile.mk
+++ b/cpp/test/IceGrid/allocation/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = client server verifier
diff --git a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
index 80bcd1703e5..6e15bad1c0d 100644
--- a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
+++ b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/test/IceGrid/allocation/Server.cpp b/cpp/test/IceGrid/allocation/Server.cpp
index 2f5d39c6747..5b45a7e7468 100644
--- a/cpp/test/IceGrid/allocation/Server.cpp
+++ b/cpp/test/IceGrid/allocation/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/allocation/Test.ice b/cpp/test/IceGrid/allocation/Test.ice
index 9db9b3e1c39..174a54f240e 100644
--- a/cpp/test/IceGrid/allocation/Test.ice
+++ b/cpp/test/IceGrid/allocation/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/allocation/TestI.cpp b/cpp/test/IceGrid/allocation/TestI.cpp
index a936b3927e2..f91a7ac44b2 100644
--- a/cpp/test/IceGrid/allocation/TestI.cpp
+++ b/cpp/test/IceGrid/allocation/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/allocation/TestI.h b/cpp/test/IceGrid/allocation/TestI.h
index 34edefc5fb1..1fcf402f93d 100644
--- a/cpp/test/IceGrid/allocation/TestI.h
+++ b/cpp/test/IceGrid/allocation/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/allocation/test.py b/cpp/test/IceGrid/allocation/test.py
index 7d38fba52cf..82b990c9c41 100644
--- a/cpp/test/IceGrid/allocation/test.py
+++ b/cpp/test/IceGrid/allocation/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
TestSuite(__file__, [IceGridTestCase(exevars={ "verifier.dir": "verifier" })], runOnMainThread=True, multihost=False)
diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp
index d85a9f14b8a..b8003d3ef83 100644
--- a/cpp/test/IceGrid/deployer/AllTests.cpp
+++ b/cpp/test/IceGrid/deployer/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/IceGrid.h>
diff --git a/cpp/test/IceGrid/deployer/Client.cpp b/cpp/test/IceGrid/deployer/Client.cpp
index dc223707c8c..069fefd9e60 100644
--- a/cpp/test/IceGrid/deployer/Client.cpp
+++ b/cpp/test/IceGrid/deployer/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk
index ee879164c62..a337239e86b 100644
--- a/cpp/test/IceGrid/deployer/Makefile.mk
+++ b/cpp/test/IceGrid/deployer/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp
index f27ca0aade3..f3e3fd320de 100644
--- a/cpp/test/IceGrid/deployer/Server.cpp
+++ b/cpp/test/IceGrid/deployer/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/deployer/Service.cpp b/cpp/test/IceGrid/deployer/Service.cpp
index 056e35033a2..2071fde15cd 100644
--- a/cpp/test/IceGrid/deployer/Service.cpp
+++ b/cpp/test/IceGrid/deployer/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/test/IceGrid/deployer/Test.ice b/cpp/test/IceGrid/deployer/Test.ice
index 9db9b3e1c39..174a54f240e 100644
--- a/cpp/test/IceGrid/deployer/Test.ice
+++ b/cpp/test/IceGrid/deployer/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/deployer/TestI.cpp b/cpp/test/IceGrid/deployer/TestI.cpp
index a936b3927e2..f91a7ac44b2 100644
--- a/cpp/test/IceGrid/deployer/TestI.cpp
+++ b/cpp/test/IceGrid/deployer/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/deployer/TestI.h b/cpp/test/IceGrid/deployer/TestI.h
index 34edefc5fb1..1fcf402f93d 100644
--- a/cpp/test/IceGrid/deployer/TestI.h
+++ b/cpp/test/IceGrid/deployer/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/deployer/test.py b/cpp/test/IceGrid/deployer/test.py
index a02a3c08290..6b274e34675 100644
--- a/cpp/test/IceGrid/deployer/test.py
+++ b/cpp/test/IceGrid/deployer/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
clientProps=lambda process, current: { "TestDir" : current.getBuildDir("server") }
diff --git a/cpp/test/IceGrid/distribution/AllTests.cpp b/cpp/test/IceGrid/distribution/AllTests.cpp
index b521c3116f0..7aede6e5ba2 100644
--- a/cpp/test/IceGrid/distribution/AllTests.cpp
+++ b/cpp/test/IceGrid/distribution/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/distribution/Client.cpp b/cpp/test/IceGrid/distribution/Client.cpp
index 743ca53baac..0d88f5c27be 100644
--- a/cpp/test/IceGrid/distribution/Client.cpp
+++ b/cpp/test/IceGrid/distribution/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/distribution/Makefile.mk b/cpp/test/IceGrid/distribution/Makefile.mk
index 799336c371c..351ed573e7e 100644
--- a/cpp/test/IceGrid/distribution/Makefile.mk
+++ b/cpp/test/IceGrid/distribution/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/distribution/Server.cpp b/cpp/test/IceGrid/distribution/Server.cpp
index 59aba9d4642..b1335eb7399 100644
--- a/cpp/test/IceGrid/distribution/Server.cpp
+++ b/cpp/test/IceGrid/distribution/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/distribution/Test.ice b/cpp/test/IceGrid/distribution/Test.ice
index 6ca36bbe730..51ea654edc3 100644
--- a/cpp/test/IceGrid/distribution/Test.ice
+++ b/cpp/test/IceGrid/distribution/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/distribution/TestI.cpp b/cpp/test/IceGrid/distribution/TestI.cpp
index 4702debd5aa..bd591ac5046 100644
--- a/cpp/test/IceGrid/distribution/TestI.cpp
+++ b/cpp/test/IceGrid/distribution/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/distribution/TestI.h b/cpp/test/IceGrid/distribution/TestI.h
index 5828913f6f5..2eedcb913b5 100644
--- a/cpp/test/IceGrid/distribution/TestI.h
+++ b/cpp/test/IceGrid/distribution/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/distribution/test.py b/cpp/test/IceGrid/distribution/test.py
index c774ee99174..80130d90a25 100644
--- a/cpp/test/IceGrid/distribution/test.py
+++ b/cpp/test/IceGrid/distribution/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceGridDistributionTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py
index ba0a4507a0d..3a0cd85cbec 100644
--- a/cpp/test/IceGrid/fileLock/test.py
+++ b/cpp/test/IceGrid/fileLock/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceGridAdminTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
index 62e07ff1353..c2833be8d75 100644
--- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Client.cpp b/cpp/test/IceGrid/noRestartUpdate/Client.cpp
index 743ca53baac..0d88f5c27be 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Client.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
index ee879164c62..a337239e86b 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
+++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceGrid/noRestartUpdate/Server.cpp b/cpp/test/IceGrid/noRestartUpdate/Server.cpp
index 671cb596927..db88ace71a7 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Server.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Service.cpp b/cpp/test/IceGrid/noRestartUpdate/Service.cpp
index 048889c5004..847edb5b2af 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Service.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Test.ice b/cpp/test/IceGrid/noRestartUpdate/Test.ice
index e040cacd346..8e4570947c1 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Test.ice
+++ b/cpp/test/IceGrid/noRestartUpdate/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
index ece378d9ca7..06688e08685 100644
--- a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/TestI.h b/cpp/test/IceGrid/noRestartUpdate/TestI.h
index 09330169cf6..98cd86156ce 100644
--- a/cpp/test/IceGrid/noRestartUpdate/TestI.h
+++ b/cpp/test/IceGrid/noRestartUpdate/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/noRestartUpdate/test.py b/cpp/test/IceGrid/noRestartUpdate/test.py
index d9847ed5ce9..b2e2d3ecf0f 100644
--- a/cpp/test/IceGrid/noRestartUpdate/test.py
+++ b/cpp/test/IceGrid/noRestartUpdate/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceGridNoRestartUpdateTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/replicaGroup/AllTests.cpp b/cpp/test/IceGrid/replicaGroup/AllTests.cpp
index e701631f159..69ab93275c9 100644
--- a/cpp/test/IceGrid/replicaGroup/AllTests.cpp
+++ b/cpp/test/IceGrid/replicaGroup/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/BuiltinSequences.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Client.cpp b/cpp/test/IceGrid/replicaGroup/Client.cpp
index 360928642fd..0f421cd802d 100644
--- a/cpp/test/IceGrid/replicaGroup/Client.cpp
+++ b/cpp/test/IceGrid/replicaGroup/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk
index 7e194f74324..f9a4245ed45 100644
--- a/cpp/test/IceGrid/replicaGroup/Makefile.mk
+++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_libraries := $(test)_TestService $(test)_RegistryPlugin
diff --git a/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp b/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
index 111c4627900..e5254890f9a 100644
--- a/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
+++ b/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/IceGrid.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Server.cpp b/cpp/test/IceGrid/replicaGroup/Server.cpp
index 31a618a5c98..d397d9ad8e7 100644
--- a/cpp/test/IceGrid/replicaGroup/Server.cpp
+++ b/cpp/test/IceGrid/replicaGroup/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Service.cpp b/cpp/test/IceGrid/replicaGroup/Service.cpp
index f22f9c3bd02..c5954bcf7dc 100644
--- a/cpp/test/IceGrid/replicaGroup/Service.cpp
+++ b/cpp/test/IceGrid/replicaGroup/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Test.ice b/cpp/test/IceGrid/replicaGroup/Test.ice
index 7b64660a608..99fe6cbcdfd 100644
--- a/cpp/test/IceGrid/replicaGroup/Test.ice
+++ b/cpp/test/IceGrid/replicaGroup/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/replicaGroup/TestI.cpp b/cpp/test/IceGrid/replicaGroup/TestI.cpp
index 14925171fa9..1dd2689ad73 100644
--- a/cpp/test/IceGrid/replicaGroup/TestI.cpp
+++ b/cpp/test/IceGrid/replicaGroup/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/replicaGroup/TestI.h b/cpp/test/IceGrid/replicaGroup/TestI.h
index 20954055aaf..f03b5f0ba06 100644
--- a/cpp/test/IceGrid/replicaGroup/TestI.h
+++ b/cpp/test/IceGrid/replicaGroup/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/replicaGroup/test.py b/cpp/test/IceGrid/replicaGroup/test.py
index c73655eb825..f78e87b79e0 100644
--- a/cpp/test/IceGrid/replicaGroup/test.py
+++ b/cpp/test/IceGrid/replicaGroup/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
registryProps = {
"Ice.Plugin.RegistryPlugin" : "RegistryPlugin:createRegistryPlugin",
diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp
index 791ab541eb5..a4374fb53fe 100644
--- a/cpp/test/IceGrid/replication/AllTests.cpp
+++ b/cpp/test/IceGrid/replication/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/BuiltinSequences.h>
diff --git a/cpp/test/IceGrid/replication/Client.cpp b/cpp/test/IceGrid/replication/Client.cpp
index 743ca53baac..0d88f5c27be 100644
--- a/cpp/test/IceGrid/replication/Client.cpp
+++ b/cpp/test/IceGrid/replication/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/replication/Makefile.mk b/cpp/test/IceGrid/replication/Makefile.mk
index 799336c371c..351ed573e7e 100644
--- a/cpp/test/IceGrid/replication/Makefile.mk
+++ b/cpp/test/IceGrid/replication/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/replication/Server.cpp b/cpp/test/IceGrid/replication/Server.cpp
index a937460f600..d21343f8f68 100644
--- a/cpp/test/IceGrid/replication/Server.cpp
+++ b/cpp/test/IceGrid/replication/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/replication/Test.ice b/cpp/test/IceGrid/replication/Test.ice
index a2b4678e707..c7154676ff1 100644
--- a/cpp/test/IceGrid/replication/Test.ice
+++ b/cpp/test/IceGrid/replication/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/replication/TestI.cpp b/cpp/test/IceGrid/replication/TestI.cpp
index 065db88dbbd..29dc91bc8d9 100644
--- a/cpp/test/IceGrid/replication/TestI.cpp
+++ b/cpp/test/IceGrid/replication/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/replication/TestI.h b/cpp/test/IceGrid/replication/TestI.h
index 3a73304a2d1..ec90fc41e3e 100644
--- a/cpp/test/IceGrid/replication/TestI.h
+++ b/cpp/test/IceGrid/replication/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/replication/test.py b/cpp/test/IceGrid/replication/test.py
index c32776c1111..be34ed4c389 100644
--- a/cpp/test/IceGrid/replication/test.py
+++ b/cpp/test/IceGrid/replication/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
clientProps = lambda process, current: { "ServerDir" : current.getBuildDir("server") }
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index e4f959f89cb..964c504d570 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/session/Client.cpp b/cpp/test/IceGrid/session/Client.cpp
index 475057c1a5d..efe250ee543 100644
--- a/cpp/test/IceGrid/session/Client.cpp
+++ b/cpp/test/IceGrid/session/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk
index 91692a368e0..18d83be3380 100644
--- a/cpp/test/IceGrid/session/Makefile.mk
+++ b/cpp/test/IceGrid/session/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = client server verifier
diff --git a/cpp/test/IceGrid/session/PermissionsVerifier.cpp b/cpp/test/IceGrid/session/PermissionsVerifier.cpp
index 5434ca09bec..de0951e9287 100644
--- a/cpp/test/IceGrid/session/PermissionsVerifier.cpp
+++ b/cpp/test/IceGrid/session/PermissionsVerifier.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/test/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp
index 0883546aac4..c154ef61e11 100644
--- a/cpp/test/IceGrid/session/Server.cpp
+++ b/cpp/test/IceGrid/session/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/test/IceGrid/session/Test.ice b/cpp/test/IceGrid/session/Test.ice
index 20bbaf485fa..d33b175d978 100644
--- a/cpp/test/IceGrid/session/Test.ice
+++ b/cpp/test/IceGrid/session/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/session/test.py b/cpp/test/IceGrid/session/test.py
index 72a9e679c35..49dfc35acc5 100644
--- a/cpp/test/IceGrid/session/test.py
+++ b/cpp/test/IceGrid/session/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceGridSessionTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp
index 68e4ee1fae8..037d5627447 100644
--- a/cpp/test/IceGrid/simple/AllTests.cpp
+++ b/cpp/test/IceGrid/simple/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/simple/Client.cpp b/cpp/test/IceGrid/simple/Client.cpp
index 14b08d9c809..e7000c958db 100644
--- a/cpp/test/IceGrid/simple/Client.cpp
+++ b/cpp/test/IceGrid/simple/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceGrid/simple/Makefile.mk b/cpp/test/IceGrid/simple/Makefile.mk
index 52ad63a9916..db608d9c2ad 100644
--- a/cpp/test/IceGrid/simple/Makefile.mk
+++ b/cpp/test/IceGrid/simple/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 TestCommon IceSSL Ice
diff --git a/cpp/test/IceGrid/simple/Server.cpp b/cpp/test/IceGrid/simple/Server.cpp
index a439e8d32a6..544f8f45358 100644
--- a/cpp/test/IceGrid/simple/Server.cpp
+++ b/cpp/test/IceGrid/simple/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/simple/Test.ice b/cpp/test/IceGrid/simple/Test.ice
index 3bbeb49af45..5c177138752 100644
--- a/cpp/test/IceGrid/simple/Test.ice
+++ b/cpp/test/IceGrid/simple/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/simple/TestI.cpp b/cpp/test/IceGrid/simple/TestI.cpp
index 054d051935c..1b7731ee857 100644
--- a/cpp/test/IceGrid/simple/TestI.cpp
+++ b/cpp/test/IceGrid/simple/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/simple/TestI.h b/cpp/test/IceGrid/simple/TestI.h
index 538b0231b34..ac84ff4d278 100644
--- a/cpp/test/IceGrid/simple/TestI.h
+++ b/cpp/test/IceGrid/simple/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index 3ab140771c0..56bb9477dc0 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/update/Client.cpp b/cpp/test/IceGrid/update/Client.cpp
index 743ca53baac..0d88f5c27be 100644
--- a/cpp/test/IceGrid/update/Client.cpp
+++ b/cpp/test/IceGrid/update/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceGrid/update/Makefile.mk b/cpp/test/IceGrid/update/Makefile.mk
index 799336c371c..351ed573e7e 100644
--- a/cpp/test/IceGrid/update/Makefile.mk
+++ b/cpp/test/IceGrid/update/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/update/Server.cpp b/cpp/test/IceGrid/update/Server.cpp
index ab7be65daba..6cb98a3566b 100644
--- a/cpp/test/IceGrid/update/Server.cpp
+++ b/cpp/test/IceGrid/update/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/update/Test.ice b/cpp/test/IceGrid/update/Test.ice
index 9db9b3e1c39..174a54f240e 100644
--- a/cpp/test/IceGrid/update/Test.ice
+++ b/cpp/test/IceGrid/update/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/update/TestI.cpp b/cpp/test/IceGrid/update/TestI.cpp
index a936b3927e2..f91a7ac44b2 100644
--- a/cpp/test/IceGrid/update/TestI.cpp
+++ b/cpp/test/IceGrid/update/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceGrid/update/TestI.h b/cpp/test/IceGrid/update/TestI.h
index 34edefc5fb1..1fcf402f93d 100644
--- a/cpp/test/IceGrid/update/TestI.h
+++ b/cpp/test/IceGrid/update/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceGrid/update/test.py b/cpp/test/IceGrid/update/test.py
index 3d7efc9e96e..d13c25ba817 100644
--- a/cpp/test/IceGrid/update/test.py
+++ b/cpp/test/IceGrid/update/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceGridUpdateTestCase(IceGridTestCase):
diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py
index c7054afed0d..e1737a5420d 100755
--- a/cpp/test/IceSSL/certs/makecerts.py
+++ b/cpp/test/IceSSL/certs/makecerts.py
@@ -1,9 +1,7 @@
#!/usr/bin/env python
-# **********************************************************************
#
# Copyright (c) 2015-present ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import os, sys, socket, getopt
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index d0ee7e2c9de..9939677b20e 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceSSL/IceSSL.h>
diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp
index 0359303bc35..b5078c14ef3 100644
--- a/cpp/test/IceSSL/configuration/Client.cpp
+++ b/cpp/test/IceSSL/configuration/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceSSL/IceSSL.h>
diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk
index 16beb9c11cb..ff0cbf6490b 100644
--- a/cpp/test/IceSSL/configuration/Makefile.mk
+++ b/cpp/test/IceSSL/configuration/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = TestCommon IceSSL Ice
diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp
index 010f68c4cb5..42e5ba13843 100644
--- a/cpp/test/IceSSL/configuration/Server.cpp
+++ b/cpp/test/IceSSL/configuration/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IceSSL/configuration/Test.ice b/cpp/test/IceSSL/configuration/Test.ice
index 29d9e7bc289..f1b4e7de8df 100644
--- a/cpp/test/IceSSL/configuration/Test.ice
+++ b/cpp/test/IceSSL/configuration/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp
index e055b8d038f..40d056e3024 100644
--- a/cpp/test/IceSSL/configuration/TestI.cpp
+++ b/cpp/test/IceSSL/configuration/TestI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceSSL/configuration/TestI.h b/cpp/test/IceSSL/configuration/TestI.h
index 609cec6dde2..8fbaefd2b7b 100644
--- a/cpp/test/IceSSL/configuration/TestI.h
+++ b/cpp/test/IceSSL/configuration/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice
index f6ce4860c60..043c63bf533 100644
--- a/cpp/test/IceStorm/federation/Event.ice
+++ b/cpp/test/IceStorm/federation/Event.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk
index be1a57819b0..2e33a38faf1 100644
--- a/cpp/test/IceStorm/federation/Makefile.mk
+++ b/cpp/test/IceStorm/federation/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp
index 29df4219a1f..a08a327b0e5 100644
--- a/cpp/test/IceStorm/federation/Publisher.cpp
+++ b/cpp/test/IceStorm/federation/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index d0db5661b64..fabd871da38 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/federation/test.py b/cpp/test/IceStorm/federation/test.py
index e3a036599e1..df740b30aeb 100644
--- a/cpp/test/IceStorm/federation/test.py
+++ b/cpp/test/IceStorm/federation/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceStormFederationTestCase(IceStormTestCase):
diff --git a/cpp/test/IceStorm/federation2/Event.ice b/cpp/test/IceStorm/federation2/Event.ice
index f6ce4860c60..043c63bf533 100644
--- a/cpp/test/IceStorm/federation2/Event.ice
+++ b/cpp/test/IceStorm/federation2/Event.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk
index 41ce787cef1..87196029c6a 100644
--- a/cpp/test/IceStorm/federation2/Makefile.mk
+++ b/cpp/test/IceStorm/federation2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/federation2/Publisher.cpp b/cpp/test/IceStorm/federation2/Publisher.cpp
index b966a4b2d75..8b2b853286e 100644
--- a/cpp/test/IceStorm/federation2/Publisher.cpp
+++ b/cpp/test/IceStorm/federation2/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/federation2/Subscriber.cpp b/cpp/test/IceStorm/federation2/Subscriber.cpp
index 110852c3296..510c3e61e13 100644
--- a/cpp/test/IceStorm/federation2/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation2/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/federation2/test.py b/cpp/test/IceStorm/federation2/test.py
index fdf2f39e9d1..396546cd211 100644
--- a/cpp/test/IceStorm/federation2/test.py
+++ b/cpp/test/IceStorm/federation2/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Publisher/subscriber test cases, publisher publishes on TestIceStorm1 instance(s) and
diff --git a/cpp/test/IceStorm/persistent/Client.cpp b/cpp/test/IceStorm/persistent/Client.cpp
index 4db529395c8..4f86d352c64 100644
--- a/cpp/test/IceStorm/persistent/Client.cpp
+++ b/cpp/test/IceStorm/persistent/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/persistent/Makefile.mk b/cpp/test/IceStorm/persistent/Makefile.mk
index 08b03ba4b7f..7058de9908d 100644
--- a/cpp/test/IceStorm/persistent/Makefile.mk
+++ b/cpp/test/IceStorm/persistent/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = client
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/persistent/test.py b/cpp/test/IceStorm/persistent/test.py
index 6e71b3ea0f8..6a7b5b7c243 100644
--- a/cpp/test/IceStorm/persistent/test.py
+++ b/cpp/test/IceStorm/persistent/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
icestorm1 = IceStorm(createDb=True, cleanDb=False)
icestorm2 = IceStorm(createDb=False, cleanDb=True)
diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk
index d58748369cf..1632bdcc4af 100644
--- a/cpp/test/IceStorm/rep1/Makefile.mk
+++ b/cpp/test/IceStorm/rep1/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber sub
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/rep1/Publisher.cpp b/cpp/test/IceStorm/rep1/Publisher.cpp
index 7cb95220dc9..67746af7429 100644
--- a/cpp/test/IceStorm/rep1/Publisher.cpp
+++ b/cpp/test/IceStorm/rep1/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/rep1/Single.ice b/cpp/test/IceStorm/rep1/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/rep1/Single.ice
+++ b/cpp/test/IceStorm/rep1/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/rep1/Sub.cpp b/cpp/test/IceStorm/rep1/Sub.cpp
index 33f5b0e73c5..f7a62cd15e8 100644
--- a/cpp/test/IceStorm/rep1/Sub.cpp
+++ b/cpp/test/IceStorm/rep1/Sub.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/rep1/Subscriber.cpp b/cpp/test/IceStorm/rep1/Subscriber.cpp
index a8046e59187..9f567c24b95 100644
--- a/cpp/test/IceStorm/rep1/Subscriber.cpp
+++ b/cpp/test/IceStorm/rep1/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/rep1/test.py b/cpp/test/IceStorm/rep1/test.py
index bcc3a585994..3ecf655909e 100644
--- a/cpp/test/IceStorm/rep1/test.py
+++ b/cpp/test/IceStorm/rep1/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Make sure IceStorm and the subscriber use the same buffer size for
diff --git a/cpp/test/IceStorm/repgrid/Client.cpp b/cpp/test/IceStorm/repgrid/Client.cpp
index 29dcaec120c..12d1c751138 100644
--- a/cpp/test/IceStorm/repgrid/Client.cpp
+++ b/cpp/test/IceStorm/repgrid/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk
index c2b772b4cb9..dab563d2b75 100644
--- a/cpp/test/IceStorm/repgrid/Makefile.mk
+++ b/cpp/test/IceStorm/repgrid/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/repgrid/Single.ice b/cpp/test/IceStorm/repgrid/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/repgrid/Single.ice
+++ b/cpp/test/IceStorm/repgrid/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index d959e8e3768..837772d0369 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -1,10 +1,4 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
-
- **********************************************************************
--->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
<icegrid>
diff --git a/cpp/test/IceStorm/repgrid/test.py b/cpp/test/IceStorm/repgrid/test.py
index 8be50dd6825..4843fa9c692 100644
--- a/cpp/test/IceStorm/repgrid/test.py
+++ b/cpp/test/IceStorm/repgrid/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
TestSuite(__file__, [ IceGridTestCase(icegridregistry=IceGridRegistryMaster(),
diff --git a/cpp/test/IceStorm/repstress/Control.cpp b/cpp/test/IceStorm/repstress/Control.cpp
index 32078d0b56c..1f63f5bf4dc 100644
--- a/cpp/test/IceStorm/repstress/Control.cpp
+++ b/cpp/test/IceStorm/repstress/Control.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Controller.h>
diff --git a/cpp/test/IceStorm/repstress/Controller.ice b/cpp/test/IceStorm/repstress/Controller.ice
index 629cd933e43..a06421c7225 100644
--- a/cpp/test/IceStorm/repstress/Controller.ice
+++ b/cpp/test/IceStorm/repstress/Controller.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk
index 69fc850f1f4..21ca75398e8 100644
--- a/cpp/test/IceStorm/repstress/Makefile.mk
+++ b/cpp/test/IceStorm/repstress/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber control
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/repstress/Publisher.cpp b/cpp/test/IceStorm/repstress/Publisher.cpp
index c92f74df08d..cd917758217 100644
--- a/cpp/test/IceStorm/repstress/Publisher.cpp
+++ b/cpp/test/IceStorm/repstress/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceStorm/repstress/Single.ice b/cpp/test/IceStorm/repstress/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/repstress/Single.ice
+++ b/cpp/test/IceStorm/repstress/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repstress/Subscriber.cpp b/cpp/test/IceStorm/repstress/Subscriber.cpp
index f226460f682..10f2a028014 100644
--- a/cpp/test/IceStorm/repstress/Subscriber.cpp
+++ b/cpp/test/IceStorm/repstress/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/repstress/test.py b/cpp/test/IceStorm/repstress/test.py
index 4dadc84164c..95014662a63 100644
--- a/cpp/test/IceStorm/repstress/test.py
+++ b/cpp/test/IceStorm/repstress/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Make sure IceStorm and the subscriber use the same buffer size for
diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk
index 91cabdca76c..969cc7117be 100644
--- a/cpp/test/IceStorm/single/Makefile.mk
+++ b/cpp/test/IceStorm/single/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp
index 85a71d076f4..abe715961b2 100644
--- a/cpp/test/IceStorm/single/Publisher.cpp
+++ b/cpp/test/IceStorm/single/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/single/Single.ice
+++ b/cpp/test/IceStorm/single/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index b419d77680c..f17a43abd6d 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/single/test.py b/cpp/test/IceStorm/single/test.py
index f05e65cd40d..a225315302f 100644
--- a/cpp/test/IceStorm/single/test.py
+++ b/cpp/test/IceStorm/single/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Make sure the subscriber uses a larger size receive buffer size then
diff --git a/cpp/test/IceStorm/stress/Event.ice b/cpp/test/IceStorm/stress/Event.ice
index aa60f6f7721..4762db01dd3 100644
--- a/cpp/test/IceStorm/stress/Event.ice
+++ b/cpp/test/IceStorm/stress/Event.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk
index 602b04ce532..8cb4c220497 100644
--- a/cpp/test/IceStorm/stress/Makefile.mk
+++ b/cpp/test/IceStorm/stress/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/stress/Publisher.cpp b/cpp/test/IceStorm/stress/Publisher.cpp
index a948ce186d0..221d4c74d73 100644
--- a/cpp/test/IceStorm/stress/Publisher.cpp
+++ b/cpp/test/IceStorm/stress/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp
index d81f9b3a325..77d5dd9e029 100644
--- a/cpp/test/IceStorm/stress/Subscriber.cpp
+++ b/cpp/test/IceStorm/stress/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/stress/test.py b/cpp/test/IceStorm/stress/test.py
index 11ad4257486..8bfe4f6c3b1 100644
--- a/cpp/test/IceStorm/stress/test.py
+++ b/cpp/test/IceStorm/stress/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Publisher/subscriber test cases, publisher publishes on TestIceStorm1 instance(s) and
diff --git a/cpp/test/IceUtil/ctrlCHandler/Client.cpp b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
index d3fdf2515e2..8a9c895364e 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Client.cpp
+++ b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestHelper.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
index fa8fb466264..ca90edb58d9 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
+++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
@@ -1,7 +1,5 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
tests += $(test)
diff --git a/cpp/test/IceUtil/ctrlCHandler/test.py b/cpp/test/IceUtil/ctrlCHandler/test.py
index 72e5406bdd7..716468bad68 100644
--- a/cpp/test/IceUtil/ctrlCHandler/test.py
+++ b/cpp/test/IceUtil/ctrlCHandler/test.py
@@ -1,7 +1,5 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
# Dummy file to not run this test which is only ran manually.
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index df202be9ca9..cb98f306cd7 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/InputUtil.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/test/IceUtil/priority/Client.cpp b/cpp/test/IceUtil/priority/Client.cpp
index c6886413837..ce621805637 100644
--- a/cpp/test/IceUtil/priority/Client.cpp
+++ b/cpp/test/IceUtil/priority/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/Makefile.mk b/cpp/test/IceUtil/priority/Makefile.mk
index 76a975ceb4b..c1ce456b3c9 100644
--- a/cpp/test/IceUtil/priority/Makefile.mk
+++ b/cpp/test/IceUtil/priority/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp
index 0cc6856fcc4..4666dde268b 100644
--- a/cpp/test/IceUtil/priority/PriorityInversion.cpp
+++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <PriorityInversion.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceUtil/priority/PriorityInversion.h b/cpp/test/IceUtil/priority/PriorityInversion.h
index b59a695f006..b1f9e16571d 100644
--- a/cpp/test/IceUtil/priority/PriorityInversion.h
+++ b/cpp/test/IceUtil/priority/PriorityInversion.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef PRIORITY_INVERSION_TEST_H
#define PRIORITY_INVERSION_TEST_H
diff --git a/cpp/test/IceUtil/priority/TestBase.cpp b/cpp/test/IceUtil/priority/TestBase.cpp
index 3d6da074efb..7d5de7d864b 100644
--- a/cpp/test/IceUtil/priority/TestBase.cpp
+++ b/cpp/test/IceUtil/priority/TestBase.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/TestBase.h b/cpp/test/IceUtil/priority/TestBase.h
index 63bae0e33f8..0d76d3612db 100644
--- a/cpp/test/IceUtil/priority/TestBase.h
+++ b/cpp/test/IceUtil/priority/TestBase.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_BASE_H
#define TEST_BASE_H
diff --git a/cpp/test/IceUtil/priority/TestSuite.cpp b/cpp/test/IceUtil/priority/TestSuite.cpp
index 191a8a07bef..2e59564b809 100644
--- a/cpp/test/IceUtil/priority/TestSuite.cpp
+++ b/cpp/test/IceUtil/priority/TestSuite.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/MutexProtocol.h>
diff --git a/cpp/test/IceUtil/priority/TestSuite.h b/cpp/test/IceUtil/priority/TestSuite.h
index 4099bb006f4..f4a7543dfde 100644
--- a/cpp/test/IceUtil/priority/TestSuite.h
+++ b/cpp/test/IceUtil/priority/TestSuite.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_SUITE_H
#define TEST_SUITE_H
diff --git a/cpp/test/IceUtil/priority/ThreadPriority.cpp b/cpp/test/IceUtil/priority/ThreadPriority.cpp
index 6609e3e1e1b..796f08bac2a 100644
--- a/cpp/test/IceUtil/priority/ThreadPriority.cpp
+++ b/cpp/test/IceUtil/priority/ThreadPriority.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/ThreadPriority.h b/cpp/test/IceUtil/priority/ThreadPriority.h
index 0e6594e5232..7da0d44fd52 100644
--- a/cpp/test/IceUtil/priority/ThreadPriority.h
+++ b/cpp/test/IceUtil/priority/ThreadPriority.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef THREAD_PRIORITY_TEST_H
#define THREAD_PRIORITY_TEST_H
diff --git a/cpp/test/IceUtil/priority/TimerPriority.cpp b/cpp/test/IceUtil/priority/TimerPriority.cpp
index 0581411a276..43c1624a845 100644
--- a/cpp/test/IceUtil/priority/TimerPriority.cpp
+++ b/cpp/test/IceUtil/priority/TimerPriority.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Timer.h>
diff --git a/cpp/test/IceUtil/priority/TimerPriority.h b/cpp/test/IceUtil/priority/TimerPriority.h
index c7ada13f602..ba77a579474 100644
--- a/cpp/test/IceUtil/priority/TimerPriority.h
+++ b/cpp/test/IceUtil/priority/TimerPriority.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TIMER_PRIORITY_TEST_H
#define TIMER_PRIORITY_TEST_H
diff --git a/cpp/test/IceUtil/priority/test.py b/cpp/test/IceUtil/priority/test.py
index fa05a1311c9..959b294ed8e 100644
--- a/cpp/test/IceUtil/priority/test.py
+++ b/cpp/test/IceUtil/priority/test.py
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
if not isinstance(platform, Darwin) and (isinstance(platform, Windows) or os.getuid() == 0):
TestSuite(__name__)
diff --git a/cpp/test/IceUtil/sha1/Client.cpp b/cpp/test/IceUtil/sha1/Client.cpp
index ee4a27c414d..62bbb220aeb 100644
--- a/cpp/test/IceUtil/sha1/Client.cpp
+++ b/cpp/test/IceUtil/sha1/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/SHA1.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp
index 7ae31f6ab7d..47a387f525c 100644
--- a/cpp/test/IceUtil/stacktrace/Client.cpp
+++ b/cpp/test/IceUtil/stacktrace/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceUtil/stacktrace/test.py b/cpp/test/IceUtil/stacktrace/test.py
index 3ce21186bc9..3636632dd89 100644
--- a/cpp/test/IceUtil/stacktrace/test.py
+++ b/cpp/test/IceUtil/stacktrace/test.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
TestSuite(__name__, options = { "cpp11" : [False] })
diff --git a/cpp/test/IceUtil/thread/AliveTest.cpp b/cpp/test/IceUtil/thread/AliveTest.cpp
index 24e6cf35c80..1e2f191aa5f 100644
--- a/cpp/test/IceUtil/thread/AliveTest.cpp
+++ b/cpp/test/IceUtil/thread/AliveTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <AliveTest.h>
diff --git a/cpp/test/IceUtil/thread/AliveTest.h b/cpp/test/IceUtil/thread/AliveTest.h
index 8d40e8b3374..3ba5d6514ed 100644
--- a/cpp/test/IceUtil/thread/AliveTest.h
+++ b/cpp/test/IceUtil/thread/AliveTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 8146a7af76b..d2bdf95a1a6 100644
--- a/cpp/test/IceUtil/thread/Client.cpp
+++ b/cpp/test/IceUtil/thread/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
index 6e4c3935507..abcd0420b29 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/CountDownLatch.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.h b/cpp/test/IceUtil/thread/CountDownLatchTest.h
index 333d10a7715..3ef6b789375 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.h
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 3c4d7541ac6..8ebe03a4019 100644
--- a/cpp/test/IceUtil/thread/CreateTest.cpp
+++ b/cpp/test/IceUtil/thread/CreateTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h
index 86c541302cd..2f5c6dc2f22 100644
--- a/cpp/test/IceUtil/thread/CreateTest.h
+++ b/cpp/test/IceUtil/thread/CreateTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CREATE_TEST_H
#define CREATE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Makefile.mk b/cpp/test/IceUtil/thread/Makefile.mk
index 76a975ceb4b..c1ce456b3c9 100644
--- a/cpp/test/IceUtil/thread/Makefile.mk
+++ b/cpp/test/IceUtil/thread/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
index 48f7610d3d6..52cb49fbaf8 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h
index b138da6e0a8..e3eec115839 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 23e6594d468..fd2dcc1f948 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
index 5ae3f6b2f07..7a12b18adaa 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 47678184553..612f1b2ac33 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h
index 9892b368d22..782dec0956f 100644
--- a/cpp/test/IceUtil/thread/MutexTest.h
+++ b/cpp/test/IceUtil/thread/MutexTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef MUTEX_TEST_H
#define MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp
index ca3a1ab2b3b..47c751236aa 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h
index 721f42372ab..4b8a980ff48 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RecMutexTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef REC_MUTEX_TEST_H
#define REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/SleepTest.cpp b/cpp/test/IceUtil/thread/SleepTest.cpp
index 536d0c08594..5692bc85630 100644
--- a/cpp/test/IceUtil/thread/SleepTest.cpp
+++ b/cpp/test/IceUtil/thread/SleepTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/SleepTest.h b/cpp/test/IceUtil/thread/SleepTest.h
index 20fbac9a7b8..8ba3eae0138 100644
--- a/cpp/test/IceUtil/thread/SleepTest.h
+++ b/cpp/test/IceUtil/thread/SleepTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLEEP_TEST_H
#define SLEEP_TEST_H
diff --git a/cpp/test/IceUtil/thread/StartTest.cpp b/cpp/test/IceUtil/thread/StartTest.cpp
index 45fc05828d3..d14fc6b38d3 100644
--- a/cpp/test/IceUtil/thread/StartTest.cpp
+++ b/cpp/test/IceUtil/thread/StartTest.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/StartTest.h b/cpp/test/IceUtil/thread/StartTest.h
index 59e467546a6..4aba24401c4 100644
--- a/cpp/test/IceUtil/thread/StartTest.h
+++ b/cpp/test/IceUtil/thread/StartTest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef START_TEST_H
#define START_TEST_H
diff --git a/cpp/test/IceUtil/thread/TestBase.cpp b/cpp/test/IceUtil/thread/TestBase.cpp
index 3d6da074efb..7d5de7d864b 100644
--- a/cpp/test/IceUtil/thread/TestBase.cpp
+++ b/cpp/test/IceUtil/thread/TestBase.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h
index 63bae0e33f8..0d76d3612db 100644
--- a/cpp/test/IceUtil/thread/TestBase.h
+++ b/cpp/test/IceUtil/thread/TestBase.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#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 ab601606fea..2bc2c7e2ef0 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <TestBase.h>
#include <list>
diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h
index 4099bb006f4..f4a7543dfde 100644
--- a/cpp/test/IceUtil/thread/TestSuite.h
+++ b/cpp/test/IceUtil/thread/TestSuite.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_SUITE_H
#define TEST_SUITE_H
diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp
index ddc0ae8b0e3..27ec7a197af 100644
--- a/cpp/test/IceUtil/timer/Client.cpp
+++ b/cpp/test/IceUtil/timer/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Timer.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index b5ac45976ed..8e09ef3618e 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <TestHelper.h>
diff --git a/cpp/test/IceUtil/unicode/test.py b/cpp/test/IceUtil/unicode/test.py
index 781433d8f28..f0bd36f72fa 100644
--- a/cpp/test/IceUtil/unicode/test.py
+++ b/cpp/test/IceUtil/unicode/test.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
TestSuite(__name__, [ ClientTestCase(client=SimpleClient(args=["{testdir}"])) ])
diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
index 636a3580d3c..729d5e9e4fb 100644
--- a/cpp/test/IceUtil/uuid/Client.cpp
+++ b/cpp/test/IceUtil/uuid/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/UUID.h>
#include <IceUtil/Random.h>
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
index 0cb832cefed..a960b55a010 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index f2419a3671a..abf7837f4c8 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
index 8207ac66784..92c78be1f80 100644
--- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index f5c18fd6255..32a945d1f2a 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
index c959e11913e..b866cd44af5 100644
--- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
index 1bfc07fd997..ebe98b7a55a 100644
--- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
+++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
index e80e7e8b02e..595a263857f 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
index 2c060578e5f..5b916e3c90f 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
index 899bfbc46c7..6cba5aaa234 100644
--- a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
+++ b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
interface Foo
{
diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
index a227d2389e7..5d0aad790c0 100644
--- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
index 27099deb977..3406ba411b8 100644
--- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice
index ce7a101234b..732caecb87d 100644
--- a/cpp/test/Slice/errorDetection/EnumEmpty.ice
+++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
index 90a60ab0e1e..cce9f95c864 100644
--- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
index 2d9254ca7f6..28abab0173f 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
index d1f025b3e3d..65eb03c3a4a 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/EnumeratorValues.ice b/cpp/test/Slice/errorDetection/EnumeratorValues.ice
index 7e5e91abe98..f45c99d8b8b 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorValues.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorValues.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
index c4a5ca1c8eb..2081dc891fd 100644
--- a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
index 740add511ff..94c5694425e 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
index 78dc47c5ac8..71d17dd7f91 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["underscore"]]
diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
index cf60072b4ba..ee11622eaf9 100644
--- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
exception E;
struct S;
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
index f0e240d2fa6..27e7868ddb3 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
index a40bfe3ec58..9fb01c13420 100644
--- a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
+++ b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
@@ -2,11 +2,9 @@
// NOTE: Keep the initial blank line. This is necessary to avoid a problem
// with system-provided mcpp versions that don't include ZeroC's BOM patch.
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// Check that UTF-8 BOM is rejected when not at start of file
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice
index 308bf703d76..a7b83c57a18 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.ice
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice
index ab40eba2c1a..7dede229880 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.ice
+++ b/cpp/test/Slice/errorDetection/IllegalMI.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module M1
{
diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
index f9562bbcbce..d6c31c0dc3c 100644
--- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
index 6e91cf55597..c74defc4862 100644
--- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
index f4177e6c711..1cb331c32e1 100644
--- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice
index 4706483181e..80a211158d3 100644
--- a/cpp/test/Slice/errorDetection/LocalMismatch.ice
+++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
index e8daf72c83a..e5b7327f045 100644
--- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
+++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
index 2e03532c2d4..516360713f7 100644
--- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
+++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice
index befae0d9215..5d05b0138b6 100644
--- a/cpp/test/Slice/errorDetection/NotException.ice
+++ b/cpp/test/Slice/errorDetection/NotException.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module M
{
diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice
index 8f2bf0d6f8b..87fcfd80361 100644
--- a/cpp/test/Slice/errorDetection/NotType.ice
+++ b/cpp/test/Slice/errorDetection/NotType.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
index ebc88ac7124..83d914fa198 100644
--- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.ice b/cpp/test/Slice/errorDetection/OptionalMembers.ice
index e0f9e2fbd9f..a4f28a12c63 100644
--- a/cpp/test/Slice/errorDetection/OptionalMembers.ice
+++ b/cpp/test/Slice/errorDetection/OptionalMembers.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/OptionalParams.ice b/cpp/test/Slice/errorDetection/OptionalParams.ice
index 73d167930ac..68214967370 100644
--- a/cpp/test/Slice/errorDetection/OptionalParams.ice
+++ b/cpp/test/Slice/errorDetection/OptionalParams.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
index abd06967df5..ae69083cba2 100644
--- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
+++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
index 9088b5e1caa..45728498a7f 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
index 5aa00011df1..91e29f1f022 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
index c2b56f35f83..dac39b0c543 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
index 86ffd1623fd..8989d370425 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
index dcbb1e9e8d9..25ce753d12f 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
index 0c0349b1059..fbb77fd9aa2 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
index 042aa35fad9..e1497289b9f 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
index e77f55d9fff..7cf41008b06 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index a6ef16f1d0e..8b23d1ea1e9 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <include/IcePrefix.ice> // No error should be caused by this file
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice
index 66ef44a9b0a..d434bf3fc92 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.ice
+++ b/cpp/test/Slice/errorDetection/SelfContainment.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
index a421705b825..8ecd48904b4 100644
--- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice
index 9d8893d38b8..daac87a42e7 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.ice
+++ b/cpp/test/Slice/errorDetection/StructMembers.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/StructRedefinition.ice b/cpp/test/Slice/errorDetection/StructRedefinition.ice
index df546245f97..2ebd797fb58 100644
--- a/cpp/test/Slice/errorDetection/StructRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/StructRedefinition.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice
index dc82bdfece0..aeb18baed2a 100644
--- a/cpp/test/Slice/errorDetection/Undefined.ice
+++ b/cpp/test/Slice/errorDetection/Undefined.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/WarningClassProxy.ice b/cpp/test/Slice/errorDetection/WarningClassProxy.ice
index 027f465ed78..534c754a5f4 100644
--- a/cpp/test/Slice/errorDetection/WarningClassProxy.ice
+++ b/cpp/test/Slice/errorDetection/WarningClassProxy.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
index 14ccc27444c..c80e193a2e5 100644
--- a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
+++ b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
index 1d590354750..ef6f802f26e 100644
--- a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
+++ b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["cpp:header-ext:hh"]]
[["cpp:header-ext:hh"]]
diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
index d5301b6812a..f8a7a236f32 100644
--- a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
+++ b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:invalid-metadata"]]
diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice
index 637e477f355..19a79076563 100644
--- a/cpp/test/Slice/errorDetection/WrongProxyType.ice
+++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module Test
{
diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
index 7fac95e93e3..034229170aa 100644
--- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice
+++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
module IceSomething {}
diff --git a/cpp/test/Slice/errorDetection/test.py b/cpp/test/Slice/errorDetection/test.py
index 86f72dd6822..a0ed798edea 100644
--- a/cpp/test/Slice/errorDetection/test.py
+++ b/cpp/test/Slice/errorDetection/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import glob
diff --git a/cpp/test/Slice/escape/Clash.ice b/cpp/test/Slice/escape/Clash.ice
index 4e62034ca18..7b55fe7d90b 100644
--- a/cpp/test/Slice/escape/Clash.ice
+++ b/cpp/test/Slice/escape/Clash.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["underscore"]]
diff --git a/cpp/test/Slice/escape/Client.cpp b/cpp/test/Slice/escape/Client.cpp
index 17b90191266..01c922c0a85 100644
--- a/cpp/test/Slice/escape/Client.cpp
+++ b/cpp/test/Slice/escape/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Slice/escape/Key.ice b/cpp/test/Slice/escape/Key.ice
index 1744070583e..a20ecc97e55 100644
--- a/cpp/test/Slice/escape/Key.ice
+++ b/cpp/test/Slice/escape/Key.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["underscore"]]
[["suppress-warning:deprecated"]]
diff --git a/cpp/test/Slice/escape/Makefile.mk b/cpp/test/Slice/escape/Makefile.mk
index 257e15b02be..4f103d02814 100644
--- a/cpp/test/Slice/escape/Makefile.mk
+++ b/cpp/test/Slice/escape/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.cpp Clash.ice Key.ice
diff --git a/cpp/test/Slice/headers/test.py b/cpp/test/Slice/headers/test.py
index de6bd1a905a..2ded9c53337 100644
--- a/cpp/test/Slice/headers/test.py
+++ b/cpp/test/Slice/headers/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import glob
diff --git a/cpp/test/Slice/macros/Client.cpp b/cpp/test/Slice/macros/Client.cpp
index f5071a11f22..98b51ad4fc9 100644
--- a/cpp/test/Slice/macros/Client.cpp
+++ b/cpp/test/Slice/macros/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Slice/macros/Test.ice b/cpp/test/Slice/macros/Test.ice
index 25636dece2d..cfcc9e9ada1 100644
--- a/cpp/test/Slice/macros/Test.ice
+++ b/cpp/test/Slice/macros/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// This macro sets the default value only when compiling with slice2cpp.
diff --git a/cpp/test/Slice/parser/CircularA.ice b/cpp/test/Slice/parser/CircularA.ice
index 7b85eedbc12..2334b701baf 100644
--- a/cpp/test/Slice/parser/CircularA.ice
+++ b/cpp/test/Slice/parser/CircularA.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Slice/parser/CircularB.ice b/cpp/test/Slice/parser/CircularB.ice
index e155e584e69..9079e402f08 100644
--- a/cpp/test/Slice/parser/CircularB.ice
+++ b/cpp/test/Slice/parser/CircularB.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp
index ccdada87e5e..79065eff642 100644
--- a/cpp/test/Slice/structure/Client.cpp
+++ b/cpp/test/Slice/structure/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <TestHelper.h>
diff --git a/cpp/test/Slice/structure/Test.ice b/cpp/test/Slice/structure/Test.ice
index c54b243f6f6..a1b9c826abe 100644
--- a/cpp/test/Slice/structure/Test.ice
+++ b/cpp/test/Slice/structure/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["cpp:include:list"]]
diff --git a/cpp/test/Slice/unicodePaths/test.py b/cpp/test/Slice/unicodePaths/test.py
index 18692397c4e..94a7ce618c1 100644
--- a/cpp/test/Slice/unicodePaths/test.py
+++ b/cpp/test/Slice/unicodePaths/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import shutil, locale
diff --git a/cpp/test/Slice/utf8BOM/Test.ice b/cpp/test/Slice/utf8BOM/Test.ice
index f9fcc584aa1..821cd9d395b 100644
--- a/cpp/test/Slice/utf8BOM/Test.ice
+++ b/cpp/test/Slice/utf8BOM/Test.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h
index 56ce76e31c7..e30305fda46 100644
--- a/cpp/test/include/TestHelper.h
+++ b/cpp/test/include/TestHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_HELPER_H
#define TEST_HELPER_H
diff --git a/cpp/test/ios/controller/Bundle/ControllerI.mm b/cpp/test/ios/controller/Bundle/ControllerI.mm
index b05da75159c..08c9246de4e 100644
--- a/cpp/test/ios/controller/Bundle/ControllerI.mm
+++ b/cpp/test/ios/controller/Bundle/ControllerI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Foundation/Foundation.h>
diff --git a/cpp/test/ios/controller/Classes/AppDelegate.h b/cpp/test/ios/controller/Classes/AppDelegate.h
index 316bcf5e70b..db25348fd91 100644
--- a/cpp/test/ios/controller/Classes/AppDelegate.h
+++ b/cpp/test/ios/controller/Classes/AppDelegate.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <UIKit/UIKit.h>
diff --git a/cpp/test/ios/controller/Classes/AppDelegate.m b/cpp/test/ios/controller/Classes/AppDelegate.m
index c6d714b9ed7..cc1773600fa 100644
--- a/cpp/test/ios/controller/Classes/AppDelegate.m
+++ b/cpp/test/ios/controller/Classes/AppDelegate.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import "AppDelegate.h"
diff --git a/cpp/test/ios/controller/Classes/ControllerView.h b/cpp/test/ios/controller/Classes/ControllerView.h
index 20d5761bcda..bc78e3c7012 100644
--- a/cpp/test/ios/controller/Classes/ControllerView.h
+++ b/cpp/test/ios/controller/Classes/ControllerView.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <UIKit/UIKit.h>
diff --git a/cpp/test/ios/controller/Classes/ControllerView.m b/cpp/test/ios/controller/Classes/ControllerView.m
index c16f5a9b20e..fad924889c5 100644
--- a/cpp/test/ios/controller/Classes/ControllerView.m
+++ b/cpp/test/ios/controller/Classes/ControllerView.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import "ControllerView.h"
diff --git a/cpp/test/ios/controller/Classes/main.m b/cpp/test/ios/controller/Classes/main.m
index 38ed9425fcc..95893f936b7 100644
--- a/cpp/test/ios/controller/Classes/main.m
+++ b/cpp/test/ios/controller/Classes/main.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <UIKit/UIKit.h>
#import "AppDelegate.h"
diff --git a/cpp/test/ios/controller/Makefile.mk b/cpp/test/ios/controller/Makefile.mk
index c44d6f9fecd..4ab56d9c0cb 100644
--- a/cpp/test/ios/controller/Makefile.mk
+++ b/cpp/test/ios/controller/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_type = xcode
$(project)_platforms = iphonesimulator iphoneos
diff --git a/cpp/test/uwp/controller/App.xaml.cpp b/cpp/test/uwp/controller/App.xaml.cpp
index f06d160c7b3..d86c3d82e4e 100644
--- a/cpp/test/uwp/controller/App.xaml.cpp
+++ b/cpp/test/uwp/controller/App.xaml.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "pch.h"
#include "ControllerView.xaml.h"
diff --git a/cpp/test/uwp/controller/App.xaml.h b/cpp/test/uwp/controller/App.xaml.h
index 148e6fbbba7..f97da19b9f5 100644
--- a/cpp/test/uwp/controller/App.xaml.h
+++ b/cpp/test/uwp/controller/App.xaml.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/uwp/controller/ControllerView.xaml b/cpp/test/uwp/controller/ControllerView.xaml
index 569990319a9..9293b1d25de 100644
--- a/cpp/test/uwp/controller/ControllerView.xaml
+++ b/cpp/test/uwp/controller/ControllerView.xaml
@@ -25,7 +25,7 @@
SelectionChanged="Hostname_SelectionChanged"></ComboBox>
<ListBox Margin="5" Grid.Row="2" x:Name="Output" Background="LightGray"></ListBox>
<StackPanel Grid.Row="3" VerticalAlignment="Bottom">
- <TextBlock Text="Copyright (c) 2003-present ZeroC, Inc. All rights reserved."
+ <TextBlock Text="Copyright (c) ZeroC, Inc. All rights reserved."
Style="{StaticResource FooterStyle}"
Margin="5"
TextWrapping="Wrap"/>
diff --git a/cpp/test/uwp/controller/ControllerView.xaml.cpp b/cpp/test/uwp/controller/ControllerView.xaml.cpp
index 2a118ee658b..a4485ae1afb 100644
--- a/cpp/test/uwp/controller/ControllerView.xaml.cpp
+++ b/cpp/test/uwp/controller/ControllerView.xaml.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "ControllerView.xaml.h"
diff --git a/cpp/test/uwp/controller/ControllerView.xaml.h b/cpp/test/uwp/controller/ControllerView.xaml.h
index f8db9f6f358..734091499d5 100644
--- a/cpp/test/uwp/controller/ControllerView.xaml.h
+++ b/cpp/test/uwp/controller/ControllerView.xaml.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once