summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
committerJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
commit7a7d495fb0c5a63e404eb62a0461bbafb06d6175 (patch)
treee0877720ce67950b8b0eaaef410631013c3cf2a4 /cpp
parentRemove anonymous cipher usage in IceSSL/configuration (diff)
downloadice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.bz2
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.xz
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.zip
Copyright header simplication
Diffstat (limited to 'cpp')
-rw-r--r--cpp/Makefile4
-rwxr-xr-xcpp/allTests.py4
-rw-r--r--cpp/config/Make.rules4
-rw-r--r--cpp/config/Make.xcodesdk.rules4
-rw-r--r--cpp/config/ice_ca.cnf4
-rw-r--r--cpp/config/templates.xml8
-rw-r--r--cpp/include/Glacier2/Application.h4
-rw-r--r--cpp/include/Glacier2/Config.h4
-rw-r--r--cpp/include/Glacier2/Glacier2.h4
-rw-r--r--cpp/include/Glacier2/NullPermissionsVerifier.h4
-rw-r--r--cpp/include/Glacier2/SessionHelper.h4
-rw-r--r--cpp/include/Ice/Application.h4
-rw-r--r--cpp/include/Ice/AsyncResult.h4
-rw-r--r--cpp/include/Ice/AsyncResultF.h4
-rw-r--r--cpp/include/Ice/BatchRequestInterceptor.h4
-rw-r--r--cpp/include/Ice/BatchRequestQueueF.h4
-rw-r--r--cpp/include/Ice/Buffer.h4
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h4
-rw-r--r--cpp/include/Ice/Comparable.h4
-rw-r--r--cpp/include/Ice/Config.h4
-rw-r--r--cpp/include/Ice/ConnectionAsync.h4
-rw-r--r--cpp/include/Ice/ConnectionIF.h4
-rw-r--r--cpp/include/Ice/ConsoleUtil.h4
-rw-r--r--cpp/include/Ice/DefaultValueFactory.h4
-rw-r--r--cpp/include/Ice/DispatchInterceptor.h4
-rw-r--r--cpp/include/Ice/Dispatcher.h4
-rw-r--r--cpp/include/Ice/DynamicLibrary.h4
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h4
-rw-r--r--cpp/include/Ice/Exception.h4
-rw-r--r--cpp/include/Ice/ExceptionHelpers.h4
-rw-r--r--cpp/include/Ice/FactoryTable.h4
-rw-r--r--cpp/include/Ice/FactoryTableInit.h4
-rw-r--r--cpp/include/Ice/Format.h4
-rw-r--r--cpp/include/Ice/Functional.h4
-rw-r--r--cpp/include/Ice/GCObject.h4
-rw-r--r--cpp/include/Ice/Handle.h4
-rw-r--r--cpp/include/Ice/Ice.h4
-rw-r--r--cpp/include/Ice/IconvStringConverter.h4
-rw-r--r--cpp/include/Ice/Incoming.h4
-rw-r--r--cpp/include/Ice/IncomingAsync.h4
-rw-r--r--cpp/include/Ice/IncomingAsyncF.h4
-rw-r--r--cpp/include/Ice/Initialize.h4
-rw-r--r--cpp/include/Ice/InputStream.h4
-rw-r--r--cpp/include/Ice/InstanceF.h4
-rw-r--r--cpp/include/Ice/InterfaceByValue.h4
-rw-r--r--cpp/include/Ice/LocalObject.h4
-rw-r--r--cpp/include/Ice/LocalObjectF.h4
-rw-r--r--cpp/include/Ice/LoggerUtil.h4
-rw-r--r--cpp/include/Ice/MetricsAdminI.h4
-rw-r--r--cpp/include/Ice/MetricsFunctional.h4
-rw-r--r--cpp/include/Ice/MetricsObserverI.h4
-rw-r--r--cpp/include/Ice/NativePropertiesAdmin.h4
-rw-r--r--cpp/include/Ice/Object.h4
-rw-r--r--cpp/include/Ice/ObjectF.h4
-rw-r--r--cpp/include/Ice/ObserverHelper.h4
-rw-r--r--cpp/include/Ice/Optional.h4
-rw-r--r--cpp/include/Ice/OutgoingAsync.h4
-rw-r--r--cpp/include/Ice/OutgoingAsyncF.h4
-rw-r--r--cpp/include/Ice/OutputStream.h4
-rw-r--r--cpp/include/Ice/Protocol.h4
-rw-r--r--cpp/include/Ice/Proxy.h4
-rw-r--r--cpp/include/Ice/ProxyF.h4
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h4
-rw-r--r--cpp/include/Ice/ProxyHandle.h4
-rw-r--r--cpp/include/Ice/ReferenceF.h4
-rw-r--r--cpp/include/Ice/RegisterPlugins.h4
-rw-r--r--cpp/include/Ice/RequestHandlerF.h4
-rw-r--r--cpp/include/Ice/ResponseHandlerF.h4
-rw-r--r--cpp/include/Ice/SHA1.h4
-rw-r--r--cpp/include/Ice/ServantManagerF.h4
-rw-r--r--cpp/include/Ice/Service.h4
-rw-r--r--cpp/include/Ice/SliceChecksums.h4
-rw-r--r--cpp/include/Ice/SlicedData.h4
-rw-r--r--cpp/include/Ice/SlicedDataF.h4
-rw-r--r--cpp/include/Ice/StreamHelpers.h4
-rw-r--r--cpp/include/Ice/StringConverter.h4
-rw-r--r--cpp/include/Ice/ThreadPoolF.h4
-rw-r--r--cpp/include/Ice/UUID.h4
-rw-r--r--cpp/include/Ice/UniquePtr.h4
-rw-r--r--cpp/include/Ice/UniqueRef.h4
-rw-r--r--cpp/include/Ice/UserExceptionFactory.h4
-rw-r--r--cpp/include/Ice/Value.h4
-rw-r--r--cpp/include/Ice/ValueF.h4
-rw-r--r--cpp/include/IceBT/IceBT.h4
-rw-r--r--cpp/include/IceBT/Makefile4
-rw-r--r--cpp/include/IceBT/Plugin.h4
-rw-r--r--cpp/include/IceBox/Config.h4
-rw-r--r--cpp/include/IceGrid/Config.h4
-rw-r--r--cpp/include/IceGrid/IceGrid.h4
-rw-r--r--cpp/include/IceGrid/ReplicaGroupFilter.h4
-rw-r--r--cpp/include/IceIAP/IceIAP.h4
-rw-r--r--cpp/include/IcePatch2/ClientUtil.h4
-rw-r--r--cpp/include/IcePatch2/Config.h4
-rw-r--r--cpp/include/IcePatch2/IcePatch2.h4
-rw-r--r--cpp/include/IceSSL/Config.h4
-rw-r--r--cpp/include/IceSSL/IceSSL.h4
-rw-r--r--cpp/include/IceSSL/OpenSSL.h4
-rw-r--r--cpp/include/IceSSL/Plugin.h4
-rw-r--r--cpp/include/IceSSL/SChannel.h4
-rw-r--r--cpp/include/IceSSL/SecureTransport.h4
-rw-r--r--cpp/include/IceSSL/UWP.h4
-rw-r--r--cpp/include/IceStorm/Config.h4
-rw-r--r--cpp/include/IceUtil/Atomic.h4
-rw-r--r--cpp/include/IceUtil/Cond.h4
-rw-r--r--cpp/include/IceUtil/Config.h4
-rw-r--r--cpp/include/IceUtil/ConsoleUtil.h4
-rw-r--r--cpp/include/IceUtil/CountDownLatch.h4
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h4
-rw-r--r--cpp/include/IceUtil/DisableWarnings.h4
-rw-r--r--cpp/include/IceUtil/Exception.h4
-rw-r--r--cpp/include/IceUtil/FileUtil.h4
-rw-r--r--cpp/include/IceUtil/Functional.h4
-rw-r--r--cpp/include/IceUtil/Handle.h4
-rw-r--r--cpp/include/IceUtil/IceUtil.h4
-rw-r--r--cpp/include/IceUtil/InputUtil.h4
-rw-r--r--cpp/include/IceUtil/Iterator.h4
-rw-r--r--cpp/include/IceUtil/Lock.h4
-rw-r--r--cpp/include/IceUtil/Monitor.h4
-rw-r--r--cpp/include/IceUtil/Mutex.h4
-rw-r--r--cpp/include/IceUtil/MutexProtocol.h4
-rw-r--r--cpp/include/IceUtil/MutexPtrLock.h4
-rw-r--r--cpp/include/IceUtil/MutexPtrTryLock.h4
-rw-r--r--cpp/include/IceUtil/Optional.h4
-rw-r--r--cpp/include/IceUtil/Options.h4
-rw-r--r--cpp/include/IceUtil/OutputUtil.h4
-rw-r--r--cpp/include/IceUtil/PopDisableWarnings.h4
-rw-r--r--cpp/include/IceUtil/PushDisableWarnings.h4
-rw-r--r--cpp/include/IceUtil/Random.h4
-rw-r--r--cpp/include/IceUtil/RecMutex.h4
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h6
-rw-r--r--cpp/include/IceUtil/ScannerConfig.h4
-rw-r--r--cpp/include/IceUtil/ScopedArray.h4
-rw-r--r--cpp/include/IceUtil/Shared.h4
-rw-r--r--cpp/include/IceUtil/StopWatch.h4
-rw-r--r--cpp/include/IceUtil/StringConverter.h4
-rw-r--r--cpp/include/IceUtil/StringUtil.h4
-rw-r--r--cpp/include/IceUtil/Thread.h4
-rw-r--r--cpp/include/IceUtil/ThreadException.h4
-rw-r--r--cpp/include/IceUtil/Time.h4
-rw-r--r--cpp/include/IceUtil/Timer.h4
-rw-r--r--cpp/include/IceUtil/UUID.h4
-rw-r--r--cpp/include/IceUtil/UndefSysMacros.h4
-rw-r--r--cpp/msbuild/zeroc.ice.uwp.v140.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.uwp.v141.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.v100.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.v120.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.v140.nuspec2
-rw-r--r--cpp/msbuild/zeroc.ice.v141.nuspec2
-rw-r--r--cpp/src/Glacier2/Blobject.cpp4
-rw-r--r--cpp/src/Glacier2/Blobject.h4
-rw-r--r--cpp/src/Glacier2/ClientBlobject.cpp4
-rw-r--r--cpp/src/Glacier2/ClientBlobject.h4
-rw-r--r--cpp/src/Glacier2/FilterI.cpp4
-rw-r--r--cpp/src/Glacier2/FilterI.h4
-rw-r--r--cpp/src/Glacier2/FilterManager.cpp4
-rw-r--r--cpp/src/Glacier2/FilterManager.h4
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp4
-rw-r--r--cpp/src/Glacier2/Instance.cpp4
-rw-r--r--cpp/src/Glacier2/Instance.h4
-rw-r--r--cpp/src/Glacier2/Instrumentation.ice4
-rw-r--r--cpp/src/Glacier2/InstrumentationI.cpp4
-rw-r--r--cpp/src/Glacier2/InstrumentationI.h4
-rw-r--r--cpp/src/Glacier2/Makefile.mk4
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.cpp4
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.h4
-rw-r--r--cpp/src/Glacier2/RequestQueue.cpp4
-rw-r--r--cpp/src/Glacier2/RequestQueue.h4
-rw-r--r--cpp/src/Glacier2/RouterI.cpp4
-rw-r--r--cpp/src/Glacier2/RouterI.h4
-rw-r--r--cpp/src/Glacier2/RoutingTable.cpp4
-rw-r--r--cpp/src/Glacier2/RoutingTable.h4
-rw-r--r--cpp/src/Glacier2/ServerBlobject.cpp4
-rw-r--r--cpp/src/Glacier2/ServerBlobject.h4
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp4
-rw-r--r--cpp/src/Glacier2/SessionRouterI.h4
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp4
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk4
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp4
-rw-r--r--cpp/src/Glacier2Lib/Makefile.mk4
-rw-r--r--cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp4
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp4
-rw-r--r--cpp/src/Ice/ACM.cpp4
-rw-r--r--cpp/src/Ice/ACM.h4
-rw-r--r--cpp/src/Ice/ACMF.h4
-rw-r--r--cpp/src/Ice/Acceptor.cpp4
-rw-r--r--cpp/src/Ice/Acceptor.h4
-rw-r--r--cpp/src/Ice/AcceptorF.h4
-rw-r--r--cpp/src/Ice/Application.cpp4
-rw-r--r--cpp/src/Ice/ArgVector.cpp4
-rw-r--r--cpp/src/Ice/ArgVector.h4
-rw-r--r--cpp/src/Ice/AsyncResult.cpp4
-rw-r--r--cpp/src/Ice/Base64.cpp4
-rw-r--r--cpp/src/Ice/Base64.h4
-rw-r--r--cpp/src/Ice/BatchRequestQueue.cpp4
-rw-r--r--cpp/src/Ice/BatchRequestQueue.h4
-rw-r--r--cpp/src/Ice/Buffer.cpp4
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.cpp4
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.h4
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp4
-rw-r--r--cpp/src/Ice/CommunicatorI.h4
-rw-r--r--cpp/src/Ice/Cond.cpp4
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp4
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.h4
-rw-r--r--cpp/src/Ice/ConnectRequestHandlerF.h4
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp4
-rw-r--r--cpp/src/Ice/ConnectionFactory.h4
-rw-r--r--cpp/src/Ice/ConnectionFactoryF.h4
-rw-r--r--cpp/src/Ice/ConnectionI.cpp4
-rw-r--r--cpp/src/Ice/ConnectionI.h4
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.cpp4
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.h4
-rw-r--r--cpp/src/Ice/Connector.cpp4
-rw-r--r--cpp/src/Ice/Connector.h4
-rw-r--r--cpp/src/Ice/ConnectorF.h4
-rw-r--r--cpp/src/Ice/CountDownLatch.cpp4
-rw-r--r--cpp/src/Ice/DLLMain.cpp4
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp4
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h4
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h4
-rw-r--r--cpp/src/Ice/DispatchInterceptor.cpp4
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp4
-rw-r--r--cpp/src/Ice/EndpointFactory.cpp4
-rw-r--r--cpp/src/Ice/EndpointFactory.h4
-rw-r--r--cpp/src/Ice/EndpointFactoryF.h4
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp4
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.h4
-rw-r--r--cpp/src/Ice/EndpointFactoryManagerF.h4
-rw-r--r--cpp/src/Ice/EndpointI.cpp4
-rw-r--r--cpp/src/Ice/EndpointI.h4
-rw-r--r--cpp/src/Ice/EndpointIF.h4
-rw-r--r--cpp/src/Ice/EventHandler.cpp4
-rw-r--r--cpp/src/Ice/EventHandler.h4
-rw-r--r--cpp/src/Ice/EventHandlerF.h4
-rwxr-xr-xcpp/src/Ice/EventLoggerMsg.mc4
-rw-r--r--cpp/src/Ice/Exception.cpp4
-rw-r--r--cpp/src/Ice/FactoryTable.cpp4
-rw-r--r--cpp/src/Ice/FactoryTableInit.cpp4
-rw-r--r--cpp/src/Ice/GCObject.cpp4
-rw-r--r--cpp/src/Ice/HashUtil.h4
-rw-r--r--cpp/src/Ice/HttpParser.cpp4
-rw-r--r--cpp/src/Ice/HttpParser.h4
-rw-r--r--cpp/src/Ice/IPEndpointI.cpp4
-rw-r--r--cpp/src/Ice/IPEndpointI.h4
-rw-r--r--cpp/src/Ice/IPEndpointIF.h4
-rw-r--r--cpp/src/Ice/IconvStringConverter.cpp4
-rw-r--r--cpp/src/Ice/ImplicitContextI.cpp4
-rw-r--r--cpp/src/Ice/ImplicitContextI.h4
-rw-r--r--cpp/src/Ice/Incoming.cpp4
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp4
-rw-r--r--cpp/src/Ice/IncomingRequest.h4
-rw-r--r--cpp/src/Ice/Initialize.cpp4
-rw-r--r--cpp/src/Ice/InputStream.cpp4
-rw-r--r--cpp/src/Ice/Instance.cpp4
-rw-r--r--cpp/src/Ice/Instance.h4
-rw-r--r--cpp/src/Ice/InstrumentationI.cpp4
-rw-r--r--cpp/src/Ice/InstrumentationI.h4
-rw-r--r--cpp/src/Ice/LocalObject.cpp4
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp4
-rw-r--r--cpp/src/Ice/LocatorInfo.h4
-rw-r--r--cpp/src/Ice/LocatorInfoF.h4
-rw-r--r--cpp/src/Ice/LoggerAdminI.cpp4
-rw-r--r--cpp/src/Ice/LoggerAdminI.h4
-rw-r--r--cpp/src/Ice/LoggerI.cpp4
-rw-r--r--cpp/src/Ice/LoggerI.h4
-rw-r--r--cpp/src/Ice/LoggerUtil.cpp4
-rw-r--r--cpp/src/Ice/Makefile.mk4
-rw-r--r--cpp/src/Ice/MetricsAdminI.cpp4
-rw-r--r--cpp/src/Ice/MetricsObserverI.cpp4
-rwxr-xr-xcpp/src/Ice/Network.cpp4
-rwxr-xr-xcpp/src/Ice/Network.h4
-rw-r--r--cpp/src/Ice/NetworkF.h4
-rw-r--r--cpp/src/Ice/NetworkProxy.cpp4
-rw-r--r--cpp/src/Ice/NetworkProxy.h4
-rw-r--r--cpp/src/Ice/NetworkProxyF.h4
-rw-r--r--cpp/src/Ice/Object.cpp4
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp4
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.h4
-rw-r--r--cpp/src/Ice/ObjectAdapterFactoryF.h4
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp4
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h4
-rw-r--r--cpp/src/Ice/ObserverHelper.cpp4
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.cpp4
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.h4
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp4
-rw-r--r--cpp/src/Ice/OutputStream.cpp4
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp4
-rw-r--r--cpp/src/Ice/PluginManagerI.h4
-rw-r--r--cpp/src/Ice/PropertiesAdminI.cpp4
-rw-r--r--cpp/src/Ice/PropertiesAdminI.h4
-rw-r--r--cpp/src/Ice/PropertiesI.cpp4
-rw-r--r--cpp/src/Ice/PropertiesI.h4
-rw-r--r--cpp/src/Ice/PropertyNames.cpp4
-rw-r--r--cpp/src/Ice/PropertyNames.h4
-rw-r--r--cpp/src/Ice/Protocol.cpp4
-rw-r--r--cpp/src/Ice/ProtocolInstance.cpp4
-rw-r--r--cpp/src/Ice/ProtocolInstance.h4
-rw-r--r--cpp/src/Ice/ProtocolInstanceF.h4
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp4
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.h4
-rw-r--r--cpp/src/Ice/ProtocolPluginFacadeF.h4
-rw-r--r--cpp/src/Ice/Proxy.cpp4
-rw-r--r--cpp/src/Ice/ProxyFactory.cpp4
-rw-r--r--cpp/src/Ice/ProxyFactory.h4
-rw-r--r--cpp/src/Ice/Reference.cpp4
-rw-r--r--cpp/src/Ice/Reference.h4
-rw-r--r--cpp/src/Ice/ReferenceFactory.cpp4
-rw-r--r--cpp/src/Ice/ReferenceFactory.h4
-rw-r--r--cpp/src/Ice/ReferenceFactoryF.h4
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.cpp4
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.h4
-rw-r--r--cpp/src/Ice/ReplyStatus.h4
-rw-r--r--cpp/src/Ice/RequestHandler.cpp4
-rw-r--r--cpp/src/Ice/RequestHandler.h4
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.cpp4
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.h4
-rw-r--r--cpp/src/Ice/ResponseHandler.cpp4
-rw-r--r--cpp/src/Ice/ResponseHandler.h4
-rw-r--r--cpp/src/Ice/RetryQueue.cpp4
-rw-r--r--cpp/src/Ice/RetryQueue.h4
-rw-r--r--cpp/src/Ice/RetryQueueF.h4
-rw-r--r--cpp/src/Ice/RouterInfo.cpp4
-rw-r--r--cpp/src/Ice/RouterInfo.h4
-rw-r--r--cpp/src/Ice/RouterInfoF.h4
-rw-r--r--cpp/src/Ice/SHA1.cpp4
-rw-r--r--cpp/src/Ice/Selector.cpp4
-rw-r--r--cpp/src/Ice/Selector.h4
-rw-r--r--cpp/src/Ice/ServantManager.cpp4
-rw-r--r--cpp/src/Ice/ServantManager.h4
-rw-r--r--cpp/src/Ice/Service.cpp4
-rw-r--r--cpp/src/Ice/SharedContext.h4
-rw-r--r--cpp/src/Ice/SliceChecksums.cpp4
-rw-r--r--cpp/src/Ice/SlicedData.cpp4
-rwxr-xr-xcpp/src/Ice/StreamSocket.cpp4
-rw-r--r--cpp/src/Ice/StreamSocket.h4
-rw-r--r--cpp/src/Ice/StringConverterPlugin.cpp4
-rw-r--r--cpp/src/Ice/StringUtil.h4
-rw-r--r--cpp/src/Ice/SysLoggerI.cpp4
-rw-r--r--cpp/src/Ice/SysLoggerI.h4
-rw-r--r--cpp/src/Ice/SystemdJournalI.cpp4
-rw-r--r--cpp/src/Ice/SystemdJournalI.h4
-rwxr-xr-xcpp/src/Ice/TcpAcceptor.cpp4
-rw-r--r--cpp/src/Ice/TcpAcceptor.h4
-rw-r--r--cpp/src/Ice/TcpConnector.cpp4
-rw-r--r--cpp/src/Ice/TcpConnector.h4
-rw-r--r--cpp/src/Ice/TcpEndpointI.cpp4
-rw-r--r--cpp/src/Ice/TcpEndpointI.h4
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp4
-rw-r--r--cpp/src/Ice/TcpTransceiver.h4
-rw-r--r--cpp/src/Ice/Thread.cpp4
-rw-r--r--cpp/src/Ice/ThreadPool.cpp4
-rw-r--r--cpp/src/Ice/ThreadPool.h4
-rw-r--r--cpp/src/Ice/Timer.cpp4
-rw-r--r--cpp/src/Ice/TraceLevels.cpp4
-rw-r--r--cpp/src/Ice/TraceLevels.h4
-rw-r--r--cpp/src/Ice/TraceLevelsF.h4
-rw-r--r--cpp/src/Ice/TraceUtil.cpp4
-rw-r--r--cpp/src/Ice/TraceUtil.h4
-rw-r--r--cpp/src/Ice/Transceiver.cpp4
-rw-r--r--cpp/src/Ice/Transceiver.h4
-rw-r--r--cpp/src/Ice/TransceiverF.h4
-rw-r--r--cpp/src/Ice/UdpConnector.cpp4
-rw-r--r--cpp/src/Ice/UdpConnector.h4
-rw-r--r--cpp/src/Ice/UdpEndpointI.cpp4
-rw-r--r--cpp/src/Ice/UdpEndpointI.h4
-rwxr-xr-xcpp/src/Ice/UdpTransceiver.cpp4
-rw-r--r--cpp/src/Ice/UdpTransceiver.h4
-rw-r--r--cpp/src/Ice/Value.cpp4
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.cpp4
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.h4
-rw-r--r--cpp/src/Ice/VirtualShared.h4
-rw-r--r--cpp/src/Ice/WSAcceptor.cpp4
-rw-r--r--cpp/src/Ice/WSAcceptor.h4
-rw-r--r--cpp/src/Ice/WSConnector.cpp4
-rw-r--r--cpp/src/Ice/WSConnector.h4
-rw-r--r--cpp/src/Ice/WSEndpoint.cpp4
-rw-r--r--cpp/src/Ice/WSEndpoint.h4
-rw-r--r--cpp/src/Ice/WSTransceiver.cpp4
-rw-r--r--cpp/src/Ice/WSTransceiver.h4
-rw-r--r--cpp/src/Ice/ios/Notifications.mm4
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.h4
-rw-r--r--cpp/src/Ice/ios/StreamConnector.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamConnector.h4
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.h4
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.h4
-rw-r--r--cpp/src/IceBT/AcceptorI.cpp4
-rw-r--r--cpp/src/IceBT/AcceptorI.h4
-rw-r--r--cpp/src/IceBT/Config.h4
-rw-r--r--cpp/src/IceBT/ConnectorI.cpp4
-rw-r--r--cpp/src/IceBT/ConnectorI.h4
-rw-r--r--cpp/src/IceBT/DBus.cpp4
-rw-r--r--cpp/src/IceBT/DBus.h4
-rw-r--r--cpp/src/IceBT/EndpointI.cpp4
-rw-r--r--cpp/src/IceBT/EndpointI.h4
-rw-r--r--cpp/src/IceBT/Engine.cpp4
-rw-r--r--cpp/src/IceBT/Engine.h4
-rw-r--r--cpp/src/IceBT/EngineF.h4
-rw-r--r--cpp/src/IceBT/Instance.cpp4
-rw-r--r--cpp/src/IceBT/Instance.h4
-rw-r--r--cpp/src/IceBT/InstanceF.h4
-rw-r--r--cpp/src/IceBT/Makefile.mk4
-rw-r--r--cpp/src/IceBT/PluginI.cpp4
-rw-r--r--cpp/src/IceBT/PluginI.h4
-rw-r--r--cpp/src/IceBT/StreamSocket.cpp4
-rw-r--r--cpp/src/IceBT/StreamSocket.h4
-rw-r--r--cpp/src/IceBT/TransceiverI.cpp4
-rw-r--r--cpp/src/IceBT/TransceiverI.h4
-rw-r--r--cpp/src/IceBT/Util.cpp4
-rw-r--r--cpp/src/IceBT/Util.h4
-rw-r--r--cpp/src/IceBox/Admin.cpp4
-rw-r--r--cpp/src/IceBox/Exception.cpp4
-rw-r--r--cpp/src/IceBox/Makefile.mk4
-rw-r--r--cpp/src/IceBox/Service.cpp4
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp4
-rw-r--r--cpp/src/IceBox/ServiceManagerI.h4
-rw-r--r--cpp/src/IceBridge/IceBridge.cpp4
-rw-r--r--cpp/src/IceBridge/Makefile.mk4
-rw-r--r--cpp/src/IceDB/IceDB.cpp4
-rw-r--r--cpp/src/IceDB/IceDB.h4
-rw-r--r--cpp/src/IceDB/Makefile.mk4
-rw-r--r--cpp/src/IceDiscovery/LocatorI.cpp4
-rw-r--r--cpp/src/IceDiscovery/LocatorI.h4
-rw-r--r--cpp/src/IceDiscovery/LookupI.cpp4
-rw-r--r--cpp/src/IceDiscovery/LookupI.h4
-rw-r--r--cpp/src/IceDiscovery/Makefile.mk4
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp4
-rw-r--r--cpp/src/IceDiscovery/PluginI.h4
-rw-r--r--cpp/src/IceGrid/Activator.cpp4
-rw-r--r--cpp/src/IceGrid/Activator.h4
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp4
-rw-r--r--cpp/src/IceGrid/AdapterCache.h4
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.cpp4
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.h4
-rw-r--r--cpp/src/IceGrid/AdminI.cpp4
-rw-r--r--cpp/src/IceGrid/AdminI.h4
-rw-r--r--cpp/src/IceGrid/AdminRouter.cpp4
-rw-r--r--cpp/src/IceGrid/AdminRouter.h4
-rw-r--r--cpp/src/IceGrid/AdminSessionI.cpp4
-rw-r--r--cpp/src/IceGrid/AdminSessionI.h4
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp4
-rw-r--r--cpp/src/IceGrid/Allocatable.h4
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.cpp4
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.h4
-rw-r--r--cpp/src/IceGrid/Cache.h4
-rw-r--r--cpp/src/IceGrid/Client.cpp4
-rw-r--r--cpp/src/IceGrid/Database.cpp4
-rw-r--r--cpp/src/IceGrid/Database.h4
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.cpp4
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.h4
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp4
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.h4
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp4
-rw-r--r--cpp/src/IceGrid/DescriptorParser.h4
-rw-r--r--cpp/src/IceGrid/FileCache.cpp4
-rw-r--r--cpp/src/IceGrid/FileCache.h4
-rw-r--r--cpp/src/IceGrid/FileParserI.cpp4
-rw-r--r--cpp/src/IceGrid/FileParserI.h4
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.cpp4
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.h4
-rw-r--r--cpp/src/IceGrid/Grammar.cpp4
-rw-r--r--cpp/src/IceGrid/Grammar.y4
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp4
-rw-r--r--cpp/src/IceGrid/IceGridRegistry.cpp4
-rw-r--r--cpp/src/IceGrid/Internal.ice4
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.cpp4
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.h4
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp4
-rw-r--r--cpp/src/IceGrid/LocatorI.h4
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.cpp4
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.h4
-rw-r--r--cpp/src/IceGrid/Makefile.mk4
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.cpp4
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.h4
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp4
-rw-r--r--cpp/src/IceGrid/NodeCache.h4
-rw-r--r--cpp/src/IceGrid/NodeI.cpp4
-rw-r--r--cpp/src/IceGrid/NodeI.h4
-rw-r--r--cpp/src/IceGrid/NodeSessionI.cpp4
-rw-r--r--cpp/src/IceGrid/NodeSessionI.h4
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.cpp4
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.h4
-rw-r--r--cpp/src/IceGrid/ObjectCache.cpp4
-rw-r--r--cpp/src/IceGrid/ObjectCache.h4
-rw-r--r--cpp/src/IceGrid/Parser.cpp6
-rw-r--r--cpp/src/IceGrid/Parser.h4
-rw-r--r--cpp/src/IceGrid/PlatformInfo.cpp4
-rw-r--r--cpp/src/IceGrid/PlatformInfo.h4
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.cpp4
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.h4
-rw-r--r--cpp/src/IceGrid/QueryI.cpp4
-rw-r--r--cpp/src/IceGrid/QueryI.h4
-rw-r--r--cpp/src/IceGrid/ReapThread.cpp4
-rw-r--r--cpp/src/IceGrid/ReapThread.h4
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.cpp4
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.h4
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp4
-rw-r--r--cpp/src/IceGrid/RegistryI.h4
-rw-r--r--cpp/src/IceGrid/ReplicaCache.cpp4
-rw-r--r--cpp/src/IceGrid/ReplicaCache.h4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.cpp4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.h4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.cpp4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.h4
-rw-r--r--cpp/src/IceGrid/Scanner.cpp4
-rw-r--r--cpp/src/IceGrid/Scanner.l4
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.cpp4
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.h4
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp4
-rw-r--r--cpp/src/IceGrid/ServerCache.h4
-rw-r--r--cpp/src/IceGrid/ServerI.cpp4
-rw-r--r--cpp/src/IceGrid/ServerI.h4
-rw-r--r--cpp/src/IceGrid/SessionI.cpp4
-rw-r--r--cpp/src/IceGrid/SessionI.h4
-rw-r--r--cpp/src/IceGrid/SessionManager.cpp4
-rw-r--r--cpp/src/IceGrid/SessionManager.h4
-rw-r--r--cpp/src/IceGrid/SessionServantManager.cpp4
-rw-r--r--cpp/src/IceGrid/SessionServantManager.h4
-rw-r--r--cpp/src/IceGrid/Topics.cpp4
-rw-r--r--cpp/src/IceGrid/Topics.h4
-rw-r--r--cpp/src/IceGrid/TraceLevels.cpp4
-rw-r--r--cpp/src/IceGrid/TraceLevels.h4
-rw-r--r--cpp/src/IceGrid/Util.cpp4
-rw-r--r--cpp/src/IceGrid/Util.h4
-rw-r--r--cpp/src/IceGrid/WaitQueue.cpp4
-rw-r--r--cpp/src/IceGrid/WaitQueue.h4
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.cpp4
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.h4
-rw-r--r--cpp/src/IceGridLib/Makefile.mk4
-rw-r--r--cpp/src/IceGridLib/PluginFacadeI.cpp4
-rw-r--r--cpp/src/IceIAP/Connector.h4
-rw-r--r--cpp/src/IceIAP/Connector.mm4
-rw-r--r--cpp/src/IceIAP/EndpointI.h4
-rw-r--r--cpp/src/IceIAP/EndpointI.mm4
-rw-r--r--cpp/src/IceIAP/Makefile.mk4
-rw-r--r--cpp/src/IceIAP/Transceiver.h4
-rw-r--r--cpp/src/IceIAP/Transceiver.mm4
-rw-r--r--cpp/src/IceLocatorDiscovery/Makefile.mk4
-rw-r--r--cpp/src/IceLocatorDiscovery/Plugin.h4
-rw-r--r--cpp/src/IceLocatorDiscovery/PluginI.cpp4
-rw-r--r--cpp/src/IcePatch2/Calc.cpp4
-rw-r--r--cpp/src/IcePatch2/Client.cpp4
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp4
-rw-r--r--cpp/src/IcePatch2/FileServerI.h4
-rw-r--r--cpp/src/IcePatch2/Makefile.mk4
-rw-r--r--cpp/src/IcePatch2/Server.cpp4
-rw-r--r--cpp/src/IcePatch2Lib/ClientUtil.cpp4
-rw-r--r--cpp/src/IcePatch2Lib/Makefile.mk4
-rw-r--r--cpp/src/IcePatch2Lib/Util.cpp4
-rw-r--r--cpp/src/IcePatch2Lib/Util.h4
-rw-r--r--cpp/src/IceSSL/AcceptorI.cpp4
-rw-r--r--cpp/src/IceSSL/AcceptorI.h4
-rw-r--r--cpp/src/IceSSL/CertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/CertificateI.h4
-rw-r--r--cpp/src/IceSSL/ConnectorI.cpp4
-rw-r--r--cpp/src/IceSSL/ConnectorI.h4
-rw-r--r--cpp/src/IceSSL/EndpointI.cpp4
-rw-r--r--cpp/src/IceSSL/EndpointI.h4
-rw-r--r--cpp/src/IceSSL/Instance.cpp4
-rw-r--r--cpp/src/IceSSL/Instance.h4
-rw-r--r--cpp/src/IceSSL/InstanceF.h4
-rw-r--r--cpp/src/IceSSL/Makefile.mk4
-rw-r--r--cpp/src/IceSSL/OpenSSLCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.h4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngineF.h4
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.h4
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.h4
-rwxr-xr-xcpp/src/IceSSL/PluginI.cpp4
-rw-r--r--cpp/src/IceSSL/PluginI.h4
-rw-r--r--cpp/src/IceSSL/RFC2253.cpp4
-rw-r--r--cpp/src/IceSSL/RFC2253.h4
-rw-r--r--cpp/src/IceSSL/SChannelCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelEngine.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelEngine.h4
-rw-r--r--cpp/src/IceSSL/SChannelEngineF.h4
-rw-r--r--cpp/src/IceSSL/SChannelPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.h4
-rw-r--r--cpp/src/IceSSL/SSLEngine.cpp4
-rw-r--r--cpp/src/IceSSL/SSLEngine.h4
-rw-r--r--cpp/src/IceSSL/SSLEngineF.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportEngineF.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.h4
-rw-r--r--cpp/src/IceSSL/TrustManager.cpp4
-rw-r--r--cpp/src/IceSSL/TrustManager.h4
-rw-r--r--cpp/src/IceSSL/TrustManagerF.h4
-rw-r--r--cpp/src/IceSSL/UWPCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/UWPEngine.cpp4
-rw-r--r--cpp/src/IceSSL/UWPEngine.h4
-rw-r--r--cpp/src/IceSSL/UWPEngineF.h4
-rw-r--r--cpp/src/IceSSL/UWPPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.h4
-rwxr-xr-xcpp/src/IceSSL/Util.cpp4
-rw-r--r--cpp/src/IceSSL/Util.h4
-rw-r--r--cpp/src/IceStorm/Admin.cpp4
-rw-r--r--cpp/src/IceStorm/DBTypes.ice4
-rw-r--r--cpp/src/IceStorm/Election.ice4
-rw-r--r--cpp/src/IceStorm/Grammar.cpp4
-rw-r--r--cpp/src/IceStorm/Grammar.y4
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp4
-rw-r--r--cpp/src/IceStorm/IceStormInternal.ice4
-rw-r--r--cpp/src/IceStorm/Instance.cpp4
-rw-r--r--cpp/src/IceStorm/Instance.h4
-rw-r--r--cpp/src/IceStorm/Instrumentation.ice4
-rw-r--r--cpp/src/IceStorm/InstrumentationI.cpp4
-rw-r--r--cpp/src/IceStorm/InstrumentationI.h4
-rw-r--r--cpp/src/IceStorm/LLURecord.ice4
-rw-r--r--cpp/src/IceStorm/LinkRecord.ice4
-rw-r--r--cpp/src/IceStorm/Makefile.mk4
-rw-r--r--cpp/src/IceStorm/NodeI.cpp4
-rw-r--r--cpp/src/IceStorm/NodeI.h4
-rw-r--r--cpp/src/IceStorm/Observers.cpp4
-rw-r--r--cpp/src/IceStorm/Observers.h4
-rw-r--r--cpp/src/IceStorm/Parser.cpp6
-rw-r--r--cpp/src/IceStorm/Parser.h4
-rw-r--r--cpp/src/IceStorm/Replica.h4
-rw-r--r--cpp/src/IceStorm/Scanner.cpp4
-rw-r--r--cpp/src/IceStorm/Scanner.l4
-rw-r--r--cpp/src/IceStorm/Service.cpp4
-rw-r--r--cpp/src/IceStorm/Service.h4
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp4
-rw-r--r--cpp/src/IceStorm/Subscriber.h4
-rw-r--r--cpp/src/IceStorm/SubscriberRecord.ice4
-rw-r--r--cpp/src/IceStorm/TopicI.cpp4
-rw-r--r--cpp/src/IceStorm/TopicI.h4
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp4
-rw-r--r--cpp/src/IceStorm/TopicManagerI.h4
-rw-r--r--cpp/src/IceStorm/TraceLevels.cpp4
-rw-r--r--cpp/src/IceStorm/TraceLevels.h4
-rw-r--r--cpp/src/IceStorm/TransientTopicI.cpp4
-rw-r--r--cpp/src/IceStorm/TransientTopicI.h4
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.cpp4
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.h4
-rw-r--r--cpp/src/IceStorm/Util.cpp4
-rw-r--r--cpp/src/IceStorm/Util.h4
-rw-r--r--cpp/src/IceStormLib/Makefile.mk4
-rw-r--r--cpp/src/IceUtil/ConsoleUtil.cpp4
-rw-r--r--cpp/src/IceUtil/ConvertUTF.cpp4
-rw-r--r--cpp/src/IceUtil/ConvertUTF.h4
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp4
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp4
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp4
-rw-r--r--cpp/src/IceUtil/Makefile.mk4
-rw-r--r--cpp/src/IceUtil/MutexProtocol.cpp4
-rw-r--r--cpp/src/IceUtil/Options.cpp4
-rw-r--r--cpp/src/IceUtil/OutputUtil.cpp4
-rw-r--r--cpp/src/IceUtil/Random.cpp4
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp4
-rw-r--r--cpp/src/IceUtil/Shared.cpp4
-rw-r--r--cpp/src/IceUtil/StringConverter.cpp4
-rw-r--r--cpp/src/IceUtil/StringUtil.cpp4
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp4
-rw-r--r--cpp/src/IceUtil/Time.cpp4
-rw-r--r--cpp/src/IceUtil/UUID.cpp4
-rw-r--r--cpp/src/IceUtil/Unicode.cpp4
-rw-r--r--cpp/src/IceUtil/Unicode.h4
-rw-r--r--cpp/src/IceUtil/UtilException.cpp4
-rw-r--r--cpp/src/IceXML/Makefile.mk4
-rw-r--r--cpp/src/IceXML/Parser.cpp4
-rw-r--r--cpp/src/IceXML/Parser.h4
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp8
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.h4
-rw-r--r--cpp/src/Slice/Checksum.cpp4
-rw-r--r--cpp/src/Slice/Checksum.h4
-rw-r--r--cpp/src/Slice/FileTracker.cpp4
-rw-r--r--cpp/src/Slice/FileTracker.h4
-rw-r--r--cpp/src/Slice/Grammar.cpp4
-rw-r--r--cpp/src/Slice/Grammar.y4
-rw-r--r--cpp/src/Slice/GrammarUtil.h4
-rw-r--r--cpp/src/Slice/JavaUtil.cpp8
-rw-r--r--cpp/src/Slice/JavaUtil.h4
-rw-r--r--cpp/src/Slice/MD5.cpp4
-rw-r--r--cpp/src/Slice/MD5.h4
-rw-r--r--cpp/src/Slice/Makefile.mk4
-rw-r--r--cpp/src/Slice/PHPUtil.cpp4
-rw-r--r--cpp/src/Slice/PHPUtil.h4
-rw-r--r--cpp/src/Slice/Parser.cpp4
-rw-r--r--cpp/src/Slice/Parser.h4
-rw-r--r--cpp/src/Slice/Preprocessor.cpp4
-rw-r--r--cpp/src/Slice/Preprocessor.h4
-rw-r--r--cpp/src/Slice/Python.cpp4
-rw-r--r--cpp/src/Slice/PythonUtil.cpp8
-rw-r--r--cpp/src/Slice/PythonUtil.h4
-rw-r--r--cpp/src/Slice/Ruby.cpp4
-rw-r--r--cpp/src/Slice/RubyUtil.cpp8
-rw-r--r--cpp/src/Slice/RubyUtil.h4
-rw-r--r--cpp/src/Slice/Scanner.cpp4
-rw-r--r--cpp/src/Slice/Scanner.l4
-rw-r--r--cpp/src/Slice/SliceUtil.cpp4
-rw-r--r--cpp/src/Slice/StringLiteralUtil.cpp4
-rw-r--r--cpp/src/Slice/Util.h4
-rw-r--r--cpp/src/icegriddb/DBTypes.ice4
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp4
-rw-r--r--cpp/src/icegriddb/Makefile.mk4
-rw-r--r--cpp/src/iceserviceinstall/Install.cpp4
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.cpp4
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.h4
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.cpp4
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.h4
-rw-r--r--cpp/src/slice2confluence/Gen.cpp4
-rw-r--r--cpp/src/slice2confluence/Gen.h4
-rw-r--r--cpp/src/slice2confluence/Main.cpp4
-rw-r--r--cpp/src/slice2cpp/Gen.cpp4
-rw-r--r--cpp/src/slice2cpp/Gen.h4
-rw-r--r--cpp/src/slice2cpp/Main.cpp4
-rw-r--r--cpp/src/slice2cs/CsUtil.cpp4
-rw-r--r--cpp/src/slice2cs/CsUtil.h4
-rw-r--r--cpp/src/slice2cs/DotNetNames.cpp4
-rw-r--r--cpp/src/slice2cs/DotNetNames.h4
-rw-r--r--cpp/src/slice2cs/Gen.cpp8
-rw-r--r--cpp/src/slice2cs/Gen.h4
-rw-r--r--cpp/src/slice2cs/Main.cpp4
-rw-r--r--cpp/src/slice2html/Gen.cpp4
-rw-r--r--cpp/src/slice2html/Gen.h4
-rw-r--r--cpp/src/slice2html/Main.cpp4
-rw-r--r--cpp/src/slice2java/Gen.cpp4
-rw-r--r--cpp/src/slice2java/Gen.h4
-rw-r--r--cpp/src/slice2java/GenCompat.cpp4
-rw-r--r--cpp/src/slice2java/GenCompat.h4
-rw-r--r--cpp/src/slice2java/Main.cpp4
-rw-r--r--cpp/src/slice2js/Gen.cpp8
-rw-r--r--cpp/src/slice2js/Gen.h4
-rw-r--r--cpp/src/slice2js/JsUtil.cpp4
-rw-r--r--cpp/src/slice2js/JsUtil.h4
-rw-r--r--cpp/src/slice2js/Main.cpp4
-rw-r--r--cpp/src/slice2matlab/Main.cpp6
-rw-r--r--cpp/src/slice2objc/Gen.cpp8
-rw-r--r--cpp/src/slice2objc/Gen.h4
-rw-r--r--cpp/src/slice2objc/Main.cpp4
-rw-r--r--cpp/src/slice2objc/ObjCUtil.cpp4
-rw-r--r--cpp/src/slice2objc/ObjCUtil.h4
-rw-r--r--cpp/src/slice2php/Main.cpp8
-rw-r--r--cpp/src/slice2py/Main.cpp4
-rw-r--r--cpp/src/slice2rb/Main.cpp4
-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
1484 files changed, 1495 insertions, 4465 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index 37c27608e26..efe16be9d3c 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
top_srcdir := ..
lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 0a12ee46165..5e7b075e397 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -1,9 +1,7 @@
#!/usr/bin/env python
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import os, sys
sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 75f4f84610c..af56ad643cd 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
# ----------------------------------------------------------------------
# Don't change anything below this line!
diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules
index 6a7ab5c0f2e..ec9349fa70c 100644
--- a/cpp/config/Make.xcodesdk.rules
+++ b/cpp/config/Make.xcodesdk.rules
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
include $(top_srcdir)/config/Make.xcodesdk.rules
diff --git a/cpp/config/ice_ca.cnf b/cpp/config/ice_ca.cnf
index 4fd2add9ebf..d04aa1aefc7 100644
--- a/cpp/config/ice_ca.cnf
+++ b/cpp/config/ice_ca.cnf
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# ZeroC base OpenSSL configuration file.
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 42511781fb9..aab103a9c67 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -1,10 +1,4 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
-
- **********************************************************************
--->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
<icegrid>
<application name="Templates">
diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h
index 6f0b5e332f0..bd4927fc4c5 100644
--- a/cpp/include/Glacier2/Application.h
+++ b/cpp/include/Glacier2/Application.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_APPLICATION_H
#define GLACIER2_APPLICATION_H
diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h
index 593bf34dfb0..6c8b422a3a9 100644
--- a/cpp/include/Glacier2/Config.h
+++ b/cpp/include/Glacier2/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_CONFIG_H
#define GLACIER2_CONFIG_H
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index b0f8b76e6e7..c6e10e1ac44 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_H
#define GLACIER2_H
diff --git a/cpp/include/Glacier2/NullPermissionsVerifier.h b/cpp/include/Glacier2/NullPermissionsVerifier.h
index d27b31f6a7f..7a26ebc2f7a 100644
--- a/cpp/include/Glacier2/NullPermissionsVerifier.h
+++ b/cpp/include/Glacier2/NullPermissionsVerifier.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_NULL_PERMISSIONS_VERIFIER_H
#define GLACIER2_NULL_PERMISSIONS_VERIFIER_H
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 964117daf9f..2a68e663237 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_SESSION_HELPER_H
#define GLACIER2_SESSION_HELPER_H
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 891d87ef076..973b8728413 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_APPLICATION_H
#define ICE_APPLICATION_H
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index 4f63029fa4c..672ef1af7b8 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ASYNC_RESULT_H
#define ICE_ASYNC_RESULT_H
diff --git a/cpp/include/Ice/AsyncResultF.h b/cpp/include/Ice/AsyncResultF.h
index de8ad2663ca..79feb963464 100644
--- a/cpp/include/Ice/AsyncResultF.h
+++ b/cpp/include/Ice/AsyncResultF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ASYNC_RESULT_F_H
#define ICE_ASYNC_RESULT_F_H
diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h
index 9b6191a398e..a65fbef8424 100644
--- a/cpp/include/Ice/BatchRequestInterceptor.h
+++ b/cpp/include/Ice/BatchRequestInterceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BATCH_REQUEST_INTERCEPTOR_H
#define ICE_BATCH_REQUEST_INTERCEPTOR_H
diff --git a/cpp/include/Ice/BatchRequestQueueF.h b/cpp/include/Ice/BatchRequestQueueF.h
index bc060d79a05..fb91acff907 100644
--- a/cpp/include/Ice/BatchRequestQueueF.h
+++ b/cpp/include/Ice/BatchRequestQueueF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_F_H
#define ICE_BATCH_REQUEST_QUEUE_F_H
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 6c6c61c74ef..5ac50dcf4f6 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BUFFER_H
#define ICE_BUFFER_H
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 3f533d651e5..85cc9e78056 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COMMUNICATOR_ASYNC_H
#define ICE_COMMUNICATOR_ASYNC_H
diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h
index 7c2f5ad95da..de93991f346 100644
--- a/cpp/include/Ice/Comparable.h
+++ b/cpp/include/Ice/Comparable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COMPARABLE_H
#define ICE_COMPARABLE_H
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 291bc05c294..10fe77f48d0 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONFIG_H
#define ICE_CONFIG_H
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index 8825b143446..7a62256f6ff 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_ASYNC_H
#define ICE_CONNECTION_ASYNC_H
diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h
index 659649948d7..ae1dd9c1a56 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTIONI_F_H
#define ICE_CONNECTIONI_F_H
diff --git a/cpp/include/Ice/ConsoleUtil.h b/cpp/include/Ice/ConsoleUtil.h
index 0854ff2b563..11d2bb542bc 100644
--- a/cpp/include/Ice/ConsoleUtil.h
+++ b/cpp/include/Ice/ConsoleUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONSOLE_UTIL_H
#define ICE_CONSOLE_UTIL_H
diff --git a/cpp/include/Ice/DefaultValueFactory.h b/cpp/include/Ice/DefaultValueFactory.h
index feb07731fcf..645e8f18940 100644
--- a/cpp/include/Ice/DefaultValueFactory.h
+++ b/cpp/include/Ice/DefaultValueFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DEFAULT_VALUE_FACTORY_H
#define ICE_DEFAULT_VALUE_FACTORY_H
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index a0af296e99e..c436902af8f 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DISPATCH_INTERCEPTOR_H
#define ICE_DISPATCH_INTERCEPTOR_H
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index 9ec33940275..46939d85532 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DISPATCHER_H
#define ICE_DISPATCHER_H
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index b9a9205d5e7..ed092d4d315 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DYNAMIC_LIBRARY_H
#define ICE_DYNAMIC_LIBRARY_H
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index f465efffc7c..e4628355e72 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DYNAMIC_LIBRARY_F_H
#define ICE_DYNAMIC_LIBRARY_F_H
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index df3b1f6bc5a..64f5636c66c 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EXCEPTION_H
#define ICE_EXCEPTION_H
diff --git a/cpp/include/Ice/ExceptionHelpers.h b/cpp/include/Ice/ExceptionHelpers.h
index 22d2d26c902..eb799ff298b 100644
--- a/cpp/include/Ice/ExceptionHelpers.h
+++ b/cpp/include/Ice/ExceptionHelpers.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EXCEPTION_HELPERS_H
#define ICE_EXCEPTION_HELPERS_H
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index e0064be94c8..8da37f8f3fa 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FACTORYTABLE_H
#define ICE_FACTORYTABLE_H
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 60c751564ea..5c50d71b66f 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FACTORYTABLEINIT_H
#define ICE_FACTORYTABLEINIT_H
diff --git a/cpp/include/Ice/Format.h b/cpp/include/Ice/Format.h
index ea0c203a02b..5cb76ec5345 100644
--- a/cpp/include/Ice/Format.h
+++ b/cpp/include/Ice/Format.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FORMAT_H
#define ICE_FORMAT_H
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index b04bd48d418..e0fefa1c3f3 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FUNCTIONAL_H
#define ICE_FUNCTIONAL_H
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index 19242ea25ad..d08f680b31d 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GC_OBJECT_H
#define ICE_GC_OBJECT_H
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index db3cbb95929..8455518e188 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_HANDLE_H
#define ICE_HANDLE_H
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index c2ad572ea8f..0a4d4d3c3d2 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ICE_H
#define ICE_ICE_H
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
index 634fba965a2..81aaf544f2e 100644
--- a/cpp/include/Ice/IconvStringConverter.h
+++ b/cpp/include/Ice/IconvStringConverter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ICONV_STRING_CONVERTER
#define ICE_ICONV_STRING_CONVERTER
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index e378650a65d..e7e78d6993c 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_H
#define ICE_INCOMING_H
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 746b11afb84..451cc139ea5 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_ASYNC_H
#define ICE_INCOMING_ASYNC_H
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 8f4a257d71a..269ab7728d1 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_ASYNC_F_H
#define ICE_INCOMING_ASYNC_F_H
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 3df5d289d09..3629cde00ba 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INITIALIZE_H
#define ICE_INITIALIZE_H
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
index decd266abe8..c9ffe9c20b0 100644
--- a/cpp/include/Ice/InputStream.h
+++ b/cpp/include/Ice/InputStream.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INPUT_STREAM_H
#define ICE_INPUT_STREAM_H
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 69bfaf2f786..bf5a48f9554 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INSTANCE_F_H
#define ICE_INSTANCE_F_H
diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h
index 77c45e21246..56901a625ac 100644
--- a/cpp/include/Ice/InterfaceByValue.h
+++ b/cpp/include/Ice/InterfaceByValue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INTERFACE_BY_VALUE_H
#define ICE_INTERFACE_BY_VALUE_H
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 5f6616ddcfe..75d03dabe07 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCAL_OBJECT_H
#define ICE_LOCAL_OBJECT_H
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 8086d0c8e52..8037a06695e 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCAL_OBJECT_F_H
#define ICE_LOCAL_OBJECT_F_H
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 901f2ec7f27..8696a75562a 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOGGER_UTIL_H
#define ICE_LOGGER_UTIL_H
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index 51a9965cf1c..d4c0585effd 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_METRICSADMIN_I_H
#define ICE_METRICSADMIN_I_H
diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h
index 32207cd26ad..3d4dc819dff 100644
--- a/cpp/include/Ice/MetricsFunctional.h
+++ b/cpp/include/Ice/MetricsFunctional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_METRICSFUNCTIONAL_H
#define ICE_METRICSFUNCTIONAL_H
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index d064695c20b..d2a3eea8a80 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEMX_METRICSOBSERVER_I_H
#define ICEMX_METRICSOBSERVER_I_H
diff --git a/cpp/include/Ice/NativePropertiesAdmin.h b/cpp/include/Ice/NativePropertiesAdmin.h
index 591f8b30b27..849a0a35703 100644
--- a/cpp/include/Ice/NativePropertiesAdmin.h
+++ b/cpp/include/Ice/NativePropertiesAdmin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_H
#define ICE_PROPERTIES_ADMIN_H
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 925908ddce4..f6a8bebb77c 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_H
#define ICE_OBJECT_H
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index 2118e5242a2..980df752fcd 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_F_H
#define ICE_OBJECT_F_H
diff --git a/cpp/include/Ice/ObserverHelper.h b/cpp/include/Ice/ObserverHelper.h
index 930b81f4a85..7a4919f3e9b 100644
--- a/cpp/include/Ice/ObserverHelper.h
+++ b/cpp/include/Ice/ObserverHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBSERVERHELPER_H
#define ICE_OBSERVERHELPER_H
diff --git a/cpp/include/Ice/Optional.h b/cpp/include/Ice/Optional.h
index 5b329c17610..083faeaa9f0 100644
--- a/cpp/include/Ice/Optional.h
+++ b/cpp/include/Ice/Optional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// Ice::optional is a placeholder for std::optional:
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 725cede24b7..aebb165a11d 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OUTGOING_ASYNC_H
#define ICE_OUTGOING_ASYNC_H
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index bc6ee2eaa3d..86885db1214 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OUTGOING_ASYNC_F_H
#define ICE_OUTGOING_ASYNC_F_H
diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h
index 4aeec5ab31a..4d119a850e4 100644
--- a/cpp/include/Ice/OutputStream.h
+++ b/cpp/include/Ice/OutputStream.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OUTPUT_STREAM_H
#define ICE_OUTPUT_STREAM_H
diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h
index a4026a9557f..6aef6ae0668 100644
--- a/cpp/include/Ice/Protocol.h
+++ b/cpp/include/Ice/Protocol.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_H
#define ICE_PROTOCOL_H
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 3bbd25fe25f..c52ca6a59cb 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_H
#define ICE_PROXY_H
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index d14735a3567..63bcebbe57b 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_F_H
#define ICE_PROXY_F_H
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index ffa016cc1f4..7e62e6b7114 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_FACTORY_F_H
#define ICE_PROXY_FACTORY_F_H
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 27480dfb09a..21eb55ee578 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_HANDLE_H
#define ICE_PROXY_HANDLE_H
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index b9f3f0c1f03..97d5cc4d69f 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_F_H
#define ICE_REFERENCE_F_H
diff --git a/cpp/include/Ice/RegisterPlugins.h b/cpp/include/Ice/RegisterPlugins.h
index e2900f5951f..ee2545ee448 100644
--- a/cpp/include/Ice/RegisterPlugins.h
+++ b/cpp/include/Ice/RegisterPlugins.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_H
#define ICE_REGISTER_PLUGINS_H
diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h
index ab401191b8b..325f304ab83 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_F_H
#define ICE_REQUEST_HANDLER_F_H
diff --git a/cpp/include/Ice/ResponseHandlerF.h b/cpp/include/Ice/ResponseHandlerF.h
index 593aa95e716..53e86505b35 100644
--- a/cpp/include/Ice/ResponseHandlerF.h
+++ b/cpp/include/Ice/ResponseHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_F_H
#define ICE_RESPONSE_HANDLER_F_H
diff --git a/cpp/include/Ice/SHA1.h b/cpp/include/Ice/SHA1.h
index e70db769f22..526d8a64d64 100644
--- a/cpp/include/Ice/SHA1.h
+++ b/cpp/include/Ice/SHA1.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SHA1_H
#define ICE_SHA1_H
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index c43b9afb7e1..0892c000aad 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_F_H
#define ICE_SERVANT_MANAGER_F_H
diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h
index 3a21de4c84b..6a1a1c93789 100644
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVICE_H
#define ICE_SERVICE_H
diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h
index dfb23ff90bc..1f6a43341b0 100644
--- a/cpp/include/Ice/SliceChecksums.h
+++ b/cpp/include/Ice/SliceChecksums.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SLICE_CHECKSUM_H
#define ICE_SLICE_CHECKSUM_H
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index 0de33978e7a..ee57acb34bf 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SLICED_DATA_H
#define ICE_SLICED_DATA_H
diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h
index ba506a2a7a6..83842a02508 100644
--- a/cpp/include/Ice/SlicedDataF.h
+++ b/cpp/include/Ice/SlicedDataF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SLICED_DATA_F_H
#define ICE_SLICED_DATA_F_H
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 40ddbfcdbb4..5c5fd267e02 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_HELPERS_H
#define ICE_STREAM_HELPERS_H
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
index f98ee2561be..025063c845f 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STRING_CONVERTER_H
#define ICE_STRING_CONVERTER_H
diff --git a/cpp/include/Ice/ThreadPoolF.h b/cpp/include/Ice/ThreadPoolF.h
index 575b7da5d11..29db5dbf5f6 100644
--- a/cpp/include/Ice/ThreadPoolF.h
+++ b/cpp/include/Ice/ThreadPoolF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_THREAD_POOL_F_H
#define ICE_THREAD_POOL_F_H
diff --git a/cpp/include/Ice/UUID.h b/cpp/include/Ice/UUID.h
index 36084a36caf..5a036e4a3ac 100644
--- a/cpp/include/Ice/UUID.h
+++ b/cpp/include/Ice/UUID.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UUID_H
#define ICE_UUID_H
diff --git a/cpp/include/Ice/UniquePtr.h b/cpp/include/Ice/UniquePtr.h
index 1400a6f71c8..c1ba3e5ee73 100644
--- a/cpp/include/Ice/UniquePtr.h
+++ b/cpp/include/Ice/UniquePtr.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UNIQUE_PTR_H
#define ICE_UNIQUE_PTR_H
diff --git a/cpp/include/Ice/UniqueRef.h b/cpp/include/Ice/UniqueRef.h
index 5be41e39955..b506cf99b32 100644
--- a/cpp/include/Ice/UniqueRef.h
+++ b/cpp/include/Ice/UniqueRef.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UNIQUE_REF_H
#define ICE_UNIQUE_REF_H
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index e1c7139188e..61feafb42a9 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_USER_EXCEPTION_FACTORY_H
#define ICE_USER_EXCEPTION_FACTORY_H
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index c5c021a457b..f5033d1fc9f 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VALUE_H
#define ICE_VALUE_H
diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h
index f5aa31adfb3..414be673592 100644
--- a/cpp/include/Ice/ValueF.h
+++ b/cpp/include/Ice/ValueF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VALUE_F_H
#define ICE_VALUE_F_H
diff --git a/cpp/include/IceBT/IceBT.h b/cpp/include/IceBT/IceBT.h
index 8fb4a393805..68a6bfa5e3b 100644
--- a/cpp/include/IceBT/IceBT.h
+++ b/cpp/include/IceBT/IceBT.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ICE_BT_H
#define ICE_BT_ICE_BT_H
diff --git a/cpp/include/IceBT/Makefile b/cpp/include/IceBT/Makefile
index 68465fe71c9..820453ffb8d 100644
--- a/cpp/include/IceBT/Makefile
+++ b/cpp/include/IceBT/Makefile
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
top_srcdir = ../..
diff --git a/cpp/include/IceBT/Plugin.h b/cpp/include/IceBT/Plugin.h
index 9b80afa7ef2..eed2e876927 100644
--- a/cpp/include/IceBT/Plugin.h
+++ b/cpp/include/IceBT/Plugin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_PLUGIN_H
#define ICE_BT_PLUGIN_H
diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h
index 91daa406d4f..b0ba82174f2 100644
--- a/cpp/include/IceBox/Config.h
+++ b/cpp/include/IceBox/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEBOX_CONFIG_H
#define ICEBOX_CONFIG_H
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h
index 2c0b7de71f1..c17a7ec9870 100644
--- a/cpp/include/IceGrid/Config.h
+++ b/cpp/include/IceGrid/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_CONFIG_H
#define ICE_GRID_CONFIG_H
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index 216ba10167e..9221e1bc892 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_H
#define ICEGRID_H
diff --git a/cpp/include/IceGrid/ReplicaGroupFilter.h b/cpp/include/IceGrid/ReplicaGroupFilter.h
index 4e093421224..6b78c81fe02 100644
--- a/cpp/include/IceGrid/ReplicaGroupFilter.h
+++ b/cpp/include/IceGrid/ReplicaGroupFilter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_H
#define ICEGRID_H
diff --git a/cpp/include/IceIAP/IceIAP.h b/cpp/include/IceIAP/IceIAP.h
index 34e730607a1..5d4bdd20ac4 100644
--- a/cpp/include/IceIAP/IceIAP.h
+++ b/cpp/include/IceIAP/IceIAP.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_ICE_IAP_H
#define ICE_IAP_ICE_IAP_H
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
index b569e5d4385..c733e867d08 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_CLIENT_UTIL_H
#define ICE_PATCH2_CLIENT_UTIL_H
diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h
index 91fd1f02387..f123e2d246b 100644
--- a/cpp/include/IcePatch2/Config.h
+++ b/cpp/include/IcePatch2/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_CONFIG_H
#define ICE_PATCH2_CONFIG_H
diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h
index c0efdc9637f..1b19ebf0482 100644
--- a/cpp/include/IcePatch2/IcePatch2.h
+++ b/cpp/include/IcePatch2/IcePatch2.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IcePatch2/Config.h>
#include <IcePatch2/FileInfo.h>
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index fa452f2db37..d251dfaf4b2 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_CONFIG_H
#define ICESSL_CONFIG_H
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index b6456dc839a..b5e01a9814f 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ICESSL_H
#define ICESSL_ICESSL_H
diff --git a/cpp/include/IceSSL/OpenSSL.h b/cpp/include/IceSSL/OpenSSL.h
index 22b43f47f42..54647d1a718 100644
--- a/cpp/include/IceSSL/OpenSSL.h
+++ b/cpp/include/IceSSL/OpenSSL.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_H
#define ICESSL_OPENSSL_H
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 4a745d2e35c..2958200d15c 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_PLUGIN_H
#define ICESSL_PLUGIN_H
diff --git a/cpp/include/IceSSL/SChannel.h b/cpp/include/IceSSL/SChannel.h
index 29d25cab30c..c021484593c 100644
--- a/cpp/include/IceSSL/SChannel.h
+++ b/cpp/include/IceSSL/SChannel.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNEL_H
#define ICESSL_SCHANNEL_H
diff --git a/cpp/include/IceSSL/SecureTransport.h b/cpp/include/IceSSL/SecureTransport.h
index ca9b234353c..eae04a9090a 100644
--- a/cpp/include/IceSSL/SecureTransport.h
+++ b/cpp/include/IceSSL/SecureTransport.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_H
#define ICESSL_SECURE_TRANSPORT_H
diff --git a/cpp/include/IceSSL/UWP.h b/cpp/include/IceSSL/UWP.h
index 6f687293543..8e4eac86622 100644
--- a/cpp/include/IceSSL/UWP.h
+++ b/cpp/include/IceSSL/UWP.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_H
#define ICESSL_UWP_H
diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h
index b92a40da748..0bac5fc0514 100644
--- a/cpp/include/IceStorm/Config.h
+++ b/cpp/include/IceStorm/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STORM_CONFIG_H
#define ICE_STORM_CONFIG_H
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h
index 3492bd56e3e..1530162517e 100644
--- a/cpp/include/IceUtil/Atomic.h
+++ b/cpp/include/IceUtil/Atomic.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_ATOMIC_H
#define ICE_UTIL_ATOMIC_H
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index 19b561435c4..eca7512d0a2 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_COND_H
#define ICE_UTIL_COND_H
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 66d8c6ac257..03558aad620 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CONFIG_H
#define ICE_UTIL_CONFIG_H
diff --git a/cpp/include/IceUtil/ConsoleUtil.h b/cpp/include/IceUtil/ConsoleUtil.h
index 03c60c429b3..0083c7a9075 100644
--- a/cpp/include/IceUtil/ConsoleUtil.h
+++ b/cpp/include/IceUtil/ConsoleUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CONSOLE_UTIL_H
#define ICE_UTIL_CONSOLE_UTIL_H
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index a319b7969a5..7622df6ca6b 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H
#define ICE_UTIL_COUNT_DOWN_LATCH_H
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 6792d182117..079306831a4 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CTRL_C_HANDLER_H
#define ICE_UTIL_CTRL_C_HANDLER_H
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index 8d1576cbfc3..e12ac380a4d 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_DISABLEWARNINGS_H
#define ICE_UTIL_DISABLEWARNINGS_H
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 84ce16bbace..249dd05701e 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_EXCEPTION_H
#define ICE_UTIL_EXCEPTION_H
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index 8f76a91b529..42a8a64f943 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FILE_UTIL_H
#define ICE_FILE_UTIL_H
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index 2c8d8871b7d..da05997889b 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_FUNCTIONAL_H
#define ICE_UTIL_FUNCTIONAL_H
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index c203fbd3774..57bd499a8ce 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_HANDLE_H
#define ICE_UTIL_HANDLE_H
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 6d0a162168c..8ed206929c9 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_ICE_UTIL_H
#define ICE_UTIL_ICE_UTIL_H
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 225017674b8..7b808757295 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_INPUT_UTIL_H
#define ICE_UTIL_INPUT_UTIL_H
diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h
index c9afa342f74..948305ba318 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_ITERATOR_H
#define ICE_UTIL_ITERATOR_H
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 5faa4d32059..ad713e349a0 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_LOCK_H
#define ICE_UTIL_LOCK_H
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index cd08fb281d4..9e8cc8f0140 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MONITOR_H
#define ICE_UTIL_MONITOR_H
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 7a13df276b7..5060b1a0fdd 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_H
#define ICE_UTIL_MUTEX_H
diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h
index 9f998272adc..4a0295c944d 100644
--- a/cpp/include/IceUtil/MutexProtocol.h
+++ b/cpp/include/IceUtil/MutexProtocol.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PROTOCOL_H
#define ICE_UTIL_MUTEX_PROTOCOL_H
diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h
index 8930d80605d..83e5497545c 100644
--- a/cpp/include/IceUtil/MutexPtrLock.h
+++ b/cpp/include/IceUtil/MutexPtrLock.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H
#define ICE_UTIL_MUTEX_PTR_LOCK_H
diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h
index 4cf76045e6d..66f313fee9b 100644
--- a/cpp/include/IceUtil/MutexPtrTryLock.h
+++ b/cpp/include/IceUtil/MutexPtrTryLock.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
#define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
diff --git a/cpp/include/IceUtil/Optional.h b/cpp/include/IceUtil/Optional.h
index 6e6206e6ec1..a4266aeeb6c 100644
--- a/cpp/include/IceUtil/Optional.h
+++ b/cpp/include/IceUtil/Optional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_OPTIONAL_H
#define ICE_UTIL_OPTIONAL_H
diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index 9d06e969f22..6b9d7a5f669 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_OPTIONS_H
#define ICE_UTIL_OPTIONS_H
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index e1e34b5628e..4a712643473 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_OUTPUT_UTIL_H
#define ICE_UTIL_OUTPUT_UTIL_H
diff --git a/cpp/include/IceUtil/PopDisableWarnings.h b/cpp/include/IceUtil/PopDisableWarnings.h
index 726e972bb33..317bbc87164 100644
--- a/cpp/include/IceUtil/PopDisableWarnings.h
+++ b/cpp/include/IceUtil/PopDisableWarnings.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// No pragma once as this file can be included several times in a translation
// unit
diff --git a/cpp/include/IceUtil/PushDisableWarnings.h b/cpp/include/IceUtil/PushDisableWarnings.h
index a2b6f5b1bee..40aae0668d9 100644
--- a/cpp/include/IceUtil/PushDisableWarnings.h
+++ b/cpp/include/IceUtil/PushDisableWarnings.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// No pragma once as this file can be included several times in a translation
// unit
diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h
index ef144e2f7e1..ac946927648 100644
--- a/cpp/include/IceUtil/Random.h
+++ b/cpp/include/IceUtil/Random.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_RANDOM_H
#define ICE_UTIL_RANDOM_H
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 95126a0aba0..a0d094362db 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_RMUTEX_H
#define ICE_UTIL_RMUTEX_H
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index e93e2e0f47b..4bf0c68d158 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_RESOURCE_CONFIG_H
#define ICE_UTIL_RESOURCE_CONFIG_H
@@ -13,7 +11,7 @@
#define ICE_STRING_VERSION "3.7.2\0"
#define ICE_SO_VERSION "37\0"
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
-#define ICE_COPYRIGHT "\251 2003-present ZeroC, Inc.\0"
+#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
#define ICE_PRODUCT_NAME "Ice\0"
#ifdef ICE_CPP11_MAPPING
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index 26fc3949642..2a94a677ab9 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_SCANNER_CONFIG_H
#define ICE_UTIL_SCANNER_CONFIG_H
diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h
index 8040019ecb1..6ccfce63c06 100644
--- a/cpp/include/IceUtil/ScopedArray.h
+++ b/cpp/include/IceUtil/ScopedArray.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_SCOPED_ARRAY_H
#define ICE_UTIL_SCOPED_ARRAY_H
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 900a59fccfc..67272f157d5 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_SHARED_H
#define ICE_UTIL_SHARED_H
diff --git a/cpp/include/IceUtil/StopWatch.h b/cpp/include/IceUtil/StopWatch.h
index e6e3f6ec841..f8b9aab5fd5 100644
--- a/cpp/include/IceUtil/StopWatch.h
+++ b/cpp/include/IceUtil/StopWatch.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_STOPWATCH_H
#define ICE_UTIL_STOPWATCH_H
diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h
index bb94b06e22b..ff01f23f77a 100644
--- a/cpp/include/IceUtil/StringConverter.h
+++ b/cpp/include/IceUtil/StringConverter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_STRING_CONVERTER_H
#define ICE_UTIL_STRING_CONVERTER_H
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 83307013fc8..0891f00fab4 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_STRING_UTIL_H
#define ICE_UTIL_STRING_UTIL_H
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 847da352fd9..744110e2593 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_THREAD_H
#define ICE_UTIL_THREAD_H
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 316e672fe87..0b13fcffe6b 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_THREAD_EXCEPTION_H
#define ICE_UTIL_THREAD_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index e3b87489540..ec7dd6abf6d 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_TIME_H
#define ICE_UTIL_TIME_H
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index b258e2e2d50..177a7f8337a 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_TIMER_H
#define ICE_UTIL_TIMER_H
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index 51e6fb56437..8e831e17879 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_UUID_H
#define ICE_UTIL_UUID_H
diff --git a/cpp/include/IceUtil/UndefSysMacros.h b/cpp/include/IceUtil/UndefSysMacros.h
index 9d9b94857f7..4743bfe1303 100644
--- a/cpp/include/IceUtil/UndefSysMacros.h
+++ b/cpp/include/IceUtil/UndefSysMacros.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_UNDEF_SYS_MACROS_H
#define ICE_UTIL_UNDEF_SYS_MACROS_H
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
index d83960689a9..11febecd176 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice for UWP and Visual Studio 2015</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
index 0c025373a98..55b5be9bf9c 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice for UWP and Visual Studio 2015</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
index 9070232b6a2..409523669d1 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice for UWP and Visual Studio 2015</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
index 2a106cb092b..bbb872c54de 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice for UWP and Visual Studio 2017</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
index 16135bc5f5c..9c96a6115aa 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice for UWP and Visual Studio 2017</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
index 174cfa6c6b1..e42b17cefce 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice for UWP and Visual Studio 2017</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.v100.nuspec b/cpp/msbuild/zeroc.ice.v100.nuspec
index e49741652ba..292125a2dd8 100644
--- a/cpp/msbuild/zeroc.ice.v100.nuspec
+++ b/cpp/msbuild/zeroc.ice.v100.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice C++ for Visual Studio 2010</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.v120.nuspec b/cpp/msbuild/zeroc.ice.v120.nuspec
index d2d507f5884..c270ec8cb9c 100644
--- a/cpp/msbuild/zeroc.ice.v120.nuspec
+++ b/cpp/msbuild/zeroc.ice.v120.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice C++ for Visual Studio 2013</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.v140.nuspec b/cpp/msbuild/zeroc.ice.v140.nuspec
index 6ea2bf30cc8..54f24b0b5aa 100644
--- a/cpp/msbuild/zeroc.ice.v140.nuspec
+++ b/cpp/msbuild/zeroc.ice.v140.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice C++ for Visual Studio 2015</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/msbuild/zeroc.ice.v141.nuspec b/cpp/msbuild/zeroc.ice.v141.nuspec
index 1d560beac41..3382b595f4f 100644
--- a/cpp/msbuild/zeroc.ice.v141.nuspec
+++ b/cpp/msbuild/zeroc.ice.v141.nuspec
@@ -5,7 +5,7 @@
<title>ZeroC Ice C++ for Visual Studio 2017</title>
<version>3.7.2</version>
<authors>ZeroC</authors>
- <copyright>Copyright (c) 2003-present ZeroC, Inc. All rights reserved</copyright>
+ <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
<license type="expression">GPL-2.0-only</license>
<projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
<iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index ec44083d713..20a8ae2e8cc 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/Blobject.h>
#include <Glacier2/SessionRouterI.h>
diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h
index d81d016ad55..c6d049704a3 100644
--- a/cpp/src/Glacier2/Blobject.h
+++ b/cpp/src/Glacier2/Blobject.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/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp
index 2ab1871b293..cb074674a99 100644
--- a/cpp/src/Glacier2/ClientBlobject.cpp
+++ b/cpp/src/Glacier2/ClientBlobject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/ClientBlobject.h>
#include <Glacier2/FilterManager.h>
diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h
index 5d1765b6e79..abc6e87fd66 100644
--- a/cpp/src/Glacier2/ClientBlobject.h
+++ b/cpp/src/Glacier2/ClientBlobject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CLIENT_BLOBJECT_H
#define CLIENT_BLOBJECT_H
diff --git a/cpp/src/Glacier2/FilterI.cpp b/cpp/src/Glacier2/FilterI.cpp
index 9153ff6497f..987efab6484 100644
--- a/cpp/src/Glacier2/FilterI.cpp
+++ b/cpp/src/Glacier2/FilterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Properties.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/Glacier2/FilterI.h b/cpp/src/Glacier2/FilterI.h
index 098d75c53a8..e9c79e952f6 100644
--- a/cpp/src/Glacier2/FilterI.h
+++ b/cpp/src/Glacier2/FilterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef FILTER_I_H
#define FILTER_I_H
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp
index 148583ebde5..67dfca80d6e 100644
--- a/cpp/src/Glacier2/FilterManager.cpp
+++ b/cpp/src/Glacier2/FilterManager.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 <Ice/Logger.h>
diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h
index 8fc7119b631..3537ee2c93a 100644
--- a/cpp/src/Glacier2/FilterManager.h
+++ b/cpp/src/Glacier2/FilterManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef FILTER_MANAGER_H
#define FILTER_MANAGER_H
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 5f38d12a461..f608a86c3f7 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <IceUtil/Options.h>
diff --git a/cpp/src/Glacier2/Instance.cpp b/cpp/src/Glacier2/Instance.cpp
index 0392c588d02..3d6d7cf4404 100644
--- a/cpp/src/Glacier2/Instance.cpp
+++ b/cpp/src/Glacier2/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/SessionRouterI.h>
#include <Glacier2/Instance.h>
diff --git a/cpp/src/Glacier2/Instance.h b/cpp/src/Glacier2/Instance.h
index 7ec1f80d134..514272222ab 100644
--- a/cpp/src/Glacier2/Instance.h
+++ b/cpp/src/Glacier2/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_INSTANCE_H
#define GLACIER2_INSTANCE_H
diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice
index e86f35cedf5..e38da747efa 100644
--- a/cpp/src/Glacier2/Instrumentation.ice
+++ b/cpp/src/Glacier2/Instrumentation.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/src/Glacier2/InstrumentationI.cpp b/cpp/src/Glacier2/InstrumentationI.cpp
index cd5efce3585..d02f8e1f2fc 100644
--- a/cpp/src/Glacier2/InstrumentationI.cpp
+++ b/cpp/src/Glacier2/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/InstrumentationI.h>
#include <Ice/InstrumentationI.h>
diff --git a/cpp/src/Glacier2/InstrumentationI.h b/cpp/src/Glacier2/InstrumentationI.h
index 6b846d5e90e..d75f346a485 100644
--- a/cpp/src/Glacier2/InstrumentationI.h
+++ b/cpp/src/Glacier2/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/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk
index 74fb91a3a44..bc073a35671 100644
--- a/cpp/src/Glacier2/Makefile.mk
+++ b/cpp/src/Glacier2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := glacier2router
$(project)_sliceflags := --include-dir Glacier2
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index a08e3ee02ed..cf80795a78e 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/ProxyVerifier.h>
#include <Ice/ConsoleUtil.h>
diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h
index b5ba17a1222..b20d835ee2d 100644
--- a/cpp/src/Glacier2/ProxyVerifier.h
+++ b/cpp/src/Glacier2/ProxyVerifier.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_VERIFIER_H
#define ICE_PROXY_VERIFIER_H
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index 4e96253a3c5..4fef48c3487 100644
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/RequestQueue.h>
#include <Glacier2/Instance.h>
diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h
index fb06e77c155..6ef8055cf61 100644
--- a/cpp/src/Glacier2/RequestQueue.h
+++ b/cpp/src/Glacier2/RequestQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef REQUEST_H
#define REQUEST_H
diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
index f32c1d06db9..a26012ccecd 100644
--- a/cpp/src/Glacier2/RouterI.cpp
+++ b/cpp/src/Glacier2/RouterI.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>
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index 03d42898aac..98fe25a2d3c 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_ROUTER_I_H
#define GLACIER2_ROUTER_I_H
diff --git a/cpp/src/Glacier2/RoutingTable.cpp b/cpp/src/Glacier2/RoutingTable.cpp
index a5958dfffca..a38b5b05f78 100644
--- a/cpp/src/Glacier2/RoutingTable.cpp
+++ b/cpp/src/Glacier2/RoutingTable.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/RoutingTable.h>
#include <Glacier2/Instrumentation.h>
diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h
index ff50e384968..97b858bdf0f 100644
--- a/cpp/src/Glacier2/RoutingTable.h
+++ b/cpp/src/Glacier2/RoutingTable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ROUTING_TABLE_H
#define ICE_ROUTING_TABLE_H
diff --git a/cpp/src/Glacier2/ServerBlobject.cpp b/cpp/src/Glacier2/ServerBlobject.cpp
index c1a5a1ad79c..1d666af5a37 100644
--- a/cpp/src/Glacier2/ServerBlobject.cpp
+++ b/cpp/src/Glacier2/ServerBlobject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/ServerBlobject.h>
diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h
index 5e81784e9d0..6fee81867d5 100644
--- a/cpp/src/Glacier2/ServerBlobject.h
+++ b/cpp/src/Glacier2/ServerBlobject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SERVER_BLOBJECT_H
#define SERVER_BLOBJECT_H
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 709c6428dda..3cbb1a92856 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/SessionRouterI.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 4360837667f..5e67e75ac49 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_SESSION_ROUTER_I_H
#define GLACIER2_SESSION_ROUTER_I_H
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
index 7a13f6e0b28..70c8e977f5f 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
index 8f56b2d33ed..d6dd6e93a37 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries += Glacier2CryptPermissionsVerifier
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index ed30e5db11e..ef330e41e88 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/Application.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk
index f2e43b6eb00..9e957731227 100644
--- a/cpp/src/Glacier2Lib/Makefile.mk
+++ b/cpp/src/Glacier2Lib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := Glacier2
diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
index a6690b42622..382f25240fc 100644
--- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
+++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
#include <Glacier2/NullPermissionsVerifier.h>
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 637cd84a5e1..52079819004 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/SessionHelper.h>
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index af83fc34e03..3bfa3df63af 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ACM.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index a2bfb2e7e98..107803a6f89 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACM_H
#define ICE_ACM_H
diff --git a/cpp/src/Ice/ACMF.h b/cpp/src/Ice/ACMF.h
index db5b0ca11fb..afaa1b78fe0 100644
--- a/cpp/src/Ice/ACMF.h
+++ b/cpp/src/Ice/ACMF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACM_F_H
#define ICE_ACM_F_H
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index f75b59f9e93..47281927c97 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Acceptor.h>
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index 6eea03359c2..623d26a2439 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACCEPTOR_H
#define ICE_ACCEPTOR_H
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index eef36343c05..4e6b97bf414 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACCEPTOR_F_H
#define ICE_ACCEPTOR_F_H
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 21e884dda9a..fffd70d9902 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Application.h>
#include <Ice/LoggerI.h>
diff --git a/cpp/src/Ice/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index e5eaf87b67c..ee1d60af61b 100644
--- a/cpp/src/Ice/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ArgVector.h>
#include <cstring>
diff --git a/cpp/src/Ice/ArgVector.h b/cpp/src/Ice/ArgVector.h
index 8dcdc024981..095856cb10a 100644
--- a/cpp/src/Ice/ArgVector.h
+++ b/cpp/src/Ice/ArgVector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ARGVECTOR_H
#define ICE_ARGVECTOR_H
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 34cf22b04c5..9e898337291 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CPP11_MAPPING
diff --git a/cpp/src/Ice/Base64.cpp b/cpp/src/Ice/Base64.cpp
index 59f5f0234c3..803d5b15b85 100644
--- a/cpp/src/Ice/Base64.cpp
+++ b/cpp/src/Ice/Base64.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Base64.h>
#include <iterator>
diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h
index e63d6ca8f43..ca898c559b0 100644
--- a/cpp/src/Ice/Base64.h
+++ b/cpp/src/Ice/Base64.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BASE_64_H
#define ICE_BASE_64_H
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index 6618d863cbd..32ba60cc0f9 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/BatchRequestQueue.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
index f87d0874c26..5ef6921d461 100644
--- a/cpp/src/Ice/BatchRequestQueue.h
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_H
#define ICE_BATCH_REQUEST_QUEUE_H
diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp
index 00f557f3a68..8b4c6f9062a 100644
--- a/cpp/src/Ice/Buffer.cpp
+++ b/cpp/src/Ice/Buffer.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Buffer.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index f00257f24f3..58f52475a1a 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/CollocatedRequestHandler.h>
#include <Ice/ObjectAdapterI.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index f0ed8b29f30..d0ac16d5a7a 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COLLOCATED_REQUEST_HANDLER_H
#define ICE_COLLOCATED_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 0a8a6a03815..36198c82d75 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/CommunicatorI.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 776fde355d6..f28b49a2299 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COMMUNICATOR_I_H
#define ICE_COMMUNICATOR_I_H
diff --git a/cpp/src/Ice/Cond.cpp b/cpp/src/Ice/Cond.cpp
index 02d4003bbdb..9f33e894a01 100644
--- a/cpp/src/Ice/Cond.cpp
+++ b/cpp/src/Ice/Cond.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Cond.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index 0be8fe54899..c50c47401db 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ConnectRequestHandler.h>
#include <Ice/ConnectionRequestHandler.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index dc0fbf45f23..7b3918850b6 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_H
#define ICE_CONNECT_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
index 8c82187b170..aed35baf27e 100644
--- a/cpp/src/Ice/ConnectRequestHandlerF.h
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_F_H
#define ICE_CONNECT_REQUEST_HANDLER_F_H
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 40d76f896c9..9732cbe81b2 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ConnectionFactory.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 7ae02361601..f11004d34fa 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_H
#define ICE_CONNECTION_FACTORY_H
diff --git a/cpp/src/Ice/ConnectionFactoryF.h b/cpp/src/Ice/ConnectionFactoryF.h
index ff0d4734089..40829f37624 100644
--- a/cpp/src/Ice/ConnectionFactoryF.h
+++ b/cpp/src/Ice/ConnectionFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_F_H
#define ICE_CONNECTION_FACTORY_F_H
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index dc6691649e5..1666717289f 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.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/ConnectionI.h>
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 956c72d9355..bc0241ec8c1 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_I_H
#define ICE_CONNECTION_I_H
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index 72ae5a27581..cb5055fa34c 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ConnectionRequestHandler.h>
#include <Ice/Proxy.h>
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index ed599b35547..097aee73d7a 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_REQUEST_HANDLER_H
#define ICE_CONNECTION_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index be758b132eb..0d9739d035c 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Connector.h>
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index c4b3b6e3e25..1daa7a11fd4 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTOR_H
#define ICE_CONNECTOR_H
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 29f7957885d..22a5a825bdf 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTOR_F_H
#define ICE_CONNECTOR_F_H
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index e29393a059a..15ccefd4605 100644
--- a/cpp/src/Ice/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CountDownLatch.h>
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index f7da03b5bc5..e232f6bd54e 100644
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ImplicitContextI.h>
#include <Ice/Service.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 030ee6e8c6d..1acdc3d112a 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/DefaultsAndOverrides.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 7d95ca7ee11..fbff736a74f 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
#define ICE_DEFAULTS_AND_OVERRIDES_H
diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 1336077b536..7f1d9873a2d 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
#define ICE_DEFAULTS_AND_OVERRIDES_F_H
diff --git a/cpp/src/Ice/DispatchInterceptor.cpp b/cpp/src/Ice/DispatchInterceptor.cpp
index fa41f4796c4..10457e990e9 100644
--- a/cpp/src/Ice/DispatchInterceptor.cpp
+++ b/cpp/src/Ice/DispatchInterceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/DispatchInterceptor.h>
#include <Ice/IncomingRequest.h>
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 75dea12610b..3fac7e6ecfe 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/DynamicLibrary.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index d040c737b8a..4d4f39405a2 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EndpointFactory.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h
index 8333b820ea5..4bcbf5b3d9c 100644
--- a/cpp/src/Ice/EndpointFactory.h
+++ b/cpp/src/Ice/EndpointFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_H
#define ICE_ENDPOINT_FACTORY_H
diff --git a/cpp/src/Ice/EndpointFactoryF.h b/cpp/src/Ice/EndpointFactoryF.h
index 10fa4cc5311..22ae52dd4a0 100644
--- a/cpp/src/Ice/EndpointFactoryF.h
+++ b/cpp/src/Ice/EndpointFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_F_H
#define ICE_ENDPOINT_FACTORY_F_H
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index ea653bb55f5..0c9ed3c6c26 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EndpointFactoryManager.h>
#include <Ice/Endpoint.h>
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index eb2fc71d983..b2ef39b3637 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H
#define ICE_ENDPOINT_FACTORY_MANAGER_H
diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h
index 32e21e25a67..f24fb5ccfa4 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
#define ICE_ENDPOINT_FACTORY_MANAGER_F_H
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 367795c6477..1c46219cd44 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EndpointI.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index b46abe30208..0929d3e8fb9 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_I_H
#define ICE_ENDPOINT_I_H
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index d8dc7e20fd7..7944b286d22 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_I_F_H
#define ICE_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 3cb1d2138a7..287cdcdb5e1 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EventHandler.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index 99f8b4cc1b6..190a3fc0afc 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EVENT_HANDLER_H
#define ICE_EVENT_HANDLER_H
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index 6b95c6ed842..e762d31a988 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EVENT_HANDLER_F_H
#define ICE_EVENT_HANDLER_F_H
diff --git a/cpp/src/Ice/EventLoggerMsg.mc b/cpp/src/Ice/EventLoggerMsg.mc
index 7f512f34025..f72b5cce878 100755
--- a/cpp/src/Ice/EventLoggerMsg.mc
+++ b/cpp/src/Ice/EventLoggerMsg.mc
@@ -1,8 +1,6 @@
-; // **********************************************************************
; //
-; // Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+; // Copyright (c) ZeroC, Inc. All rights reserved.
; //
-; // **********************************************************************
MessageId=0x0
SymbolicName=EVENT_LOGGER_MSG
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 459cdcfc8fa..64c1f9c3703 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Exception.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index 3fea598436a..7afe0bd04fa 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/FactoryTable.h>
#include <Ice/ValueFactory.h>
diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index 7230b1711b0..55a7134d249 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/FactoryTableInit.h>
#include <Ice/UserExceptionFactory.h>
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index 988185c446d..79b5bffb604 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/GCObject.h>
diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h
index 15faa844157..e565bb5df28 100644
--- a/cpp/src/Ice/HashUtil.h
+++ b/cpp/src/Ice/HashUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_HASH_UTIL_H
#define ICE_HASH_UTIL_H
diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp
index d1578c59d03..1553d7e7d26 100644
--- a/cpp/src/Ice/HttpParser.cpp
+++ b/cpp/src/Ice/HttpParser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Config.h>
#include <Ice/HttpParser.h>
diff --git a/cpp/src/Ice/HttpParser.h b/cpp/src/Ice/HttpParser.h
index af992fe7e0e..b2528c0cbed 100644
--- a/cpp/src/Ice/HttpParser.h
+++ b/cpp/src/Ice/HttpParser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_HTTP_PARSER_H
#define ICE_HTTP_PARSER_H
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index 54aebd7641e..78ef994fbea 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/IPEndpointI.h>
#include <Ice/ProtocolInstance.h>
diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h
index 1c676668a54..591c19c1d85 100644
--- a/cpp/src/Ice/IPEndpointI.h
+++ b/cpp/src/Ice/IPEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_H
#define ICE_IP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h
index 4feace4fae4..1125285fb6a 100644
--- a/cpp/src/Ice/IPEndpointIF.h
+++ b/cpp/src/Ice/IPEndpointIF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_F_H
#define ICE_IP_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/IconvStringConverter.cpp b/cpp/src/Ice/IconvStringConverter.cpp
index 30665bba5a5..3babf46cfc7 100644
--- a/cpp/src/Ice/IconvStringConverter.cpp
+++ b/cpp/src/Ice/IconvStringConverter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/IconvStringConverter.h>
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index 74f5c9ed209..c9d60b2ae4e 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ImplicitContextI.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index ec81e4f944e..7b412a7562a 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IMPLICIT_CONTEXT_I_H
#define ICE_IMPLICIT_CONTEXT_I_H
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index e8ee2feb844..1fce4e5f107 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Incoming.h>
#include <Ice/IncomingAsync.h>
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 543a0419565..9841e9e37a0 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/IncomingAsync.h>
#include <Ice/ServantLocator.h>
diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h
index a3e40ee4965..1d9aea452c4 100644
--- a/cpp/src/Ice/IncomingRequest.h
+++ b/cpp/src/Ice/IncomingRequest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_REQUEST_H
#define ICE_INCOMING_REQUEST_H
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index b81cc91bdab..70f48b781ac 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ArgVector.h>
#include <Ice/CommunicatorI.h>
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
index 943b51f255d..79ba83ed174 100644
--- a/cpp/src/Ice/InputStream.cpp
+++ b/cpp/src/Ice/InputStream.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/InputStream.h>
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index d8dd997e45c..4c3fa1f1e5c 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Instance.h>
#include <Ice/TraceLevels.h>
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 1570969aaa6..70e9c249e42 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INSTANCE_H
#define ICE_INSTANCE_H
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index 449356d43e3..e4ca6fad53d 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/InstrumentationI.h>
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 2ead12457ab..da155ae8ca9 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INSTRUMENTATION_I_H
#define ICE_INSTRUMENTATION_I_H
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index 254bd23c08a..ff6b38710d0 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/LocalObject.h>
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 7b686ed898b..b1a5159365d 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.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/LocatorInfo.h>
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 974faaebc95..b156c46cb64 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCATOR_INFO_H
#define ICE_LOCATOR_INFO_H
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index 170c3b47368..fd689ce26b9 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCATOR_INFO_F_H
#define ICE_LOCATOR_INFO_F_H
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index c9d4169be3c..24bf8c5b687 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/LoggerAdminI.h>
#include <Ice/Initialize.h>
diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index b1a97416271..f697fb2dfdc 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOGGER_ADMIN_I_H
#define ICE_LOGGER_ADMIN_I_H
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index bed87c9beb9..44842207a3d 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Time.h>
#include <Ice/LoggerI.h>
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index f71bcef9aa5..0a48c298ac4 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOGGER_I_H
#define ICE_LOGGER_I_H
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index 67798cc290c..030ca975b56 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/LoggerUtil.h>
#include <Ice/Logger.h>
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk
index 84e2ee5cbfd..5ca2b03e9f2 100644
--- a/cpp/src/Ice/Makefile.mk
+++ b/cpp/src/Ice/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = Ice
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index 5dd55417f51..3142164b805 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/MetricsAdminI.h>
diff --git a/cpp/src/Ice/MetricsObserverI.cpp b/cpp/src/Ice/MetricsObserverI.cpp
index 81accf60ec1..4bd5f665500 100644
--- a/cpp/src/Ice/MetricsObserverI.cpp
+++ b/cpp/src/Ice/MetricsObserverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/MetricsObserverI.h>
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 0b7739a1900..9a865c664c7 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// The following is required on HP-UX in order to bring in
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 470c35816e0..01b10936317 100755
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_H
#define ICE_NETWORK_H
diff --git a/cpp/src/Ice/NetworkF.h b/cpp/src/Ice/NetworkF.h
index 8bde8bc0526..7ca133126be 100644
--- a/cpp/src/Ice/NetworkF.h
+++ b/cpp/src/Ice/NetworkF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_F_H
#define ICE_NETWORK_F_H
diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
index 64514c70905..a4f771e679f 100644
--- a/cpp/src/Ice/NetworkProxy.cpp
+++ b/cpp/src/Ice/NetworkProxy.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/NetworkProxy.h>
#include <Ice/HttpParser.h>
diff --git a/cpp/src/Ice/NetworkProxy.h b/cpp/src/Ice/NetworkProxy.h
index fe3f7a896e4..22714afbccd 100644
--- a/cpp/src/Ice/NetworkProxy.h
+++ b/cpp/src/Ice/NetworkProxy.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_PROXY_H
#define ICE_NETWORK_PROXY_H
diff --git a/cpp/src/Ice/NetworkProxyF.h b/cpp/src/Ice/NetworkProxyF.h
index dc30f562150..eaf98115d0b 100644
--- a/cpp/src/Ice/NetworkProxyF.h
+++ b/cpp/src/Ice/NetworkProxyF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_PROXY_F_H
#define ICE_NETWORK_PROXY_F_H
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 74e228aba5b..d5509a24b5f 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Object.h>
#include <Ice/Incoming.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 82b2d31cd80..ac8bf7774cb 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/ObjectAdapterI.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index b80d71ece70..b8e971f1e52 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
#define ICE_OBJECT_ADAPTER_FACTORY_H
diff --git a/cpp/src/Ice/ObjectAdapterFactoryF.h b/cpp/src/Ice/ObjectAdapterFactoryF.h
index 58d1c0702d3..38c7bc5b99e 100644
--- a/cpp/src/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/src/Ice/ObjectAdapterFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
#define ICE_OBJECT_ADAPTER_FACTORY_F_H
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index dbe6b87eeb4..830f9c071ca 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <Ice/ObjectAdapterI.h>
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index 209faa28e78..9c024a90b64 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_I_H
#define ICE_OBJECT_ADAPTER_I_H
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp
index a205267e1a5..3fe7e353a9f 100644
--- a/cpp/src/Ice/ObserverHelper.cpp
+++ b/cpp/src/Ice/ObserverHelper.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ObserverHelper.h>
#include <Ice/Reference.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index 40b2a0061b4..3252b6a4a45 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/OpaqueEndpointI.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index 6c65eaafa09..3a19a369bb5 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UNKNOWN_ENDPOINT_I_H
#define ICE_UNKNOWN_ENDPOINT_I_H
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 9ca32e6029a..0672fb1b833 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/OutgoingAsync.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 53c4c32a175..e316ec634f4 100644
--- a/cpp/src/Ice/OutputStream.cpp
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/OutputStream.h>
#include <Ice/DefaultsAndOverrides.h>
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index bc8aae6e9b8..63da0b2c3e9 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/PluginManagerI.h>
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index d3b9089e51f..d853d5bc53a 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PLUGIN_MANAGER_I_H
#define ICE_PLUGIN_MANAGER_I_H
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index a198fe7832f..72a224185c8 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/PropertiesAdminI.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index 82a1e2da26c..d04da8f96e0 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_I_H
#define ICE_PROPERTIES_ADMIN_I_H
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index ccb73e7a9a0..a9fccc84be2 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/PropertiesI.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index fcdf42cbbdc..b78788e7e8c 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROPERTIES_I_H
#define ICE_PROPERTIES_I_H
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 213ee6c2553..fc3b319e828 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 0f5df4cb150..a820f58a7ad 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 62d0d2706f7..34005afdad7 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Protocol.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index bf2e7b67b7f..c9dbac3cd00 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ProtocolInstance.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index c6f2893219c..d180768fcc1 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_H
#define ICE_PROTOCOL_INSTANCE_H
diff --git a/cpp/src/Ice/ProtocolInstanceF.h b/cpp/src/Ice/ProtocolInstanceF.h
index 8c5fe3bd8ca..b63532c19d7 100644
--- a/cpp/src/Ice/ProtocolInstanceF.h
+++ b/cpp/src/Ice/ProtocolInstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_F_H
#define ICE_PROTOCOL_INSTANCE_F_H
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index a9030670517..ccfbd9cff29 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ProtocolPluginFacade.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ProtocolPluginFacade.h b/cpp/src/Ice/ProtocolPluginFacade.h
index 8b8375a2537..45fe294fd06 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.h
+++ b/cpp/src/Ice/ProtocolPluginFacade.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
#define ICE_PROTOCOL_PLUGIN_FACADE_H
diff --git a/cpp/src/Ice/ProtocolPluginFacadeF.h b/cpp/src/Ice/ProtocolPluginFacadeF.h
index ba1c9a4e6df..b050cf5981a 100644
--- a/cpp/src/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/src/Ice/ProtocolPluginFacadeF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
#define ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 85871b699b9..f2b6e188ceb 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Proxy.h>
#include <Ice/ProxyFactory.h>
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index d3e0f115314..e2ba9fdb923 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.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/Time.h>
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 8169b09e9d1..96b0c30bd4c 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_FACTORY_H
#define ICE_PROXY_FACTORY_H
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 3c6f90537a2..a60427939b6 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Reference.h>
#include <Ice/ReferenceFactory.h>
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index bf7ca251603..adaf4bf3f15 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_H
#define ICE_REFERENCE_H
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index d5efd50b77d..fcf016ac64a 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.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 <Ice/ReferenceFactory.h>
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index 6efa856dea2..b32874eb6c4 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_H
#define ICE_REFERENCE_FACTORY_H
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index a1879a4abf1..1fe76234587 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_F_H
#define ICE_REFERENCE_FACTORY_F_H
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp
index c7039137062..9c78db20343 100644
--- a/cpp/src/Ice/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/RegisterPluginsInit.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RegisterPluginsInit.h>
#include <Ice/CommunicatorF.h>
diff --git a/cpp/src/Ice/RegisterPluginsInit.h b/cpp/src/Ice/RegisterPluginsInit.h
index 9dad32d4bec..c78edeb8f19 100644
--- a/cpp/src/Ice/RegisterPluginsInit.h
+++ b/cpp/src/Ice/RegisterPluginsInit.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_INIT_H
#define ICE_REGISTER_PLUGINS_INIT_H
diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h
index 224370ce2a4..8eeac4cb717 100644
--- a/cpp/src/Ice/ReplyStatus.h
+++ b/cpp/src/Ice/ReplyStatus.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REPLY_STATUS_H
#define ICE_REPLY_STATUS_H
diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index 6de365336d4..6d642d1df03 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RequestHandler.h>
#include <Ice/Reference.h>
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 3aafaa56827..d446f0cfe17 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_H
#define ICE_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index 4643212694e..f50674d3afd 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RequestHandlerFactory.h>
#include <Ice/CollocatedRequestHandler.h>
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index 5e71d791109..501666e0682 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_FACTORY_H
#define ICE_REQUEST_HANDLER_FACTORY_H
diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp
index 77054e9ab83..252f57aee39 100644
--- a/cpp/src/Ice/ResponseHandler.cpp
+++ b/cpp/src/Ice/ResponseHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ResponseHandler.h>
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index 5cf8e2b1b66..548cc72ddc2 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_H
#define ICE_RESPONSE_HANDLER_H
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index 429d066b32c..8f9694416fd 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RetryQueue.h>
#include <Ice/OutgoingAsync.h>
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index eebf96854ec..5583f726148 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RETRY_QUEUE_H
#define ICE_RETRY_QUEUE_H
diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h
index 9fbee7c7d98..6639f138a9f 100644
--- a/cpp/src/Ice/RetryQueueF.h
+++ b/cpp/src/Ice/RetryQueueF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RETRY_QUEUE_F_H
#define ICE_RETRY_QUEUE_F_H
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index d63fdacbfa0..7828e69510d 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RouterInfo.h>
#include <Ice/Router.h>
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 3c47bbeae6a..d4d41d7df08 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ROUTER_INFO_H
#define ICE_ROUTER_INFO_H
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 2f90339650d..971a0fa0ff6 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ROUTER_INFO_F_H
#define ICE_ROUTER_INFO_F_H
diff --git a/cpp/src/Ice/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 1db71b10ec1..e94c2ce2612 100644
--- a/cpp/src/Ice/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.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>
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index d210dd9891c..a2982ef4343 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Selector.h>
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index f98f49ccbb9..d5209d28492 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SELECTOR_H
#define ICE_SELECTOR_H
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 2ef28025948..6f985a4dfd8 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ServantManager.h>
#include <Ice/ServantLocator.h>
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index cc6518a2ebb..e19d334d2b4 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_H
#define ICE_SERVANT_MANAGER_H
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index be5003ed818..b0d05c2aeb5 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h
index 2d2d46fb890..caa9f20a2d2 100644
--- a/cpp/src/Ice/SharedContext.h
+++ b/cpp/src/Ice/SharedContext.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SHARED_CONTEXT_H
#define ICE_SHARED_CONTEXT_H
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp
index 3ac1532b3eb..3bd6cf6a6ff 100644
--- a/cpp/src/Ice/SliceChecksums.cpp
+++ b/cpp/src/Ice/SliceChecksums.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/SliceChecksums.h>
#include <IceUtil/Mutex.h>
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index 0ea0ae95bde..43b5338a1a6 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/SlicedData.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp
index c6459cde7bf..f335736f8ca 100755
--- a/cpp/src/Ice/StreamSocket.cpp
+++ b/cpp/src/Ice/StreamSocket.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/StreamSocket.h>
#include <Ice/NetworkProxy.h>
diff --git a/cpp/src/Ice/StreamSocket.h b/cpp/src/Ice/StreamSocket.h
index 922f72216f9..3e94a3f8ac9 100644
--- a/cpp/src/Ice/StreamSocket.h
+++ b/cpp/src/Ice/StreamSocket.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_SOCKET_H
#define ICE_STREAM_SOCKET_H
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
index 5ebaa1d03a7..98257e60e8a 100644
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ b/cpp/src/Ice/StringConverterPlugin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Config.h>
diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h
index 6be689ce874..81b987876a5 100644
--- a/cpp/src/Ice/StringUtil.h
+++ b/cpp/src/Ice/StringUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STRING_UTIL_H
#define ICE_STRING_UTIL_H
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index c105947749f..4850bfac37f 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef _WIN32
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index 221c75a1614..1495ae6a9ab 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SYS_LOGGER_I_H
#define ICE_SYS_LOGGER_I_H
diff --git a/cpp/src/Ice/SystemdJournalI.cpp b/cpp/src/Ice/SystemdJournalI.cpp
index 06ac35f06b2..cef24bee188 100644
--- a/cpp/src/Ice/SystemdJournalI.cpp
+++ b/cpp/src/Ice/SystemdJournalI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef ICE_USE_SYSTEMD
diff --git a/cpp/src/Ice/SystemdJournalI.h b/cpp/src/Ice/SystemdJournalI.h
index ae5aedd140a..cd0b1716e8f 100644
--- a/cpp/src/Ice/SystemdJournalI.h
+++ b/cpp/src/Ice/SystemdJournalI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SYSTEMD_JOURNAL_I_H
#define ICE_SYSTEMD_JOURNAL_I_H
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 2190cc05bf1..6086199dff7 100755
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpAcceptor.h>
#include <Ice/TcpTransceiver.h>
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index c4ec822173f..819c71e8ea9 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_ACCEPTOR_H
#define ICE_TCP_ACCEPTOR_H
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 0f51c2ae977..d4b8365f9ec 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpConnector.h>
#include <Ice/TcpTransceiver.h>
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index b86542494d6..e7726f979b9 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_CONNECTOR_H
#define ICE_TCP_CONNECTOR_H
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index c64b9069447..da22a57c165 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpEndpointI.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index e8d761a6529..9a08df6633d 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_ENDPOINT_I_H
#define ICE_TCP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index fe37b1637c3..b7cfabcdddc 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpTransceiver.h>
#include <Ice/Connection.h>
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index e5d2a03133d..adafd8783cd 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_TRANSCEIVER_H
#define ICE_TCP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 3f22010481c..da379edb972 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef __sun
//
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index ae6bd81b9ab..b836137170a 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ThreadPool.h>
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 76e3218501e..f9641296a14 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_THREAD_POOL_H
#define ICE_THREAD_POOL_H
diff --git a/cpp/src/Ice/Timer.cpp b/cpp/src/Ice/Timer.cpp
index 3e62448ebe6..e573b905a9d 100644
--- a/cpp/src/Ice/Timer.cpp
+++ b/cpp/src/Ice/Timer.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/Exception.h>
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp
index db69e96ca74..f4cd2dca303 100644
--- a/cpp/src/Ice/TraceLevels.cpp
+++ b/cpp/src/Ice/TraceLevels.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TraceLevels.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index 9ac192f29ac..d6aac9fbb94 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRACE_LEVELS_H
#define ICE_TRACE_LEVELS_H
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index 565cf3baa0d..12bd188db51 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRACE_LEVELS_F_H
#define ICE_TRACE_LEVELS_F_H
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 4f394282b85..e612e2dc3d4 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Mutex.h>
#include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index c0f25d3ca17..c32ee253ec2 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRACE_UTIL_H
#define ICE_TRACE_UTIL_H
diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp
index 10f45b2e82a..83de3162a82 100644
--- a/cpp/src/Ice/Transceiver.cpp
+++ b/cpp/src/Ice/Transceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Transceiver.h>
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index ea6171977bc..4bf92dd7d61 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRANSCEIVER_H
#define ICE_TRANSCEIVER_H
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index d3e728fa6d2..d40a5926a83 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRANSCEIVER_F_H
#define ICE_TRANSCEIVER_F_H
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index 43516704b3c..f6ef9857cc2 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UdpConnector.h>
#include <Ice/ProtocolInstance.h>
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index 92d49dcba31..56bd2f6cb6d 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UDP_CONNECTOR_H
#define ICE_UDP_CONNECTOR_H
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index 34a33df39a6..2800890ee77 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UdpEndpointI.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index bed014f97ee..63414933475 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UDP_ENDPOINT_I_H
#define ICE_UDP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 3d2b13a4088..5d6b64cc058 100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UdpTransceiver.h>
#include <Ice/UdpEndpointI.h>
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index c681cef44f2..fc4572bf45b 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UDP_TRANSCEIVER_H
#define ICE_UDP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
index 855fb60beed..28c9be9e794 100644
--- a/cpp/src/Ice/Value.cpp
+++ b/cpp/src/Ice/Value.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Value.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp
index 6355e7a8edc..94e3036f8c5 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.cpp
+++ b/cpp/src/Ice/ValueFactoryManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ValueFactoryManagerI.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h
index ce79ce945cb..df8e5f545aa 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.h
+++ b/cpp/src/Ice/ValueFactoryManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VALUE_FACTORY_MANAGER_I_H
#define ICE_VALUE_FACTORY_MANAGER_I_H
diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h
index 0f64e441a02..9b8f4a48929 100644
--- a/cpp/src/Ice/VirtualShared.h
+++ b/cpp/src/Ice/VirtualShared.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VIRTUAL_SHARED_H
#define ICE_VIRTUAL_SHARED_H
diff --git a/cpp/src/Ice/WSAcceptor.cpp b/cpp/src/Ice/WSAcceptor.cpp
index 9a4064edeae..474aaf2f438 100644
--- a/cpp/src/Ice/WSAcceptor.cpp
+++ b/cpp/src/Ice/WSAcceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSAcceptor.h>
#include <Ice/WSTransceiver.h>
diff --git a/cpp/src/Ice/WSAcceptor.h b/cpp/src/Ice/WSAcceptor.h
index 56e9f1978fb..7faca7dcf56 100644
--- a/cpp/src/Ice/WSAcceptor.h
+++ b/cpp/src/Ice/WSAcceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WS_ACCEPTOR_I_H
#define ICE_WS_ACCEPTOR_I_H
diff --git a/cpp/src/Ice/WSConnector.cpp b/cpp/src/Ice/WSConnector.cpp
index 61bbad67242..f1935833a8c 100644
--- a/cpp/src/Ice/WSConnector.cpp
+++ b/cpp/src/Ice/WSConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSConnector.h>
#include <Ice/WSTransceiver.h>
diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h
index fcfe3b15976..c4f30047a45 100644
--- a/cpp/src/Ice/WSConnector.h
+++ b/cpp/src/Ice/WSConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WSCONNECTOR_I_H
#define ICE_WSCONNECTOR_I_H
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index 0bb0f32d1a5..ac6742bae4f 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSEndpoint.h>
#include <Ice/WSAcceptor.h>
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index e76fc3da814..64f312f0686 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WS_ENDPOINT_I_H
#define ICE_WS_ENDPOINT_I_H
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
index 9d3fa390c50..07ef68538f6 100644
--- a/cpp/src/Ice/WSTransceiver.cpp
+++ b/cpp/src/Ice/WSTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSTransceiver.h>
#include <Ice/Endpoint.h>
diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h
index 1f3ff4d652b..744d3649ccc 100644
--- a/cpp/src/Ice/WSTransceiver.h
+++ b/cpp/src/Ice/WSTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WS_TRANSCEIVER_I_H
#define ICE_WS_TRANSCEIVER_I_H
diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm
index b8841593dac..5009f28c0f0 100644
--- a/cpp/src/Ice/ios/Notifications.mm
+++ b/cpp/src/Ice/ios/Notifications.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Ice/Config.h>
diff --git a/cpp/src/Ice/ios/StreamAcceptor.cpp b/cpp/src/Ice/ios/StreamAcceptor.cpp
index 1f382bfdc33..29b8ea47b7b 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.cpp
+++ b/cpp/src/Ice/ios/StreamAcceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamTransceiver.h"
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamAcceptor.h b/cpp/src/Ice/ios/StreamAcceptor.h
index 6a6409d41f8..ca706cf5ea6 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.h
+++ b/cpp/src/Ice/ios/StreamAcceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_ACCEPTOR_H
#define ICE_STREAM_ACCEPTOR_H
diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp
index da75a9e8276..c4764d7c2f7 100644
--- a/cpp/src/Ice/ios/StreamConnector.cpp
+++ b/cpp/src/Ice/ios/StreamConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamTransceiver.h"
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamConnector.h b/cpp/src/Ice/ios/StreamConnector.h
index ec373351c04..ad79fd415cb 100644
--- a/cpp/src/Ice/ios/StreamConnector.h
+++ b/cpp/src/Ice/ios/StreamConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_CONNECTOR_H
#define ICE_STREAM_CONNECTOR_H
diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp
index 2f5b22acd4b..f70f47d5c3b 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.cpp
+++ b/cpp/src/Ice/ios/StreamEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamEndpointI.h"
#include "StreamAcceptor.h"
diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h
index 4a5e82297fd..3ae922c56e4 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.h
+++ b/cpp/src/Ice/ios/StreamEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_ENDPOINT_I_H
#define ICE_STREAM_ENDPOINT_I_H
diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp
index a4c047e5aab..6a0815625b5 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.cpp
+++ b/cpp/src/Ice/ios/StreamTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamTransceiver.h"
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamTransceiver.h b/cpp/src/Ice/ios/StreamTransceiver.h
index 38cfd9de02b..ed210c3c6e8 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.h
+++ b/cpp/src/Ice/ios/StreamTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_TRANSCEIVER_H
#define ICE_STREAM_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/AcceptorI.cpp b/cpp/src/IceBT/AcceptorI.cpp
index cab9a303fd0..d225e2d6e47 100644
--- a/cpp/src/IceBT/AcceptorI.cpp
+++ b/cpp/src/IceBT/AcceptorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/AcceptorI.h>
#include <IceBT/Engine.h>
diff --git a/cpp/src/IceBT/AcceptorI.h b/cpp/src/IceBT/AcceptorI.h
index 7803b2e9287..fbf8ba51496 100644
--- a/cpp/src/IceBT/AcceptorI.h
+++ b/cpp/src/IceBT/AcceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ACCEPTOR_I_H
#define ICE_BT_ACCEPTOR_I_H
diff --git a/cpp/src/IceBT/Config.h b/cpp/src/IceBT/Config.h
index 445cb0da9e1..e5130ce2169 100644
--- a/cpp/src/IceBT/Config.h
+++ b/cpp/src/IceBT/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_CONFIG_H
#define ICE_BT_CONFIG_H
diff --git a/cpp/src/IceBT/ConnectorI.cpp b/cpp/src/IceBT/ConnectorI.cpp
index 48c111a3e18..b9b29cc91d9 100644
--- a/cpp/src/IceBT/ConnectorI.cpp
+++ b/cpp/src/IceBT/ConnectorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/ConnectorI.h>
#include <IceBT/Instance.h>
diff --git a/cpp/src/IceBT/ConnectorI.h b/cpp/src/IceBT/ConnectorI.h
index 87d8cc9929f..e0ef01548e0 100644
--- a/cpp/src/IceBT/ConnectorI.h
+++ b/cpp/src/IceBT/ConnectorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_CONNECTOR_I_H
#define ICE_BT_CONNECTOR_I_H
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 8648db092fd..114a86df31c 100644
--- a/cpp/src/IceBT/DBus.cpp
+++ b/cpp/src/IceBT/DBus.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/DBus.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/src/IceBT/DBus.h b/cpp/src/IceBT/DBus.h
index 6c89e3a8f2d..3c64b7706fd 100644
--- a/cpp/src/IceBT/DBus.h
+++ b/cpp/src/IceBT/DBus.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_DBUS_H
#define ICE_BT_DBUS_H
diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp
index 068bcaca30f..e74ffc0d548 100644
--- a/cpp/src/IceBT/EndpointI.cpp
+++ b/cpp/src/IceBT/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/EndpointI.h>
#include <IceBT/AcceptorI.h>
diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h
index 9d9e1c655a2..a680b0afcfa 100644
--- a/cpp/src/IceBT/EndpointI.h
+++ b/cpp/src/IceBT/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ENDPOINT_I_H
#define ICE_BT_ENDPOINT_I_H
diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp
index 4eda781a3a6..12005078103 100644
--- a/cpp/src/IceBT/Engine.cpp
+++ b/cpp/src/IceBT/Engine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/Engine.h>
#include <IceBT/DBus.h>
diff --git a/cpp/src/IceBT/Engine.h b/cpp/src/IceBT/Engine.h
index 7dfec79ad15..2d0287ac53d 100644
--- a/cpp/src/IceBT/Engine.h
+++ b/cpp/src/IceBT/Engine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ENGINE_H
#define ICE_BT_ENGINE_H
diff --git a/cpp/src/IceBT/EngineF.h b/cpp/src/IceBT/EngineF.h
index 80f5b6c0757..75054c1cd9e 100644
--- a/cpp/src/IceBT/EngineF.h
+++ b/cpp/src/IceBT/EngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ENGINE_F_H
#define ICE_BT_ENGINE_F_H
diff --git a/cpp/src/IceBT/Instance.cpp b/cpp/src/IceBT/Instance.cpp
index 6487f1193c6..e77410f707e 100644
--- a/cpp/src/IceBT/Instance.cpp
+++ b/cpp/src/IceBT/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/Instance.h>
#include <IceBT/Engine.h>
diff --git a/cpp/src/IceBT/Instance.h b/cpp/src/IceBT/Instance.h
index f7e75f8ce71..c51a9018043 100644
--- a/cpp/src/IceBT/Instance.h
+++ b/cpp/src/IceBT/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_INSTANCE_H
#define ICE_BT_INSTANCE_H
diff --git a/cpp/src/IceBT/InstanceF.h b/cpp/src/IceBT/InstanceF.h
index 8bc8e8e7b74..f9bdca08cec 100644
--- a/cpp/src/IceBT/InstanceF.h
+++ b/cpp/src/IceBT/InstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_INSTANCE_F_H
#define ICE_BT_INSTANCE_F_H
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk
index 277a02f76c8..dad2e87a813 100644
--- a/cpp/src/IceBT/Makefile.mk
+++ b/cpp/src/IceBT/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Only build the IceBT plugin if Bluetooth system libraries are available (Bluez/DBus)
diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp
index b0a68be305a..e65952c7ccd 100644
--- a/cpp/src/IceBT/PluginI.cpp
+++ b/cpp/src/IceBT/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/PluginI.h>
#include <IceBT/EndpointI.h>
diff --git a/cpp/src/IceBT/PluginI.h b/cpp/src/IceBT/PluginI.h
index 4bb603788ab..682576c6e4c 100644
--- a/cpp/src/IceBT/PluginI.h
+++ b/cpp/src/IceBT/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_PLUGIN_I_H
#define ICE_BT_PLUGIN_I_H
diff --git a/cpp/src/IceBT/StreamSocket.cpp b/cpp/src/IceBT/StreamSocket.cpp
index 400b2ea7382..39b09093b89 100644
--- a/cpp/src/IceBT/StreamSocket.cpp
+++ b/cpp/src/IceBT/StreamSocket.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/StreamSocket.h>
#include <IceBT/EndpointInfo.h>
diff --git a/cpp/src/IceBT/StreamSocket.h b/cpp/src/IceBT/StreamSocket.h
index 62134210a3d..756e4a6be70 100644
--- a/cpp/src/IceBT/StreamSocket.h
+++ b/cpp/src/IceBT/StreamSocket.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_STREAM_SOCKET_H
#define ICE_BT_STREAM_SOCKET_H
diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp
index 0a4dc9503f8..e082e1548f8 100644
--- a/cpp/src/IceBT/TransceiverI.cpp
+++ b/cpp/src/IceBT/TransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/TransceiverI.h>
#include <IceBT/ConnectionInfo.h>
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
index 09650cc8c62..4a9ca020efb 100644
--- a/cpp/src/IceBT/TransceiverI.h
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_TRANSCEIVER_H
#define ICE_BT_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/Util.cpp b/cpp/src/IceBT/Util.cpp
index f02556ebd42..8f58a501f0c 100644
--- a/cpp/src/IceBT/Util.cpp
+++ b/cpp/src/IceBT/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/Util.h>
diff --git a/cpp/src/IceBT/Util.h b/cpp/src/IceBT/Util.h
index 777335f34ae..7c0652c03a9 100644
--- a/cpp/src/IceBT/Util.h
+++ b/cpp/src/IceBT/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_UTIL_H
#define ICE_BT_UTIL_H
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index d92ca632b8d..da85420c93c 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -1,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/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index 414b198117f..3ff43e8966d 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBox/IceBox.h>
diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk
index f1a022dc512..746d09915d3 100644
--- a/cpp/src/IceBox/Makefile.mk
+++ b/cpp/src/IceBox/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceBox
$(project)_programs := icebox iceboxadmin
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 8fa8b96649c..c2c3132134e 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 13b2e2cd550..615fc047d29 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index a3ea4ca0616..a307c050dfc 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SERVICE_MANAGER_I_H
#define SERVICE_MANAGER_I_H
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp
index d0bc8e0d22f..5619360615d 100644
--- a/cpp/src/IceBridge/IceBridge.cpp
+++ b/cpp/src/IceBridge/IceBridge.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Connection.h>
#include <Ice/ObjectAdapter.h>
diff --git a/cpp/src/IceBridge/Makefile.mk b/cpp/src/IceBridge/Makefile.mk
index d1361bc0c19..0c1e034f68d 100644
--- a/cpp/src/IceBridge/Makefile.mk
+++ b/cpp/src/IceBridge/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := icebridge
$(project)_dependencies := Ice
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp
index 9f67ccca436..bce0ab96f0e 100644
--- a/cpp/src/IceDB/IceDB.cpp
+++ b/cpp/src/IceDB/IceDB.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceDB/IceDB.h>
#include <Ice/Initialize.h>
diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h
index 6b62054038e..8019a9c30a9 100644
--- a/cpp/src/IceDB/IceDB.h
+++ b/cpp/src/IceDB/IceDB.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DB_H
#define ICE_DB_H
diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk
index bcbd7c8a53a..396a9966d73 100644
--- a/cpp/src/IceDB/Makefile.mk
+++ b/cpp/src/IceDB/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceDB
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp
index 9f89a664a6c..9647b404d17 100644
--- a/cpp/src/IceDiscovery/LocatorI.cpp
+++ b/cpp/src/IceDiscovery/LocatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceDiscovery/LocatorI.h>
#include <IceDiscovery/LookupI.h>
diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index 0aa1361d861..34b8921b60f 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef LOCATORI_H
#define LOCATORI_H
diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index 4640ec1903d..9908ff63ab7 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Connection.h>
#include <Ice/ObjectAdapter.h>
diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index 5c78dfebbd2..348d69866b0 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef LOOKUPI_H
#define LOOKUPI_H
diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk
index ae78db9e910..a3644682e72 100644
--- a/cpp/src/IceDiscovery/Makefile.mk
+++ b/cpp/src/IceDiscovery/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceDiscovery
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index 4a2b10b9c4a..e488fbbc84c 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.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/src/IceDiscovery/PluginI.h b/cpp/src/IceDiscovery/PluginI.h
index e85a6a23b37..0a0e610b653 100644
--- a/cpp/src/IceDiscovery/PluginI.h
+++ b/cpp/src/IceDiscovery/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef PLUGIN_I_H
#define PLUGIN_I_H
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 590a0dff293..052939a377b 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ArgVector.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h
index 56240e96b9b..f2eb0ff5a56 100644
--- a/cpp/src/IceGrid/Activator.h
+++ b/cpp/src/IceGrid/Activator.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ACTIVATOR_H
#define ICE_GRID_ACTIVATOR_H
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 059e7621d56..818f75d640a 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.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/Communicator.h>
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index ac3d0265679..f0f8dd4f771 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADAPTERCACHE_H
#define ICE_GRID_ADAPTERCACHE_H
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp
index f338a5f5dee..3d58311845c 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.cpp
+++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/AdminCallbackRouter.h>
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
index 4bab9ce23d6..67800fe1f97 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.h
+++ b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
#define ICE_GRID_ADMIN_CALLBACK_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index fedb2684ef7..061c5d131b7 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
index 013b8873b50..4f37e4211de 100644
--- a/cpp/src/IceGrid/AdminI.h
+++ b/cpp/src/IceGrid/AdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADMIN_I_H
#define ICE_GRID_ADMIN_I_H
diff --git a/cpp/src/IceGrid/AdminRouter.cpp b/cpp/src/IceGrid/AdminRouter.cpp
index 4b19c65a345..27c0fa9c0ae 100644
--- a/cpp/src/IceGrid/AdminRouter.cpp
+++ b/cpp/src/IceGrid/AdminRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/AdminRouter.h>
diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h
index 63f1cc92fb3..fcb988e1f06 100644
--- a/cpp/src/IceGrid/AdminRouter.h
+++ b/cpp/src/IceGrid/AdminRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADMIN_ROUTER_H
#define ICE_GRID_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index ac7daf2ab61..947298e7842 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -1,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/UUID.h>
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index e02a0e6a996..ee1d9c909d8 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_ADMINSESSIONI_H
#define ICEGRID_ADMINSESSIONI_H
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index 29c36b32450..35c1ad5b823 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/Allocatable.h>
#include <IceGrid/SessionI.h>
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index 20d82a23bd4..94f7fd2a183 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLE_H
#define ICE_GRID_ALLOCATABLE_H
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp
index d87fe6f4cf6..0f77b299ea1 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.cpp
+++ b/cpp/src/IceGrid/AllocatableObjectCache.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/Communicator.h>
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
index 0cd2d2be768..19f60f2ba11 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.h
+++ b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
#define ICE_GRID_ALLOCATABLEOBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index c614998943d..9e32c561d41 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_CACHE_H
#define ICE_GRID_CACHE_H
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index c6243e5acd8..6da67eb742e 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index 45898db72cc..300865cf469 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.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 <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index 656012b6633..877f1d25a6f 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_DATABASE_H
#define ICE_GRID_DATABASE_H
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 0cbed7f794d..c6e2cbd4134 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.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 <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index 90d50ef6b42..dfc1fa705db 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
#define ICE_GRID_DESCRIPTOR_BUILDER_H
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 4e80aeff179..c62bf1e622a 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1,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/DescriptorHelper.h>
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index 6de9017870a..a358870c98c 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_HELPER_H
#define ICE_GRID_DESCRIPTOR_HELPER_H
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 6da1f347173..e7467acda1a 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceXML/Parser.h>
diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h
index 32caaf751dc..2e8f3e2b5f6 100644
--- a/cpp/src/IceGrid/DescriptorParser.h
+++ b/cpp/src/IceGrid/DescriptorParser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_DESCRIPTOR_PARSER_H
#define ICEGRID_DESCRIPTOR_PARSER_H
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 712eabb5afe..a93bca5440d 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.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 <Ice/Properties.h>
diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
index 09cc0fa2c51..12751665402 100644
--- a/cpp/src/IceGrid/FileCache.h
+++ b/cpp/src/IceGrid/FileCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_FILE_CACHE_H
#define ICE_GRID_FILE_CACHE_H
diff --git a/cpp/src/IceGrid/FileParserI.cpp b/cpp/src/IceGrid/FileParserI.cpp
index 3cdec69cf68..fefe366a693 100644
--- a/cpp/src/IceGrid/FileParserI.cpp
+++ b/cpp/src/IceGrid/FileParserI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/FileParserI.h>
#include <IceGrid/DescriptorParser.h>
diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index b6c9cd8ebda..1762db9eb09 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_FILE_PARSERI_H
#define ICE_GRID_FILE_PARSERI_H
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.cpp b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
index 3c7a800b858..a9a1ef6dd77 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.cpp
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.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 <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h
index 40c95429be9..4630654082e 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.h
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
#define ICE_GRID_FILEUSERACCOUNTMAPPERI_H
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index 6f8f9787d7e..652495f2296 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -66,11 +66,9 @@
#line 1 "src/IceGrid/Grammar.y"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 31ea16bfa0b..1c4c5b1ec40 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 5a2d436bd8c..f80cf673236 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <IceUtil/Timer.h>
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index 3e0e804367e..34cea54dc50 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index 2a299523216..10535a95d42 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.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/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp
index fb3998bcd1b..379743d6cf6 100644
--- a/cpp/src/IceGrid/InternalRegistryI.cpp
+++ b/cpp/src/IceGrid/InternalRegistryI.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/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h
index 50ec2f4c73d..9333650f7ae 100644
--- a/cpp/src/IceGrid/InternalRegistryI.h
+++ b/cpp/src/IceGrid/InternalRegistryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_INTERNALREGISTRYI_H
#define ICE_GRID_INTERNALREGISTRYI_H
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index d7d7d32560a..a66a5e037c3 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -1,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/LocatorI.h>
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 9c23511b17f..8eb5524fc04 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_LOCATOR_I_H
#define ICE_GRID_LOCATOR_I_H
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp
index da9d70d8506..52e254e2ee0 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.cpp
+++ b/cpp/src/IceGrid/LocatorRegistryI.cpp
@@ -1,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/LocatorRegistryI.h>
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index ff7ddfebde0..eb7253fe9f9 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H
#define ICE_GRID_LOCATOR_REGISTRY_I_H
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk
index 401f3be40da..6a173c0031f 100644
--- a/cpp/src/IceGrid/Makefile.mk
+++ b/cpp/src/IceGrid/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
local_node_srcs = Activator.cpp \
NodeAdminRouter.cpp \
diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp
index 4a77bd960fb..f739f6e06b2 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeAdminRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/NodeAdminRouter.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/NodeAdminRouter.h b/cpp/src/IceGrid/NodeAdminRouter.h
index c613e1ef21b..795dfdbe12a 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.h
+++ b/cpp/src/IceGrid/NodeAdminRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODE_ADMIN_ROUTER_H
#define ICE_GRID_NODE_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 98789b954ce..1407c998f1c 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h
index 6b2a5b3995f..0230b7d05b2 100644
--- a/cpp/src/IceGrid/NodeCache.h
+++ b/cpp/src/IceGrid/NodeCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODECACHE_H
#define ICE_GRID_NODECACHE_H
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index c7dfb898f8a..8017fa3bdd4 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.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/FileUtil.h>
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index adc36d2ebff..5d3afb7f270 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODE_I_H
#define ICE_GRID_NODE_I_H
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index 145cf9862f1..5f0a9d62b03 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h
index 3976a4d72e2..637f0ceac2f 100644
--- a/cpp/src/IceGrid/NodeSessionI.h
+++ b/cpp/src/IceGrid/NodeSessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_NODE_SESSION_H
#define ICEGRID_NODE_SESSION_H
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index 2cb50e7541a..c7cb4682a1a 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -1,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/NodeSessionManager.h>
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index 2b85fec5cbb..139a0bdc028 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODE_SESSION_MANAGER_H
#define ICE_GRID_NODE_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp
index 5b6f54a4d0b..caa5a75d3db 100644
--- a/cpp/src/IceGrid/ObjectCache.cpp
+++ b/cpp/src/IceGrid/ObjectCache.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/Communicator.h>
diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index 94c84c2ad95..3ad01e04679 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_OBJECTCACHE_H
#define ICE_GRID_OBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 5364b51375b..704c84e9af5 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.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 <IceUtil/IceUtil.h>
@@ -2525,7 +2523,7 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow,
void
Parser::showBanner()
{
- consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-present ZeroC, Inc." << endl;
+ consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) ZeroC, Inc." << endl;
}
void
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index f23adf0bfaa..1197b4f55a6 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_PARSER_H
#define ICE_GRID_PARSER_H
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index bd5c6769dd4..dc90ad2b278 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.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 <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h
index e1d018e1c22..e9ca4942eff 100644
--- a/cpp/src/IceGrid/PlatformInfo.h
+++ b/cpp/src/IceGrid/PlatformInfo.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_PLATFORM_INFO_H
#define ICE_GRID_PLATFORM_INFO_H
diff --git a/cpp/src/IceGrid/PluginFacadeI.cpp b/cpp/src/IceGrid/PluginFacadeI.cpp
index 8d086e5342b..2aab4145681 100644
--- a/cpp/src/IceGrid/PluginFacadeI.cpp
+++ b/cpp/src/IceGrid/PluginFacadeI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/PluginFacadeI.h>
#include <IceGrid/PlatformInfo.h>
diff --git a/cpp/src/IceGrid/PluginFacadeI.h b/cpp/src/IceGrid/PluginFacadeI.h
index a9b2c7522ba..3972eee6b11 100644
--- a/cpp/src/IceGrid/PluginFacadeI.h
+++ b/cpp/src/IceGrid/PluginFacadeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_PLUGIN_FACADE_I_H
#define ICEGRID_PLUGIN_FACADE_I_H
diff --git a/cpp/src/IceGrid/QueryI.cpp b/cpp/src/IceGrid/QueryI.cpp
index e5c2555220b..e6f5b1ee090 100644
--- a/cpp/src/IceGrid/QueryI.cpp
+++ b/cpp/src/IceGrid/QueryI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/Internal.h>
#include <IceGrid/QueryI.h>
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index 6a9a3a913a1..d9f9dec92c2 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_QUERY_I_H
#define ICE_GRID_QUERY_I_H
diff --git a/cpp/src/IceGrid/ReapThread.cpp b/cpp/src/IceGrid/ReapThread.cpp
index d7d7d2a2aaf..54626b1cdbf 100644
--- a/cpp/src/IceGrid/ReapThread.cpp
+++ b/cpp/src/IceGrid/ReapThread.cpp
@@ -1,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/ReapThread.h>
diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h
index ed872adcc66..a847b9e720f 100644
--- a/cpp/src/IceGrid/ReapThread.h
+++ b/cpp/src/IceGrid/ReapThread.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_REAPER_THREAD_H
#define ICEGRID_REAPER_THREAD_H
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp
index 2ebaa8f4ad7..cb88ed843e8 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.cpp
+++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/RegistryAdminRouter.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.h b/cpp/src/IceGrid/RegistryAdminRouter.h
index d0961c329ce..8deb750fd86 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.h
+++ b/cpp/src/IceGrid/RegistryAdminRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REGISTRY_ADMIN_ROUTER_H
#define ICE_GRID_REGISTRY_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index a6f4bc797b8..092ac2bf322 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index 18deac3daf5..7589bdada8b 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REGISTRYI_H
#define ICE_GRID_REGISTRYI_H
diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index b5af05fa2e6..56cfac1d3e7 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.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 <Ice/LocalException.h>
diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h
index 0e006fa8381..9e38f0cadfd 100644
--- a/cpp/src/IceGrid/ReplicaCache.h
+++ b/cpp/src/IceGrid/ReplicaCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REPLICACACHE_H
#define ICE_GRID_REPLICACACHE_H
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index 9d86958fa2d..6d9030fb886 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h
index 5f30539a046..1977d7e9734 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.h
+++ b/cpp/src/IceGrid/ReplicaSessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_REPLICA_SESSION_H
#define ICEGRID_REPLICA_SESSION_H
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp
index d66fe69b313..da6f5cb4983 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp
@@ -1,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/ReplicaSessionManager.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h
index 938fecbab60..9203bf49d87 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.h
+++ b/cpp/src/IceGrid/ReplicaSessionManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H
#define ICE_GRID_REPLICA_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index f07d5fa1ec1..d4bc68b5140 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -462,11 +462,9 @@ char *yytext;
#line 1 "src/IceGrid/Scanner.l"
#line 2 "src/IceGrid/Scanner.l"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
index ba71ae83c6f..1de7e5def65 100644
--- a/cpp/src/IceGrid/Scanner.l
+++ b/cpp/src/IceGrid/Scanner.l
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index e4a1df463a3..ef2e664cfbb 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -1,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/ServerAdapterI.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h
index ee7d9823aaf..ce818a7f8cc 100644
--- a/cpp/src/IceGrid/ServerAdapterI.h
+++ b/cpp/src/IceGrid/ServerAdapterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SERVER_ADAPTER_I_H
#define ICE_GRID_SERVER_ADAPTER_I_H
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index c9ebc4742a7..725b0b08757 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.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/LoggerUtil.h>
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index 373af7bdfc1..15bee8989c6 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SERVERCACHE_H
#define ICE_GRID_SERVERCACHE_H
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 6ee41505409..62401c15c63 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.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 <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h
index 5893dd7b9ac..6802fbd57c8 100644
--- a/cpp/src/IceGrid/ServerI.h
+++ b/cpp/src/IceGrid/ServerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SERVER_I_H
#define ICE_GRID_SERVER_I_H
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index cb693b56cc1..16b27d53d11 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/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 <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index 631e1dcd176..5184bd2b19a 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_SESSIONI_H
#define ICEGRID_SESSIONI_H
diff --git a/cpp/src/IceGrid/SessionManager.cpp b/cpp/src/IceGrid/SessionManager.cpp
index eeb01f40204..646db8244a4 100644
--- a/cpp/src/IceGrid/SessionManager.cpp
+++ b/cpp/src/IceGrid/SessionManager.cpp
@@ -1,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/SessionManager.h>
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index 6c1a6255f13..03717f831c3 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SESSION_MANAGER_H
#define ICE_GRID_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index c52890fc7c0..58f9c0fbfab 100644
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h
index 6dc75971002..766171e9ba5 100644
--- a/cpp/src/IceGrid/SessionServantManager.h
+++ b/cpp/src/IceGrid/SessionServantManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H
#define ICE_GRID_SESSIONSERVANTLOCATOR_H
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index a2cf027f857..8ab60af908a 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -1,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/Topics.h>
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 2d8992fd5b4..01288d76715 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_TOPICS_H
#define ICEGRID_TOPICS_H
diff --git a/cpp/src/IceGrid/TraceLevels.cpp b/cpp/src/IceGrid/TraceLevels.cpp
index 727c7d718e4..4d776d822f1 100644
--- a/cpp/src/IceGrid/TraceLevels.cpp
+++ b/cpp/src/IceGrid/TraceLevels.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 <Ice/Properties.h>
diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h
index 4492781290f..43a2bbf66c5 100644
--- a/cpp/src/IceGrid/TraceLevels.h
+++ b/cpp/src/IceGrid/TraceLevels.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_TRACE_LEVELS_H
#define ICE_GRID_TRACE_LEVELS_H
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index dc3cddfcccc..b77215d8de9 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -1,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/Util.h>
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index c917bd60923..8091e0738e7 100644
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_UTIL_H
#define ICE_GRID_UTIL_H
diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp
index 988e8092b60..9111fbd9534 100644
--- a/cpp/src/IceGrid/WaitQueue.cpp
+++ b/cpp/src/IceGrid/WaitQueue.cpp
@@ -1,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/WaitQueue.h>
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index 1cea39ce684..84edb2ba79a 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_WAIT_QUEUE_H
#define ICE_GRID_WAIT_QUEUE_H
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
index 8e13d5abf0a..f4f7227bcd1 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Endpoint.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 887fccfea65..6f921719e7c 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
#define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk
index fb35c3ea36a..ce541ed1fc8 100644
--- a/cpp/src/IceGridLib/Makefile.mk
+++ b/cpp/src/IceGridLib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceGrid
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 9170d094e26..6944d2cdad8 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_API_EXPORTS
# define ICEGRID_API_EXPORTS
diff --git a/cpp/src/IceIAP/Connector.h b/cpp/src/IceIAP/Connector.h
index 4de39d6e9a2..16a38ecb299 100644
--- a/cpp/src/IceIAP/Connector.h
+++ b/cpp/src/IceIAP/Connector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_CONNECTOR_H
#define ICE_IAP_CONNECTOR_H
diff --git a/cpp/src/IceIAP/Connector.mm b/cpp/src/IceIAP/Connector.mm
index 9311cee422f..4db075443f5 100644
--- a/cpp/src/IceIAP/Connector.mm
+++ b/cpp/src/IceIAP/Connector.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "Transceiver.h"
#include "EndpointI.h"
diff --git a/cpp/src/IceIAP/EndpointI.h b/cpp/src/IceIAP/EndpointI.h
index 65d314e55cc..faabe7bd00f 100644
--- a/cpp/src/IceIAP/EndpointI.h
+++ b/cpp/src/IceIAP/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_ENDPOINT_I_H
#define ICE_IAP_ENDPOINT_I_H
diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm
index 8271778137c..82d2897e89b 100644
--- a/cpp/src/IceIAP/EndpointI.mm
+++ b/cpp/src/IceIAP/EndpointI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "EndpointI.h"
#include "Connector.h"
diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk
index 05bb62b010d..613c044e849 100644
--- a/cpp/src/IceIAP/Makefile.mk
+++ b/cpp/src/IceIAP/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceIAP
diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h
index 6b7c57a2f3c..25c078524b1 100644
--- a/cpp/src/IceIAP/Transceiver.h
+++ b/cpp/src/IceIAP/Transceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_TRANSCEIVER_H
#define ICE_IAP_TRANSCEIVER_H
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm
index b711b244017..794ffa15dd4 100644
--- a/cpp/src/IceIAP/Transceiver.mm
+++ b/cpp/src/IceIAP/Transceiver.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "Transceiver.h"
#include "EndpointI.h"
diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk
index 91f08f2d1b1..26b8dc513a4 100644
--- a/cpp/src/IceLocatorDiscovery/Makefile.mk
+++ b/cpp/src/IceLocatorDiscovery/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceLocatorDiscovery
diff --git a/cpp/src/IceLocatorDiscovery/Plugin.h b/cpp/src/IceLocatorDiscovery/Plugin.h
index c8ba472d807..86997552d7a 100644
--- a/cpp/src/IceLocatorDiscovery/Plugin.h
+++ b/cpp/src/IceLocatorDiscovery/Plugin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef LOCATOR_DISCOVERY_PLUGIN_I_H
#define LOCATOR_DISCOVERY_PLUGIN_I_H
diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index 7f97f8befe8..fde4c106e97 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.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/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 3c334e286e6..358f8631d6e 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 6ed6869a405..e63ff51781e 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index 61eeb9f7b3d..f04e9319fa0 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.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 <IceUtil/FileUtil.h>
diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h
index 881261bf51b..311b72535a9 100644
--- a/cpp/src/IcePatch2/FileServerI.h
+++ b/cpp/src/IcePatch2/FileServerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_FILE_SERVER_I_H
#define ICE_PATCH2_FILE_SERVER_I_H
diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk
index 451313dfff2..64a7baa4814 100644
--- a/cpp/src/IcePatch2/Makefile.mk
+++ b/cpp/src/IcePatch2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := icepatch2server icepatch2client icepatch2calc
$(project)_dependencies := IcePatch2 Ice
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index dbd764a58fb..90bfd079d3a 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 0a6c39d7156..4e97d3a502e 100644
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.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 <IceUtil/FileUtil.h>
diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk
index 06d31352bdc..5f2fb0e7448 100644
--- a/cpp/src/IcePatch2Lib/Makefile.mk
+++ b/cpp/src/IcePatch2Lib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IcePatch2
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 11431fa4335..9bde18f915b 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// We need to include io.h first to get the proper signature for
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 203f27fe1fa..380510a36c2 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_UTIL_H
#define ICE_PATCH2_UTIL_H
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 9882df1bcd2..6cf2d88a77b 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/AcceptorI.h>
#include <IceSSL/EndpointI.h>
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index cb6316fbb11..d029026bb5a 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ACCEPTOR_I_H
#define ICESSL_ACCEPTOR_I_H
diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp
index 02eaab8c355..cb7e2d3ee39 100644
--- a/cpp/src/IceSSL/CertificateI.cpp
+++ b/cpp/src/IceSSL/CertificateI.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 <IceUtil/Mutex.h>
diff --git a/cpp/src/IceSSL/CertificateI.h b/cpp/src/IceSSL/CertificateI.h
index e851d5a24ff..c7b617bbd45 100644
--- a/cpp/src/IceSSL/CertificateI.h
+++ b/cpp/src/IceSSL/CertificateI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_CERTIFICATE_I_H
#define ICESSL_CERTIFICATE_I_H
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index b8d189192fa..1b5c2d53437 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/ConnectorI.h>
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index 27ec6644c58..5bc487a32e0 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_CONNECTOR_I_H
#define ICESSL_CONNECTOR_I_H
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index cfd1540093f..f028aeff5c5 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/EndpointI.h>
#include <IceSSL/AcceptorI.h>
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index ae04a3e6dd7..0c5d32bc98c 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ENDPOINT_I_H
#define ICESSL_ENDPOINT_I_H
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index 0b5079797e4..eedb94adfd0 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Instance.h>
#include <IceSSL/SSLEngine.h>
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index 0b56c77bc33..584fe0c54ca 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_INSTANCE_H
#define ICESSL_INSTANCE_H
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index d39f922b126..5f9b72106da 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_INSTANCE_F_H
#define ICESSL_INSTANCE_F_H
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk
index 1bff174643a..d2b769784a1 100644
--- a/cpp/src/IceSSL/Makefile.mk
+++ b/cpp/src/IceSSL/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceSSL
diff --git a/cpp/src/IceSSL/OpenSSLCertificateI.cpp b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
index 712b6b8199d..430fce90cab 100644
--- a/cpp/src/IceSSL/OpenSSLCertificateI.cpp
+++ b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Plugin.h>
#include <IceSSL/OpenSSL.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index e008094afb6..1cf3fa1c96b 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.h b/cpp/src/IceSSL/OpenSSLEngine.h
index 2fad7263ca9..0d77fb64db1 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.h
+++ b/cpp/src/IceSSL/OpenSSLEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_H
#define ICESSL_OPENSSL_ENGINE_H
diff --git a/cpp/src/IceSSL/OpenSSLEngineF.h b/cpp/src/IceSSL/OpenSSLEngineF.h
index 14413751979..433370c05f7 100644
--- a/cpp/src/IceSSL/OpenSSLEngineF.h
+++ b/cpp/src/IceSSL/OpenSSLEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_F_H
#define ICESSL_OPENSSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 0ce0b5e0fe2..79dbd386799 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/OpenSSL.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index 48e0bad02cf..9c0b260d9ac 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/OpenSSLTransceiverI.h>
#include <IceSSL/OpenSSLEngine.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.h b/cpp/src/IceSSL/OpenSSLTransceiverI.h
index 21698549c42..94ad07f802a 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.h
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_TRANSCEIVER_I_H
#define ICESSL_OPENSSL_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/OpenSSLUtil.cpp b/cpp/src/IceSSL/OpenSSLUtil.cpp
index 513c5e510a2..52f99bb4a5b 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/OpenSSLUtil.h>
diff --git a/cpp/src/IceSSL/OpenSSLUtil.h b/cpp/src/IceSSL/OpenSSLUtil.h
index c113ee858d5..9a79c659706 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.h
+++ b/cpp/src/IceSSL/OpenSSLUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_UTIL_I_H
#define ICESSL_OPENSSL_UTIL_I_H
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 10f5e9b26d4..a7d4c4737f4 100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index 50befc27261..12c914c1f59 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_PLUGIN_I_H
#define ICESSL_PLUGIN_I_H
diff --git a/cpp/src/IceSSL/RFC2253.cpp b/cpp/src/IceSSL/RFC2253.cpp
index 4c1c540a5e6..2c3e6a24238 100644
--- a/cpp/src/IceSSL/RFC2253.cpp
+++ b/cpp/src/IceSSL/RFC2253.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>
diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h
index 44d9d677bde..a43b1ca800f 100644
--- a/cpp/src/IceSSL/RFC2253.h
+++ b/cpp/src/IceSSL/RFC2253.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_RFC_2253_H
#define ICESSL_RFC_2253_H
diff --git a/cpp/src/IceSSL/SChannelCertificateI.cpp b/cpp/src/IceSSL/SChannelCertificateI.cpp
index d817dc61923..a4a4564a599 100644
--- a/cpp/src/IceSSL/SChannelCertificateI.cpp
+++ b/cpp/src/IceSSL/SChannelCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Plugin.h>
#include <IceSSL/SChannel.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index 1dbbf390fd2..770988c3e90 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SChannelEngine.h>
#include <IceSSL/SChannelTransceiverI.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.h b/cpp/src/IceSSL/SChannelEngine.h
index c50e8cb6629..6d6b96d8481 100644
--- a/cpp/src/IceSSL/SChannelEngine.h
+++ b/cpp/src/IceSSL/SChannelEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_H
#define ICESSL_SCHANNEL_ENGINE_H
diff --git a/cpp/src/IceSSL/SChannelEngineF.h b/cpp/src/IceSSL/SChannelEngineF.h
index 879daa4d5d1..b4a93ae23cb 100644
--- a/cpp/src/IceSSL/SChannelEngineF.h
+++ b/cpp/src/IceSSL/SChannelEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_F_H
#define ICESSL_SCHANNEL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SChannelPluginI.cpp b/cpp/src/IceSSL/SChannelPluginI.cpp
index 694615743b3..951a1e29d6c 100644
--- a/cpp/src/IceSSL/SChannelPluginI.cpp
+++ b/cpp/src/IceSSL/SChannelPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/SChannelEngine.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp
index b879dab8798..8ffd5aac553 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.cpp
+++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SChannelTransceiverI.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index c183c6ff8fd..f21fd1ac205 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
#define ICESSL_SCHANNELTRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SSLEngine.cpp b/cpp/src/IceSSL/SSLEngine.cpp
index 56e74693671..4d139e4c7ce 100644
--- a/cpp/src/IceSSL/SSLEngine.cpp
+++ b/cpp/src/IceSSL/SSLEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SSLEngine.h>
#include <IceSSL/TrustManager.h>
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index 57041bc16ad..eda5e816aca 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ENGINE_H
#define ICESSL_ENGINE_H
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index f745756340d..ad965fbb2d0 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ENGINE_F_H
#define ICESSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
index df9caf5c294..8ea6fb89f47 100644
--- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp
+++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Plugin.h>
#include <IceSSL/SecureTransport.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index a3304676bfe..cc2e3a4d4ee 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.h b/cpp/src/IceSSL/SecureTransportEngine.h
index a8bdf41d594..fbd97d6a616 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.h
+++ b/cpp/src/IceSSL/SecureTransportEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_H
#define ICESSL_SECURE_TRANSPORT_ENGINE_H
diff --git a/cpp/src/IceSSL/SecureTransportEngineF.h b/cpp/src/IceSSL/SecureTransportEngineF.h
index 565c5535c51..4869a0c7b97 100644
--- a/cpp/src/IceSSL/SecureTransportEngineF.h
+++ b/cpp/src/IceSSL/SecureTransportEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_F_H
#define ICESSL_SECURE_TRANSPORT_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportPluginI.cpp b/cpp/src/IceSSL/SecureTransportPluginI.cpp
index 7c4cdc375f3..1ecbeec21b7 100644
--- a/cpp/src/IceSSL/SecureTransportPluginI.cpp
+++ b/cpp/src/IceSSL/SecureTransportPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/SecureTransport.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 317da13705b..cc168b0ab94 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SecureTransportTransceiverI.h>
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index f3d84ef033b..04d9d26a98a 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
#define ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp
index ac8d8f21e34..a3ae427d516 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.cpp
+++ b/cpp/src/IceSSL/SecureTransportUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SecureTransportUtil.h>
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h
index 211d4b49c9c..088af9fc40c 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.h
+++ b/cpp/src/IceSSL/SecureTransportUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
#define ICESSL_SECURE_TRANSPORT_UTIL_H
diff --git a/cpp/src/IceSSL/TrustManager.cpp b/cpp/src/IceSSL/TrustManager.cpp
index 8f2352b70c6..551a4ba27ff 100644
--- a/cpp/src/IceSSL/TrustManager.cpp
+++ b/cpp/src/IceSSL/TrustManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/TrustManager.h>
#include <IceSSL/RFC2253.h>
diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h
index ce9ba4d42dd..ba379a61eb1 100644
--- a/cpp/src/IceSSL/TrustManager.h
+++ b/cpp/src/IceSSL/TrustManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_H
#define ICESSL_TRUST_MANAGER_H
diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h
index ec11874eadd..606715e02ce 100644
--- a/cpp/src/IceSSL/TrustManagerF.h
+++ b/cpp/src/IceSSL/TrustManagerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_F_H
#define ICESSL_TRUST_MANAGER_F_H
diff --git a/cpp/src/IceSSL/UWPCertificateI.cpp b/cpp/src/IceSSL/UWPCertificateI.cpp
index b5108e7bc23..7527d805894 100644
--- a/cpp/src/IceSSL/UWPCertificateI.cpp
+++ b/cpp/src/IceSSL/UWPCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// UWP Certificate implementation
diff --git a/cpp/src/IceSSL/UWPEngine.cpp b/cpp/src/IceSSL/UWPEngine.cpp
index f3be970d81b..d335dc259f4 100644
--- a/cpp/src/IceSSL/UWPEngine.cpp
+++ b/cpp/src/IceSSL/UWPEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/UWPEngine.h b/cpp/src/IceSSL/UWPEngine.h
index 701590131e4..36c535eb2e7 100644
--- a/cpp/src/IceSSL/UWPEngine.h
+++ b/cpp/src/IceSSL/UWPEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_H
#define ICESSL_UWP_ENGINE_H
diff --git a/cpp/src/IceSSL/UWPEngineF.h b/cpp/src/IceSSL/UWPEngineF.h
index 634f0c594d8..d2b16581c78 100644
--- a/cpp/src/IceSSL/UWPEngineF.h
+++ b/cpp/src/IceSSL/UWPEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_F_H
#define ICESSL_UWP_ENGINE_F_H
diff --git a/cpp/src/IceSSL/UWPPluginI.cpp b/cpp/src/IceSSL/UWPPluginI.cpp
index a1d519496ba..19d09684318 100644
--- a/cpp/src/IceSSL/UWPPluginI.cpp
+++ b/cpp/src/IceSSL/UWPPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/UWPEngine.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index 50cc865ff0f..c9d7bfb788b 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
#include <IceSSL/UWPTransceiverI.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index 272356c51be..a6d7cbbb29b 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_TRANSCEIVER_I_H
#define ICESSL_UWP_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index f919115613b..0d04ab423cd 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Config.h>
#if defined(_WIN32) && !defined(ICE_OS_UWP)
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index 62b60e6598a..42d232d7fb3 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UTIL_H
#define ICESSL_UTIL_H
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 875ac412e36..22c6ed1ac09 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice
index 08dc5d22510..5d5c2a7a85f 100644
--- a/cpp/src/IceStorm/DBTypes.ice
+++ b/cpp/src/IceStorm/DBTypes.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/src/IceStorm/Election.ice b/cpp/src/IceStorm/Election.ice
index 8a7c47e558c..8b175c9b6ff 100644
--- a/cpp/src/IceStorm/Election.ice
+++ b/cpp/src/IceStorm/Election.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/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp
index aafd24e8559..f1207cb59a6 100644
--- a/cpp/src/IceStorm/Grammar.cpp
+++ b/cpp/src/IceStorm/Grammar.cpp
@@ -66,11 +66,9 @@
#line 1 "src/IceStorm/Grammar.y"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index d60b83fccbf..2de164d74b3 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index 2cf9398428c..7eb11018ce0 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice
index 7f9d6ace1c0..302446d7070 100644
--- a/cpp/src/IceStorm/IceStormInternal.ice
+++ b/cpp/src/IceStorm/IceStormInternal.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/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index f65d83f8353..ad22c9151ad 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Instance.h>
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h
index 19e9555327c..897ea2eaa55 100644
--- a/cpp/src/IceStorm/Instance.h
+++ b/cpp/src/IceStorm/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INSTANCE_H
#define INSTANCE_H
diff --git a/cpp/src/IceStorm/Instrumentation.ice b/cpp/src/IceStorm/Instrumentation.ice
index 3dca295be82..dab31321dd5 100644
--- a/cpp/src/IceStorm/Instrumentation.ice
+++ b/cpp/src/IceStorm/Instrumentation.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/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index ded07c9a8b6..5675c261122 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/InstrumentationI.h>
diff --git a/cpp/src/IceStorm/InstrumentationI.h b/cpp/src/IceStorm/InstrumentationI.h
index 1f4b62504df..9627a72b3c9 100644
--- a/cpp/src/IceStorm/InstrumentationI.h
+++ b/cpp/src/IceStorm/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/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice
index 35b27b0542e..701a3c98c18 100644
--- a/cpp/src/IceStorm/LLURecord.ice
+++ b/cpp/src/IceStorm/LLURecord.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/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice
index 0090a56f4a3..c6f9c619057 100644
--- a/cpp/src/IceStorm/LinkRecord.ice
+++ b/cpp/src/IceStorm/LinkRecord.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/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk
index 32a8b9a66fc..801093880b1 100644
--- a/cpp/src/IceStorm/Makefile.mk
+++ b/cpp/src/IceStorm/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceStormService
$(project)_programs := icestormadmin icestormdb
diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp
index d87482bc5e6..78c4c04cbc3 100644
--- a/cpp/src/IceStorm/NodeI.cpp
+++ b/cpp/src/IceStorm/NodeI.cpp
@@ -1,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/NodeI.h>
diff --git a/cpp/src/IceStorm/NodeI.h b/cpp/src/IceStorm/NodeI.h
index 9c3ca39a79d..5b0ba169def 100644
--- a/cpp/src/IceStorm/NodeI.h
+++ b/cpp/src/IceStorm/NodeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ELECTION_I_H
#define ELECTION_I_H
diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp
index 72dc9df1020..b38a2db5da5 100644
--- a/cpp/src/IceStorm/Observers.cpp
+++ b/cpp/src/IceStorm/Observers.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Observers.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h
index c98d0e44eff..89b26217b73 100644
--- a/cpp/src/IceStorm/Observers.h
+++ b/cpp/src/IceStorm/Observers.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef OBSERVERS_H
#define OBSERVERS_H
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 9b97c180983..ce06f05d322 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.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>
@@ -409,7 +407,7 @@ Parser::current(const list<string>& args)
void
Parser::showBanner()
{
- consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-present ZeroC, Inc." << endl;
+ consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) ZeroC, Inc." << endl;
}
//
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index a696a4fe012..c297617f707 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STORM_PARSER_H
#define ICE_STORM_PARSER_H
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index e0af5e778d6..f166a8db317 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef REPLICA_H
#define REPLICA_H
diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
index fa6ad378a91..ce0e4e36e64 100644
--- a/cpp/src/IceStorm/Scanner.cpp
+++ b/cpp/src/IceStorm/Scanner.cpp
@@ -462,11 +462,9 @@ char *yytext;
#line 1 "src/IceStorm/Scanner.l"
#line 2 "src/IceStorm/Scanner.l"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index 47cd435feee..3789e14f62f 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 3beb25d9ab2..453d20a4c00 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#define ICESTORM_SERVICE_API_EXPORTS
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h
index a9991943395..11c7a80a2ad 100644
--- a/cpp/src/IceStorm/Service.h
+++ b/cpp/src/IceStorm/Service.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESTORM_SERVICE_H
#define ICESTORM_SERVICE_H
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index cbc9aa03df6..0fb46848c3d 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Subscriber.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index e9d3ebc6f67..af5cc721f69 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SUBSCRIBER_H
#define SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice
index 98dd9dd6cf0..447c45f34f4 100644
--- a/cpp/src/IceStorm/SubscriberRecord.ice
+++ b/cpp/src/IceStorm/SubscriberRecord.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/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 269f9ab955a..480189c6387 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TopicI.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index be48eea9cfd..9597fb62558 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TOPIC_I_H
#define TOPIC_I_H
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 7e9d10890f6..74a64a2198a 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TopicManagerI.h>
#include <IceStorm/TopicI.h>
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index 3a913082363..84cb47871cf 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TOPIC_MANAGER_I_H
#define TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index f0ee042b89b..afa45876c72 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 91f0d1e5903..02a4ac63452 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STORM_TRACE_LEVELS_H
#define ICE_STORM_TRACE_LEVELS_H
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 014029a58bd..055d32caf60 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TransientTopicI.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/TransientTopicI.h b/cpp/src/IceStorm/TransientTopicI.h
index da745330e7c..50b73d835f5 100644
--- a/cpp/src/IceStorm/TransientTopicI.h
+++ b/cpp/src/IceStorm/TransientTopicI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TRANSIENT_TOPIC_I_H
#define TRANSIENT_TOPIC_I_H
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp
index 2e33a7ce8d2..56cc3d37f17 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.cpp
+++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TransientTopicManagerI.h>
#include <IceStorm/TransientTopicI.h>
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h
index 49e617abb27..4051a941327 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.h
+++ b/cpp/src/IceStorm/TransientTopicManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TRANSIENT_TOPIC_MANAGER_I_H
#define TRANSIENT_TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp
index 3d17d1d5a49..7eebdf80173 100644
--- a/cpp/src/IceStorm/Util.cpp
+++ b/cpp/src/IceStorm/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Util.h>
#include <IceStorm/SubscriberRecord.h>
diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h
index d70943fb929..1ad63017219 100644
--- a/cpp/src/IceStorm/Util.h
+++ b/cpp/src/IceStorm/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef UTIL_H
#define UTIL_H
diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk
index 317510ab5af..fb78568f1ec 100644
--- a/cpp/src/IceStormLib/Makefile.mk
+++ b/cpp/src/IceStormLib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceStorm
diff --git a/cpp/src/IceUtil/ConsoleUtil.cpp b/cpp/src/IceUtil/ConsoleUtil.cpp
index fd1f5855e02..bb99e968323 100644
--- a/cpp/src/IceUtil/ConsoleUtil.cpp
+++ b/cpp/src/IceUtil/ConsoleUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
#include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp
index 16fe10d14f5..6beed68dfc9 100644
--- a/cpp/src/IceUtil/ConvertUTF.cpp
+++ b/cpp/src/IceUtil/ConvertUTF.cpp
@@ -20,11 +20,9 @@
* remains attached.
*/
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
/* ---------------------------------------------------------------------
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h
index 5aa3f7df4d8..2b4b36540b8 100644
--- a/cpp/src/IceUtil/ConvertUTF.h
+++ b/cpp/src/IceUtil/ConvertUTF.h
@@ -20,11 +20,9 @@
* remains attached.
*/
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CONVERT_UTF_H
#define ICE_UTIL_CONVERT_UTF_H
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index d0de08a6365..eae9ce10892 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef __sun
# define _POSIX_PTHREAD_SEMANTICS
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index 7a0d8a66cfd..c68c8a721af 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.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 <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index f3dd98922c3..52027a56ac8 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.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 <stdlib.h>
diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk
index 2f031256d36..be110f2d5e7 100644
--- a/cpp/src/IceUtil/Makefile.mk
+++ b/cpp/src/IceUtil/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceUtil
diff --git a/cpp/src/IceUtil/MutexProtocol.cpp b/cpp/src/IceUtil/MutexProtocol.cpp
index fc278555666..f8b2e8aea28 100644
--- a/cpp/src/IceUtil/MutexProtocol.cpp
+++ b/cpp/src/IceUtil/MutexProtocol.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/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index 7baf57380f2..2f9d228cf72 100644
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 9003b8e93fa..a917d3ae24a 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/OutputUtil.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceUtil/Random.cpp b/cpp/src/IceUtil/Random.cpp
index bcf2b233ad3..7f639f2e89f 100644
--- a/cpp/src/IceUtil/Random.cpp
+++ b/cpp/src/IceUtil/Random.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef _WIN32
# define _CRT_RAND_S
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 24465292486..099ecf28a62 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/RecMutex.h>
#include <IceUtil/Exception.h>
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 6250f1ab8bd..a385e191726 100644
--- a/cpp/src/IceUtil/Shared.cpp
+++ b/cpp/src/IceUtil/Shared.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Shared.h>
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index 292f87d5fc4..52f12c88cf2 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringConverter.h>
#include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 33848ba54cd..f78617c41dd 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.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 <IceUtil/StringConverter.h>
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 8f047847146..2ba724a4a3c 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index 68b953dbb2a..4c4dc4b68a4 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.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 <IceUtil/Exception.h>
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 662807a86f2..452ee3fffb0 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.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>
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index 608d6306de4..2261eb48e9c 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h
index bdae437a5a4..564644a35b2 100644
--- a/cpp/src/IceUtil/Unicode.h
+++ b/cpp/src/IceUtil/Unicode.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_UNICODE_H
#define ICE_UTIL_UNICODE_H
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp
index 4c8daaaf236..9231cc5fffa 100644
--- a/cpp/src/IceUtil/UtilException.cpp
+++ b/cpp/src/IceUtil/UtilException.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#if defined(_MSC_VER) && _MSC_VER >= 1700
//
diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk
index c6b9315c6ca..919176ea512 100644
--- a/cpp/src/IceXML/Makefile.mk
+++ b/cpp/src/IceXML/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceXML
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 1a1ad3e8c41..1463dc9c07a 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceXML/Parser.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index 4ee32ea78b8..71101b7a55a 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_XML_PARSER_H
#define ICE_XML_PARSER_H
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 7d63961a941..cfcdda425e7 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/CPlusPlusUtil.h>
#include <Slice/Util.h>
@@ -512,11 +510,9 @@ void
Slice::printHeader(Output& out)
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h
index ac77f16f86a..b8fa3ad9e46 100644
--- a/cpp/src/Slice/CPlusPlusUtil.h
+++ b/cpp/src/Slice/CPlusPlusUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef C_PLUS_PLUS_UTIL_H
#define C_PLUS_PLUS_UTIL_H
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp
index d35fda1c921..98aa11291d8 100644
--- a/cpp/src/Slice/Checksum.cpp
+++ b/cpp/src/Slice/Checksum.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Checksum.h>
#include <Slice/MD5.h>
diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h
index ef86fc5784d..8be4395b12b 100644
--- a/cpp/src/Slice/Checksum.h
+++ b/cpp/src/Slice/Checksum.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_CHECKSUM_H
#define SLICE_CHECKSUM_H
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index 17eeefd1f2e..855ce45a168 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/FileTracker.h>
#include <IceUtil/ConsoleUtil.h>
diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
index 704004f9e6a..15446cddc20 100644
--- a/cpp/src/Slice/FileTracker.h
+++ b/cpp/src/Slice/FileTracker.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef FILE_TRACKER_H
#define FILE_TRACKER_H
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index d9ef1669a98..9d7b21e244f 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -73,11 +73,9 @@
#line 1 "src/Slice/Grammar.y"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 8c5776c78e2..a9af4724d8a 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 5ea716dbaae..082718126ce 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_GRAMMAR_UTIL_H
#define SLICE_GRAMMAR_UTIL_H
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3e81077a3ff..327e4b92a5d 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.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 <Slice/JavaUtil.h>
@@ -785,11 +783,9 @@ void
Slice::JavaOutput::printHeader()
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
print(header);
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h
index 8fdbeb38a51..326d7adfa1a 100644
--- a/cpp/src/Slice/JavaUtil.h
+++ b/cpp/src/Slice/JavaUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef JAVA_UTIL_H
#define JAVA_UTIL_H
diff --git a/cpp/src/Slice/MD5.cpp b/cpp/src/Slice/MD5.cpp
index d11ee1724c8..8d4130da12d 100644
--- a/cpp/src/Slice/MD5.cpp
+++ b/cpp/src/Slice/MD5.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/MD5.h>
#include <Slice/MD5I.h>
diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h
index 4314dfb68d0..073a9c8d550 100644
--- a/cpp/src/Slice/MD5.h
+++ b/cpp/src/Slice/MD5.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_MD5_H
#define SLICE_MD5_H
diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk
index 83a0bb90a0d..5e514e09d7f 100644
--- a/cpp/src/Slice/Makefile.mk
+++ b/cpp/src/Slice/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := Slice
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp
index e6b31290a59..dbf21732161 100644
--- a/cpp/src/Slice/PHPUtil.cpp
+++ b/cpp/src/Slice/PHPUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/PHPUtil.h>
#include <functional>
diff --git a/cpp/src/Slice/PHPUtil.h b/cpp/src/Slice/PHPUtil.h
index ac61a0a6232..03f5d537ae6 100644
--- a/cpp/src/Slice/PHPUtil.h
+++ b/cpp/src/Slice/PHPUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_PHP_UTIL_H
#define SLICE_PHP_UTIL_H
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index a2ad348fb17..e49c20f1c50 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index a36bd1154e5..77bbce0c6e1 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_PARSER_H
#define SLICE_PARSER_H
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 35e4deeb89f..30430304020 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Preprocessor.h>
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h
index b2130800f58..e9456ae1fbf 100644
--- a/cpp/src/Slice/Preprocessor.h
+++ b/cpp/src/Slice/Preprocessor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef PREPROCESSOR_H
#define PREPROCESSOR_H
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index c94ddfa212b..7f9abaccc3f 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.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/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 55314440dd6..2637ca26321 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/PythonUtil.h>
#include <Slice/Checksum.h>
@@ -3085,11 +3083,9 @@ void
Slice::Python::printHeader(IceUtilInternal::Output& out)
{
static const char* header =
-"# **********************************************************************\n"
"#\n"
-"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h
index 2dc69c1cc62..d1b0d656906 100644
--- a/cpp/src/Slice/PythonUtil.h
+++ b/cpp/src/Slice/PythonUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_PYTHON_UTIL_H
#define SLICE_PYTHON_UTIL_H
diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp
index 5e3b5ef2345..ff9f46730eb 100644
--- a/cpp/src/Slice/Ruby.cpp
+++ b/cpp/src/Slice/Ruby.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 <IceUtil/Options.h>
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 6ec56cb5bb5..eea8791ec4c 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/RubyUtil.h>
#include <Slice/Checksum.h>
@@ -1561,11 +1559,9 @@ void
Slice::Ruby::printHeader(IceUtilInternal::Output& out)
{
static const char* header =
-"# **********************************************************************\n"
"#\n"
-"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h
index 69ad8f937e8..f5fb4413f68 100644
--- a/cpp/src/Slice/RubyUtil.h
+++ b/cpp/src/Slice/RubyUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_RUBY_UTIL_H
#define SLICE_RUBY_UTIL_H
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index 6a0ba098cd8..0da441603bf 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -546,11 +546,9 @@ char *slice_text;
#line 1 "src/Slice/Scanner.l"
#line 2 "src/Slice/Scanner.l"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
#include <Slice/Grammar.h>
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 8209d01265b..b93f13eb51b 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
#include <Slice/Grammar.h>
diff --git a/cpp/src/Slice/SliceUtil.cpp b/cpp/src/Slice/SliceUtil.cpp
index f59a58818dd..d11003ca83c 100644
--- a/cpp/src/Slice/SliceUtil.cpp
+++ b/cpp/src/Slice/SliceUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Util.h>
#include <Slice/FileTracker.h>
diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp
index f2f1dd8a74c..00c4af6efd6 100644
--- a/cpp/src/Slice/StringLiteralUtil.cpp
+++ b/cpp/src/Slice/StringLiteralUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h
index caa8ed321bb..24bf8ec0d3a 100644
--- a/cpp/src/Slice/Util.h
+++ b/cpp/src/Slice/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_UTIL_H
#define SLICE_UTIL_H
diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index e24fbf7c2ed..0e738da2753 100644
--- a/cpp/src/icegriddb/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.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/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index b2b96f44688..cf6d2c83163 100644
--- a/cpp/src/icegriddb/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
index 2635bca3b22..7fdd82d590e 100644
--- a/cpp/src/icegriddb/Makefile.mk
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := icegriddb
$(project)_generated_includedir := $(project)/generated/IceGrid
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp
index 9e5b8890412..7f25ecb7058 100644
--- a/cpp/src/iceserviceinstall/Install.cpp
+++ b/cpp/src/iceserviceinstall/Install.cpp
@@ -1,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/ConsoleUtil.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index d42540093f9..87290996584 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServiceInstaller.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h
index 78f181e9671..f9e498c5326 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.h
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVICE_INSTALLER_H
#define ICE_SERVICE_INSTALLER_H
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index 81bc2488c5e..149e7ced295 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
#include <ConfluenceOutput.h>
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 912a1bc5262..dc6c714ef8f 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CONFLUENCE_OUTPUT
#define CONFLUENCE_OUTPUT
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index ac492c8d47b..f3b4dde5d70 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/FileUtil.h>
#include <IceUtil/Functional.h>
diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h
index b85854ef7c3..16b6a1c0b64 100644
--- a/cpp/src/slice2confluence/Gen.h
+++ b/cpp/src/slice2confluence/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index f727095a663..c2a759fb9a5 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 959f612520c..6315c900650 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "Gen.h"
#include <Slice/Util.h>
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 592b0efd785..c2e798135fd 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index f6229dcbb44..fe5a95aa995 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 4e855c42673..3c748ef88e9 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <CsUtil.h>
#include <DotNetNames.h>
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
index c814fe311b3..0cfc81fe6ae 100644
--- a/cpp/src/slice2cs/CsUtil.h
+++ b/cpp/src/slice2cs/CsUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CS_UTIL_H
#define CS_UTIL_H
diff --git a/cpp/src/slice2cs/DotNetNames.cpp b/cpp/src/slice2cs/DotNetNames.cpp
index 88e102695d8..38649df2fa0 100644
--- a/cpp/src/slice2cs/DotNetNames.cpp
+++ b/cpp/src/slice2cs/DotNetNames.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <DotNetNames.h>
#include <ctype.h>
diff --git a/cpp/src/slice2cs/DotNetNames.h b/cpp/src/slice2cs/DotNetNames.h
index 33ea863ac9b..9839c4f3e49 100644
--- a/cpp/src/slice2cs/DotNetNames.h
+++ b/cpp/src/slice2cs/DotNetNames.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef DOTNETNAMES_H
#define DOTNETNAMES_H
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 5fd2d18e11e..5b748b41a0a 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/StringUtil.h>
@@ -2114,11 +2112,9 @@ void
Slice::Gen::printHeader()
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
_out << header;
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index b56de95fb65..b20c824e337 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index e5a43892c82..a3826690354 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 416349e991a..450f5211844 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 923c83f480a..268b82d9f5e 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index c7d24550e36..80eee9ac853 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 1bd2f742d6b..160ab5c238d 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Gen.h>
#include <Slice/Checksum.h>
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 4608a974b8b..d9e286d1ad9 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index 95ce5cf9b27..0f390f01057 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <GenCompat.h>
#include <Slice/Checksum.h>
diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index 796d5332a58..8000f941d0d 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_COMPAT_H
#define GEN_COMPAT_H
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 171012dd7f7..d47fb0fd8f1 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index d0d80e9ddbd..1a6c60177b1 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/StringUtil.h>
@@ -90,11 +88,9 @@ void
printHeader(IceUtilInternal::Output& out)
{
static const char* header =
- "// **********************************************************************\n"
"//\n"
- "// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+ "// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index 6ca2a1df8ec..e6ab5a23151 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index a5084be9160..ec5bbd8e098 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <JsUtil.h>
#include <Slice/Util.h>
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h
index f8ae5400b57..6486ba111c6 100644
--- a/cpp/src/slice2js/JsUtil.h
+++ b/cpp/src/slice2js/JsUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef JS_UTIL_H
#define JS_UTIL_H
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 9abb2ce7cc6..773ff82232e 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp
index 98556847c02..0b3de868384 100644
--- a/cpp/src/slice2matlab/Main.cpp
+++ b/cpp/src/slice2matlab/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/IceUtil.h>
@@ -256,7 +254,7 @@ writeCopyright(IceUtilInternal::Output& out, const string& file)
f = f.substr(pos + 1);
}
- out << nl << "% Copyright (c) 2003-present ZeroC, Inc. All rights reserved.";
+ out << nl << "% Copyright (c) ZeroC, Inc. All rights reserved.";
out << nl << "% Generated from " << f << " by slice2matlab version " << ICE_STRING_VERSION;
out << nl;
}
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 75133d6f0a1..725452eaf05 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.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 <IceUtil/Functional.h>
@@ -878,11 +876,9 @@ void
Slice::Gen::printHeader(Output& o)
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
o << header;
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index b347331c1f5..812f3933d32 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp
index 064ffadff88..69e45d79088 100644
--- a/cpp/src/slice2objc/Main.cpp
+++ b/cpp/src/slice2objc/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Slice/Preprocessor.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 3c323c52da6..7dd96a71688 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ObjCUtil.h>
#include <Slice/Util.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index 64a58a1eeae..0c5176d67d8 100644
--- a/cpp/src/slice2objc/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef OBJC_UTIL_H
#define OBJC_UTIL_H
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 12900e41943..b5d354af1fb 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/IceUtil.h>
@@ -1575,11 +1573,9 @@ static void
printHeader(IceUtilInternal::Output& out)
{
static const char* header =
- "// **********************************************************************\n"
"//\n"
- "// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+ "// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index cf34e8cf4ec..79d17548cf7 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/PythonUtil.h>
#include <Slice/Util.h>
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index 167c5bdaa39..c6a6692111c 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/RubyUtil.h>
#include <Slice/Util.h>
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