summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/Makefile10
-rwxr-xr-xcpp/allTests.py10
-rw-r--r--cpp/config/IcePackAdmin.py10
-rw-r--r--cpp/config/Make.rules10
-rw-r--r--cpp/config/Make.rules.Darwin10
-rw-r--r--cpp/config/Make.rules.FreeBSD10
-rw-r--r--cpp/config/Make.rules.HP-UX10
-rw-r--r--cpp/config/Make.rules.Linux10
-rw-r--r--cpp/config/Make.rules.SunOS10
-rw-r--r--cpp/config/TestUtil.py10
-rwxr-xr-xcpp/config/makedepend.py10
-rw-r--r--cpp/demo/Freeze/Makefile10
-rw-r--r--cpp/demo/Freeze/backup/Client.cpp10
-rw-r--r--cpp/demo/Freeze/backup/Makefile10
-rw-r--r--cpp/demo/Freeze/bench/Client.cpp10
-rw-r--r--cpp/demo/Freeze/bench/Makefile10
-rw-r--r--cpp/demo/Freeze/bench/Test.ice10
-rw-r--r--cpp/demo/Freeze/library/BookFactory.cpp10
-rw-r--r--cpp/demo/Freeze/library/BookFactory.h10
-rw-r--r--cpp/demo/Freeze/library/Client.cpp10
-rw-r--r--cpp/demo/Freeze/library/Collocated.cpp10
-rw-r--r--cpp/demo/Freeze/library/Grammar.y10
-rw-r--r--cpp/demo/Freeze/library/Library.ice10
-rw-r--r--cpp/demo/Freeze/library/LibraryI.cpp10
-rw-r--r--cpp/demo/Freeze/library/LibraryI.h10
-rw-r--r--cpp/demo/Freeze/library/Makefile10
-rw-r--r--cpp/demo/Freeze/library/Parser.cpp10
-rw-r--r--cpp/demo/Freeze/library/Parser.h10
-rw-r--r--cpp/demo/Freeze/library/RunParser.cpp10
-rw-r--r--cpp/demo/Freeze/library/Scanner.l10
-rw-r--r--cpp/demo/Freeze/library/Server.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/Client.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/Collocated.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.h10
-rw-r--r--cpp/demo/Freeze/phonebook/Grammar.y10
-rw-r--r--cpp/demo/Freeze/phonebook/Makefile10
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.h10
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBook.ice10
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBookI.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBookI.h10
-rw-r--r--cpp/demo/Freeze/phonebook/RunParser.cpp10
-rw-r--r--cpp/demo/Freeze/phonebook/Scanner.l10
-rw-r--r--cpp/demo/Freeze/phonebook/Server.cpp10
-rw-r--r--cpp/demo/Glacier/Makefile10
-rw-r--r--cpp/demo/Glacier/session/Client.cpp10
-rw-r--r--cpp/demo/Glacier/session/HelloSession.ice10
-rw-r--r--cpp/demo/Glacier/session/HelloSessionI.cpp10
-rw-r--r--cpp/demo/Glacier/session/HelloSessionI.h10
-rw-r--r--cpp/demo/Glacier/session/Makefile10
-rw-r--r--cpp/demo/Glacier/session/Server.cpp10
-rw-r--r--cpp/demo/Ice/MFC/client/Hello.ice10
-rw-r--r--cpp/demo/Ice/MFC/client/HelloClient.cpp26
-rw-r--r--cpp/demo/Ice/MFC/client/HelloClient.h26
-rw-r--r--cpp/demo/Ice/MFC/client/HelloClientDlg.cpp26
-rw-r--r--cpp/demo/Ice/MFC/client/HelloClientDlg.h26
-rw-r--r--cpp/demo/Ice/MFC/client/stdafx.cpp26
-rw-r--r--cpp/demo/Ice/MFC/client/stdafx.h26
-rw-r--r--cpp/demo/Ice/MFC/server/Hello.ice10
-rw-r--r--cpp/demo/Ice/MFC/server/HelloI.cpp10
-rw-r--r--cpp/demo/Ice/MFC/server/HelloI.h10
-rw-r--r--cpp/demo/Ice/MFC/server/HelloServer.cpp26
-rw-r--r--cpp/demo/Ice/MFC/server/HelloServer.h26
-rw-r--r--cpp/demo/Ice/MFC/server/HelloServerDlg.cpp26
-rw-r--r--cpp/demo/Ice/MFC/server/HelloServerDlg.h26
-rw-r--r--cpp/demo/Ice/MFC/server/LogI.cpp10
-rw-r--r--cpp/demo/Ice/MFC/server/LogI.h26
-rw-r--r--cpp/demo/Ice/MFC/server/stdafx.cpp26
-rw-r--r--cpp/demo/Ice/MFC/server/stdafx.h26
-rw-r--r--cpp/demo/Ice/Makefile10
-rw-r--r--cpp/demo/Ice/callback/Callback.ice10
-rw-r--r--cpp/demo/Ice/callback/CallbackI.cpp10
-rw-r--r--cpp/demo/Ice/callback/CallbackI.h10
-rw-r--r--cpp/demo/Ice/callback/Client.cpp10
-rw-r--r--cpp/demo/Ice/callback/Makefile10
-rw-r--r--cpp/demo/Ice/callback/Server.cpp10
-rw-r--r--cpp/demo/Ice/hello/Client.cpp10
-rw-r--r--cpp/demo/Ice/hello/Hello.ice10
-rw-r--r--cpp/demo/Ice/hello/HelloI.cpp10
-rw-r--r--cpp/demo/Ice/hello/HelloI.h10
-rw-r--r--cpp/demo/Ice/hello/Makefile10
-rw-r--r--cpp/demo/Ice/hello/Server.cpp10
-rw-r--r--cpp/demo/Ice/latency/Client.cpp10
-rw-r--r--cpp/demo/Ice/latency/Latency.ice10
-rw-r--r--cpp/demo/Ice/latency/Makefile10
-rw-r--r--cpp/demo/Ice/latency/Server.cpp10
-rw-r--r--cpp/demo/Ice/nested/Client.cpp10
-rw-r--r--cpp/demo/Ice/nested/Makefile10
-rw-r--r--cpp/demo/Ice/nested/Nested.ice10
-rw-r--r--cpp/demo/Ice/nested/NestedI.cpp10
-rw-r--r--cpp/demo/Ice/nested/NestedI.h10
-rw-r--r--cpp/demo/Ice/nested/Server.cpp10
-rw-r--r--cpp/demo/Ice/throughput/Client.cpp10
-rw-r--r--cpp/demo/Ice/throughput/Makefile10
-rw-r--r--cpp/demo/Ice/throughput/Server.cpp10
-rw-r--r--cpp/demo/Ice/throughput/Throughput.ice10
-rw-r--r--cpp/demo/Ice/throughput/ThroughputI.h10
-rw-r--r--cpp/demo/Ice/value/Client.cpp10
-rw-r--r--cpp/demo/Ice/value/Makefile10
-rw-r--r--cpp/demo/Ice/value/ObjectFactory.cpp10
-rw-r--r--cpp/demo/Ice/value/ObjectFactory.h10
-rw-r--r--cpp/demo/Ice/value/Server.cpp10
-rw-r--r--cpp/demo/Ice/value/Value.ice10
-rw-r--r--cpp/demo/Ice/value/ValueI.cpp10
-rw-r--r--cpp/demo/Ice/value/ValueI.h10
-rw-r--r--cpp/demo/IceBox/Makefile10
-rw-r--r--cpp/demo/IceBox/hello/Client.cpp10
-rw-r--r--cpp/demo/IceBox/hello/Hello.ice10
-rw-r--r--cpp/demo/IceBox/hello/HelloI.cpp10
-rw-r--r--cpp/demo/IceBox/hello/HelloI.h10
-rw-r--r--cpp/demo/IceBox/hello/HelloServiceI.cpp10
-rw-r--r--cpp/demo/IceBox/hello/HelloServiceI.h10
-rw-r--r--cpp/demo/IceBox/hello/Makefile10
-rw-r--r--cpp/demo/IcePack/Makefile10
-rw-r--r--cpp/demo/IcePack/hello/Client.cpp10
-rw-r--r--cpp/demo/IcePack/hello/Hello.ice10
-rw-r--r--cpp/demo/IcePack/hello/HelloI.cpp10
-rw-r--r--cpp/demo/IcePack/hello/HelloI.h10
-rw-r--r--cpp/demo/IcePack/hello/HelloServiceI.cpp10
-rw-r--r--cpp/demo/IcePack/hello/HelloServiceI.h10
-rw-r--r--cpp/demo/IcePack/hello/Makefile10
-rw-r--r--cpp/demo/IcePack/hello/Server.cpp10
-rw-r--r--cpp/demo/IcePack/simple/Client.cpp10
-rw-r--r--cpp/demo/IcePack/simple/Hello.ice10
-rw-r--r--cpp/demo/IcePack/simple/HelloI.cpp10
-rw-r--r--cpp/demo/IcePack/simple/HelloI.h10
-rw-r--r--cpp/demo/IcePack/simple/HelloServiceI.cpp10
-rw-r--r--cpp/demo/IcePack/simple/HelloServiceI.h10
-rw-r--r--cpp/demo/IcePack/simple/Makefile10
-rw-r--r--cpp/demo/IcePack/simple/Server.cpp10
-rw-r--r--cpp/demo/IceStorm/Makefile10
-rw-r--r--cpp/demo/IceStorm/clock/Clock.ice10
-rw-r--r--cpp/demo/IceStorm/clock/ClockI.cpp10
-rw-r--r--cpp/demo/IceStorm/clock/ClockI.h10
-rw-r--r--cpp/demo/IceStorm/clock/Makefile10
-rw-r--r--cpp/demo/IceStorm/clock/Publisher.cpp10
-rw-r--r--cpp/demo/IceStorm/clock/Subscriber.cpp10
-rw-r--r--cpp/demo/IceUtil/Makefile10
-rw-r--r--cpp/demo/IceUtil/workqueue/Makefile10
-rw-r--r--cpp/demo/IceUtil/workqueue/WorkQueue.cpp10
-rw-r--r--cpp/demo/Makefile10
-rw-r--r--cpp/doc/Makefile10
-rw-r--r--cpp/include/Freeze/Freeze.h10
-rw-r--r--cpp/include/Freeze/Index.h10
-rw-r--r--cpp/include/Freeze/Initialize.h10
-rw-r--r--cpp/include/Freeze/Makefile10
-rw-r--r--cpp/include/Freeze/Map.h10
-rw-r--r--cpp/include/Freeze/TransactionHolder.h10
-rw-r--r--cpp/include/Glacier/Glacier.h10
-rw-r--r--cpp/include/Glacier/Makefile10
-rw-r--r--cpp/include/Ice/Application.h10
-rw-r--r--cpp/include/Ice/BasicStream.h10
-rw-r--r--cpp/include/Ice/Buffer.h10
-rw-r--r--cpp/include/Ice/Config.h10
-rw-r--r--cpp/include/Ice/ConnectionF.h10
-rw-r--r--cpp/include/Ice/ConnectionFactoryF.h10
-rw-r--r--cpp/include/Ice/ConnectionMonitorF.h10
-rw-r--r--cpp/include/Ice/Direct.h10
-rw-r--r--cpp/include/Ice/DynamicLibrary.h10
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h10
-rw-r--r--cpp/include/Ice/EndpointF.h10
-rw-r--r--cpp/include/Ice/EndpointFactory.h10
-rw-r--r--cpp/include/Ice/EndpointFactoryF.h10
-rw-r--r--cpp/include/Ice/Exception.h10
-rw-r--r--cpp/include/Ice/FactoryTable.h10
-rw-r--r--cpp/include/Ice/FactoryTableDef.h10
-rw-r--r--cpp/include/Ice/Functional.h10
-rw-r--r--cpp/include/Ice/Handle.h10
-rw-r--r--cpp/include/Ice/Ice.h10
-rw-r--r--cpp/include/Ice/IdentityUtil.h10
-rw-r--r--cpp/include/Ice/Incoming.h10
-rw-r--r--cpp/include/Ice/IncomingAsync.h10
-rw-r--r--cpp/include/Ice/IncomingAsyncF.h10
-rw-r--r--cpp/include/Ice/Initialize.h10
-rw-r--r--cpp/include/Ice/InstanceF.h10
-rw-r--r--cpp/include/Ice/LocalObject.h10
-rw-r--r--cpp/include/Ice/LocalObjectF.h10
-rw-r--r--cpp/include/Ice/LoggerUtil.h10
-rw-r--r--cpp/include/Ice/Makefile10
-rw-r--r--cpp/include/Ice/Object.h10
-rw-r--r--cpp/include/Ice/ObjectAdapterFactoryF.h10
-rw-r--r--cpp/include/Ice/ObjectF.h10
-rw-r--r--cpp/include/Ice/Outgoing.h10
-rw-r--r--cpp/include/Ice/OutgoingAsync.h10
-rw-r--r--cpp/include/Ice/OutgoingAsyncF.h10
-rw-r--r--cpp/include/Ice/ProtocolPluginFacade.h10
-rw-r--r--cpp/include/Ice/ProtocolPluginFacadeF.h10
-rw-r--r--cpp/include/Ice/Proxy.h10
-rw-r--r--cpp/include/Ice/ProxyF.h10
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h10
-rw-r--r--cpp/include/Ice/ProxyHandle.h10
-rw-r--r--cpp/include/Ice/ReferenceF.h10
-rw-r--r--cpp/include/Ice/RoutingTable.h10
-rw-r--r--cpp/include/Ice/RoutingTableF.h10
-rw-r--r--cpp/include/Ice/ServantManagerF.h10
-rwxr-xr-xcpp/include/Ice/Service.h10
-rw-r--r--cpp/include/Ice/UserExceptionFactory.h10
-rw-r--r--cpp/include/Ice/UserExceptionFactoryF.h10
-rw-r--r--cpp/include/IceBox/Makefile10
-rw-r--r--cpp/include/IcePack/Makefile10
-rw-r--r--cpp/include/IcePatch/ClientUtil.h10
-rw-r--r--cpp/include/IcePatch/FileDescFactory.h10
-rw-r--r--cpp/include/IcePatch/Makefile10
-rw-r--r--cpp/include/IcePatch/Util.h10
-rw-r--r--cpp/include/IceSSL/CertificateVerifierOpenSSL.h10
-rw-r--r--cpp/include/IceSSL/Config.h10
-rw-r--r--cpp/include/IceSSL/Makefile10
-rw-r--r--cpp/include/IceSSL/RSACertificateGen.h10
-rw-r--r--cpp/include/IceSSL/RSACertificateGenF.h10
-rw-r--r--cpp/include/IceSSL/RSAKeyPair.h10
-rw-r--r--cpp/include/IceSSL/RSAKeyPairF.h10
-rw-r--r--cpp/include/IceSSL/RSAPrivateKey.h10
-rw-r--r--cpp/include/IceSSL/RSAPrivateKeyF.h10
-rw-r--r--cpp/include/IceSSL/RSAPublicKey.h10
-rw-r--r--cpp/include/IceSSL/RSAPublicKeyF.h10
-rw-r--r--cpp/include/IceStorm/Makefile10
-rw-r--r--cpp/include/IceUtil/AbstractMutex.h10
-rw-r--r--cpp/include/IceUtil/Algorithm.h10
-rw-r--r--cpp/include/IceUtil/Base64.h10
-rw-r--r--cpp/include/IceUtil/Cache.h10
-rw-r--r--cpp/include/IceUtil/Cond.h10
-rw-r--r--cpp/include/IceUtil/Config.h10
-rw-r--r--cpp/include/IceUtil/CountDownLatch.h10
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h10
-rw-r--r--cpp/include/IceUtil/Exception.h10
-rw-r--r--cpp/include/IceUtil/Functional.h10
-rw-r--r--cpp/include/IceUtil/GC.h10
-rw-r--r--cpp/include/IceUtil/GCRecMutex.h10
-rw-r--r--cpp/include/IceUtil/GCShared.h10
-rw-r--r--cpp/include/IceUtil/Handle.h10
-rw-r--r--cpp/include/IceUtil/IceUtil.h10
-rw-r--r--cpp/include/IceUtil/InputUtil.h10
-rw-r--r--cpp/include/IceUtil/Iterator.h10
-rw-r--r--cpp/include/IceUtil/Lock.h10
-rw-r--r--cpp/include/IceUtil/Makefile10
-rw-r--r--cpp/include/IceUtil/Monitor.h10
-rw-r--r--cpp/include/IceUtil/Mutex.h10
-rw-r--r--cpp/include/IceUtil/OutputUtil.h10
-rw-r--r--cpp/include/IceUtil/RWRecMutex.h10
-rw-r--r--cpp/include/IceUtil/RecMutex.h10
-rw-r--r--cpp/include/IceUtil/Shared.h10
-rw-r--r--cpp/include/IceUtil/StaticMutex.h10
-rw-r--r--cpp/include/IceUtil/StringUtil.h10
-rw-r--r--cpp/include/IceUtil/Thread.h10
-rw-r--r--cpp/include/IceUtil/ThreadException.h10
-rw-r--r--cpp/include/IceUtil/Time.h10
-rw-r--r--cpp/include/IceUtil/UUID.h10
-rw-r--r--cpp/include/IceUtil/Unicode.h10
-rw-r--r--cpp/include/IceXML/Makefile10
-rw-r--r--cpp/include/IceXML/Parser.h10
-rw-r--r--cpp/include/Makefile10
-rw-r--r--cpp/include/Slice/CPlusPlusUtil.h10
-rw-r--r--cpp/include/Slice/CsUtil.h10
-rw-r--r--cpp/include/Slice/JavaUtil.h10
-rw-r--r--cpp/include/Slice/Makefile10
-rw-r--r--cpp/include/Slice/Parser.h10
-rw-r--r--cpp/include/Slice/Preprocessor.h10
-rwxr-xr-xcpp/makedist.py10
-rwxr-xr-xcpp/slice/Freeze/Connection.ice26
-rw-r--r--cpp/slice/Freeze/ConnectionF.ice10
-rw-r--r--cpp/slice/Freeze/DB.ice10
-rw-r--r--cpp/slice/Freeze/Evictor.ice10
-rw-r--r--cpp/slice/Freeze/EvictorF.ice10
-rw-r--r--cpp/slice/Freeze/EvictorStorage.ice10
-rw-r--r--cpp/slice/Freeze/Exception.ice10
-rw-r--r--cpp/slice/Freeze/Makefile10
-rwxr-xr-xcpp/slice/Freeze/Transaction.ice26
-rw-r--r--cpp/slice/Glacier/Makefile10
-rw-r--r--cpp/slice/Glacier/Router.ice10
-rw-r--r--cpp/slice/Glacier/Session.ice10
-rw-r--r--cpp/slice/Glacier/SessionF.ice10
-rw-r--r--cpp/slice/Glacier/SessionManager.ice10
-rw-r--r--cpp/slice/Glacier/SessionManagerF.ice10
-rw-r--r--cpp/slice/Glacier/Starter.ice10
-rw-r--r--cpp/slice/Ice/BuiltinSequences.ice10
-rw-r--r--cpp/slice/Ice/Communicator.ice10
-rw-r--r--cpp/slice/Ice/CommunicatorF.ice10
-rw-r--r--cpp/slice/Ice/Current.ice10
-rw-r--r--cpp/slice/Ice/Identity.ice10
-rw-r--r--cpp/slice/Ice/LocalException.ice10
-rw-r--r--cpp/slice/Ice/Locator.ice10
-rw-r--r--cpp/slice/Ice/LocatorF.ice10
-rw-r--r--cpp/slice/Ice/Logger.ice10
-rw-r--r--cpp/slice/Ice/LoggerF.ice10
-rw-r--r--cpp/slice/Ice/Makefile10
-rw-r--r--cpp/slice/Ice/ObjectAdapter.ice10
-rw-r--r--cpp/slice/Ice/ObjectAdapterF.ice10
-rw-r--r--cpp/slice/Ice/ObjectFactory.ice10
-rw-r--r--cpp/slice/Ice/ObjectFactoryF.ice10
-rw-r--r--cpp/slice/Ice/Plugin.ice10
-rw-r--r--cpp/slice/Ice/PluginF.ice10
-rw-r--r--cpp/slice/Ice/Process.ice10
-rw-r--r--cpp/slice/Ice/ProcessF.ice10
-rw-r--r--cpp/slice/Ice/Properties.ice10
-rw-r--r--cpp/slice/Ice/PropertiesF.ice10
-rw-r--r--cpp/slice/Ice/Router.ice10
-rw-r--r--cpp/slice/Ice/RouterF.ice10
-rw-r--r--cpp/slice/Ice/ServantLocator.ice10
-rw-r--r--cpp/slice/Ice/ServantLocatorF.ice10
-rw-r--r--cpp/slice/Ice/Stats.ice10
-rw-r--r--cpp/slice/Ice/StatsF.ice10
-rw-r--r--cpp/slice/IceBox/IceBox.ice10
-rw-r--r--cpp/slice/IceBox/Makefile10
-rw-r--r--cpp/slice/IcePack/Admin.ice10
-rw-r--r--cpp/slice/IcePack/Exception.ice10
-rw-r--r--cpp/slice/IcePack/Makefile10
-rw-r--r--cpp/slice/IcePack/Query.ice10
-rw-r--r--cpp/slice/IcePatch/IcePatch.ice10
-rw-r--r--cpp/slice/IcePatch/Makefile10
-rw-r--r--cpp/slice/IceSSL/CertificateVerifier.ice10
-rw-r--r--cpp/slice/IceSSL/CertificateVerifierF.ice10
-rw-r--r--cpp/slice/IceSSL/Exception.ice10
-rw-r--r--cpp/slice/IceSSL/Makefile10
-rw-r--r--cpp/slice/IceSSL/Plugin.ice10
-rw-r--r--cpp/slice/IceSSL/PluginF.ice10
-rw-r--r--cpp/slice/IceStorm/IceStorm.ice10
-rw-r--r--cpp/slice/IceStorm/Makefile10
-rw-r--r--cpp/slice/Makefile10
-rw-r--r--cpp/src/Freeze/ConnectionI.cpp10
-rw-r--r--cpp/src/Freeze/ConnectionI.h10
-rw-r--r--cpp/src/Freeze/EvictorI.cpp10
-rw-r--r--cpp/src/Freeze/EvictorI.h10
-rw-r--r--cpp/src/Freeze/EvictorIteratorI.cpp10
-rw-r--r--cpp/src/Freeze/EvictorIteratorI.h10
-rw-r--r--cpp/src/Freeze/Index.cpp10
-rw-r--r--cpp/src/Freeze/IndexI.cpp10
-rw-r--r--cpp/src/Freeze/IndexI.h10
-rw-r--r--cpp/src/Freeze/Makefile10
-rw-r--r--cpp/src/Freeze/MapI.cpp10
-rw-r--r--cpp/src/Freeze/MapI.h10
-rw-r--r--cpp/src/Freeze/ObjectStore.cpp10
-rw-r--r--cpp/src/Freeze/ObjectStore.h10
-rw-r--r--cpp/src/Freeze/SharedDb.cpp10
-rw-r--r--cpp/src/Freeze/SharedDb.h10
-rw-r--r--cpp/src/Freeze/SharedDbEnv.cpp10
-rw-r--r--cpp/src/Freeze/SharedDbEnv.h10
-rw-r--r--cpp/src/Freeze/TransactionHolder.cpp10
-rw-r--r--cpp/src/Freeze/TransactionI.cpp10
-rw-r--r--cpp/src/Freeze/TransactionI.h10
-rw-r--r--cpp/src/Freeze/Util.cpp10
-rw-r--r--cpp/src/Freeze/Util.h10
-rw-r--r--cpp/src/FreezeScript/AssignVisitor.cpp10
-rw-r--r--cpp/src/FreezeScript/AssignVisitor.h10
-rw-r--r--cpp/src/FreezeScript/Data.cpp10
-rw-r--r--cpp/src/FreezeScript/Data.h10
-rw-r--r--cpp/src/FreezeScript/DumpDB.cpp10
-rw-r--r--cpp/src/FreezeScript/DumpDescriptors.cpp10
-rw-r--r--cpp/src/FreezeScript/DumpDescriptors.h10
-rw-r--r--cpp/src/FreezeScript/Error.cpp10
-rw-r--r--cpp/src/FreezeScript/Error.h10
-rw-r--r--cpp/src/FreezeScript/Exception.cpp10
-rw-r--r--cpp/src/FreezeScript/Exception.h10
-rw-r--r--cpp/src/FreezeScript/Functions.cpp10
-rw-r--r--cpp/src/FreezeScript/Functions.h10
-rw-r--r--cpp/src/FreezeScript/Grammar.y10
-rw-r--r--cpp/src/FreezeScript/GrammarUtil.h10
-rw-r--r--cpp/src/FreezeScript/Makefile10
-rw-r--r--cpp/src/FreezeScript/Parser.cpp10
-rw-r--r--cpp/src/FreezeScript/Parser.h10
-rw-r--r--cpp/src/FreezeScript/Print.cpp10
-rw-r--r--cpp/src/FreezeScript/Print.h10
-rw-r--r--cpp/src/FreezeScript/Scanner.l10
-rw-r--r--cpp/src/FreezeScript/TransformAnalyzer.cpp10
-rw-r--r--cpp/src/FreezeScript/TransformAnalyzer.h10
-rw-r--r--cpp/src/FreezeScript/TransformVisitor.cpp10
-rw-r--r--cpp/src/FreezeScript/TransformVisitor.h10
-rw-r--r--cpp/src/FreezeScript/Transformer.cpp10
-rw-r--r--cpp/src/FreezeScript/Transformer.h10
-rw-r--r--cpp/src/FreezeScript/Util.cpp10
-rw-r--r--cpp/src/FreezeScript/Util.h10
-rw-r--r--cpp/src/FreezeScript/transformdb.cpp10
-rw-r--r--cpp/src/Glacier/Blobject.cpp10
-rw-r--r--cpp/src/Glacier/Blobject.h10
-rw-r--r--cpp/src/Glacier/ClientBlobject.cpp10
-rw-r--r--cpp/src/Glacier/ClientBlobject.h10
-rw-r--r--cpp/src/Glacier/GlacierRouter.cpp10
-rw-r--r--cpp/src/Glacier/GlacierStarter.cpp10
-rw-r--r--cpp/src/Glacier/Makefile10
-rw-r--r--cpp/src/Glacier/Request.cpp10
-rw-r--r--cpp/src/Glacier/Request.h10
-rw-r--r--cpp/src/Glacier/RouterI.cpp10
-rw-r--r--cpp/src/Glacier/RouterI.h10
-rw-r--r--cpp/src/Glacier/ServerBlobject.cpp10
-rw-r--r--cpp/src/Glacier/ServerBlobject.h10
-rw-r--r--cpp/src/Glacier/StarterI.cpp10
-rw-r--r--cpp/src/Glacier/StarterI.h10
-rw-r--r--cpp/src/Ice/Acceptor.cpp10
-rw-r--r--cpp/src/Ice/Acceptor.h10
-rw-r--r--cpp/src/Ice/AcceptorF.h10
-rw-r--r--cpp/src/Ice/Application.cpp10
-rw-r--r--cpp/src/Ice/BasicStream.cpp10
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp10
-rw-r--r--cpp/src/Ice/CommunicatorI.h10
-rw-r--r--cpp/src/Ice/Connection.cpp10
-rw-r--r--cpp/src/Ice/Connection.h10
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp10
-rw-r--r--cpp/src/Ice/ConnectionFactory.h10
-rw-r--r--cpp/src/Ice/ConnectionMonitor.cpp10
-rw-r--r--cpp/src/Ice/ConnectionMonitor.h10
-rw-r--r--cpp/src/Ice/Connector.cpp10
-rw-r--r--cpp/src/Ice/Connector.h10
-rw-r--r--cpp/src/Ice/ConnectorF.h10
-rwxr-xr-xcpp/src/Ice/DLLMain.cpp10
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp10
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h10
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h10
-rw-r--r--cpp/src/Ice/Direct.cpp10
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp10
-rw-r--r--cpp/src/Ice/Endpoint.cpp10
-rw-r--r--cpp/src/Ice/Endpoint.h10
-rw-r--r--cpp/src/Ice/EndpointFactory.cpp10
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp10
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.h10
-rw-r--r--cpp/src/Ice/EndpointFactoryManagerF.h10
-rw-r--r--cpp/src/Ice/EventHandler.cpp10
-rw-r--r--cpp/src/Ice/EventHandler.h10
-rw-r--r--cpp/src/Ice/EventHandlerF.h10
-rwxr-xr-xcpp/src/Ice/EventLoggerI.cpp10
-rwxr-xr-xcpp/src/Ice/EventLoggerI.h10
-rwxr-xr-xcpp/src/Ice/EventLoggerMsg.mc10
-rw-r--r--cpp/src/Ice/Exception.cpp10
-rw-r--r--cpp/src/Ice/FactoryTable.cpp10
-rw-r--r--cpp/src/Ice/FactoryTableDef.cpp10
-rw-r--r--cpp/src/Ice/IdentityUtil.cpp10
-rw-r--r--cpp/src/Ice/Incoming.cpp10
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp10
-rw-r--r--cpp/src/Ice/Initialize.cpp10
-rw-r--r--cpp/src/Ice/Instance.cpp10
-rw-r--r--cpp/src/Ice/Instance.h10
-rw-r--r--cpp/src/Ice/LocalObject.cpp10
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp10
-rw-r--r--cpp/src/Ice/LocatorInfo.h10
-rw-r--r--cpp/src/Ice/LocatorInfoF.h10
-rw-r--r--cpp/src/Ice/LoggerI.cpp10
-rw-r--r--cpp/src/Ice/LoggerI.h10
-rw-r--r--cpp/src/Ice/LoggerUtil.cpp10
-rw-r--r--cpp/src/Ice/Makefile12
-rw-r--r--cpp/src/Ice/Network.cpp10
-rw-r--r--cpp/src/Ice/Network.h10
-rw-r--r--cpp/src/Ice/Object.cpp10
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp10
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.h10
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp10
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h10
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.cpp10
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.h10
-rw-r--r--cpp/src/Ice/ObjectFactoryManagerF.h10
-rw-r--r--cpp/src/Ice/Outgoing.cpp10
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp10
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp10
-rw-r--r--cpp/src/Ice/PluginManagerI.h10
-rw-r--r--cpp/src/Ice/PropertiesI.cpp10
-rw-r--r--cpp/src/Ice/PropertiesI.h10
-rw-r--r--cpp/src/Ice/Protocol.h10
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp10
-rw-r--r--cpp/src/Ice/Proxy.cpp10
-rw-r--r--cpp/src/Ice/ProxyFactory.cpp10
-rw-r--r--cpp/src/Ice/ProxyFactory.h10
-rw-r--r--cpp/src/Ice/Reference.cpp10
-rw-r--r--cpp/src/Ice/Reference.h10
-rw-r--r--cpp/src/Ice/ReferenceFactory.cpp10
-rw-r--r--cpp/src/Ice/ReferenceFactory.h10
-rw-r--r--cpp/src/Ice/ReferenceFactoryF.h10
-rw-r--r--cpp/src/Ice/RouterInfo.cpp10
-rw-r--r--cpp/src/Ice/RouterInfo.h10
-rw-r--r--cpp/src/Ice/RouterInfoF.h10
-rw-r--r--cpp/src/Ice/RoutingTable.cpp10
-rw-r--r--cpp/src/Ice/ServantManager.cpp10
-rw-r--r--cpp/src/Ice/ServantManager.h10
-rwxr-xr-xcpp/src/Ice/Service.cpp10
-rw-r--r--cpp/src/Ice/StringUtil.cpp10
-rw-r--r--cpp/src/Ice/StringUtil.h10
-rw-r--r--cpp/src/Ice/SysLoggerI.cpp10
-rw-r--r--cpp/src/Ice/SysLoggerI.h10
-rw-r--r--cpp/src/Ice/TcpAcceptor.cpp10
-rw-r--r--cpp/src/Ice/TcpAcceptor.h10
-rw-r--r--cpp/src/Ice/TcpConnector.cpp10
-rw-r--r--cpp/src/Ice/TcpConnector.h10
-rw-r--r--cpp/src/Ice/TcpEndpoint.cpp10
-rw-r--r--cpp/src/Ice/TcpEndpoint.h10
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp10
-rw-r--r--cpp/src/Ice/TcpTransceiver.h10
-rw-r--r--cpp/src/Ice/ThreadPool.cpp10
-rw-r--r--cpp/src/Ice/ThreadPool.h10
-rw-r--r--cpp/src/Ice/ThreadPoolF.h10
-rw-r--r--cpp/src/Ice/TraceLevels.cpp10
-rw-r--r--cpp/src/Ice/TraceLevels.h10
-rw-r--r--cpp/src/Ice/TraceLevelsF.h10
-rw-r--r--cpp/src/Ice/TraceUtil.cpp10
-rw-r--r--cpp/src/Ice/TraceUtil.h10
-rw-r--r--cpp/src/Ice/Transceiver.cpp10
-rw-r--r--cpp/src/Ice/Transceiver.h10
-rw-r--r--cpp/src/Ice/TransceiverF.h10
-rw-r--r--cpp/src/Ice/UdpEndpoint.cpp10
-rw-r--r--cpp/src/Ice/UdpEndpoint.h10
-rw-r--r--cpp/src/Ice/UdpTransceiver.cpp10
-rw-r--r--cpp/src/Ice/UdpTransceiver.h10
-rw-r--r--cpp/src/Ice/UnknownEndpoint.cpp10
-rw-r--r--cpp/src/Ice/UnknownEndpoint.h10
-rw-r--r--cpp/src/IceBox/Admin.cpp10
-rw-r--r--cpp/src/IceBox/Exception.cpp10
-rw-r--r--cpp/src/IceBox/Makefile12
-rw-r--r--cpp/src/IceBox/Server.cpp10
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp10
-rw-r--r--cpp/src/IceBox/ServiceManagerI.h10
-rw-r--r--cpp/src/IcePack/Activator.ice10
-rw-r--r--cpp/src/IcePack/ActivatorI.cpp10
-rw-r--r--cpp/src/IcePack/ActivatorI.h10
-rw-r--r--cpp/src/IcePack/AdapterFactory.cpp10
-rw-r--r--cpp/src/IcePack/AdapterFactory.h10
-rw-r--r--cpp/src/IcePack/AdapterI.cpp10
-rw-r--r--cpp/src/IcePack/AdapterI.h10
-rw-r--r--cpp/src/IcePack/AdapterRegistryI.cpp10
-rw-r--r--cpp/src/IcePack/AdapterRegistryI.h10
-rw-r--r--cpp/src/IcePack/AdminI.cpp10
-rw-r--r--cpp/src/IcePack/AdminI.h10
-rw-r--r--cpp/src/IcePack/ApplicationBuilder.cpp10
-rw-r--r--cpp/src/IcePack/ApplicationBuilder.h10
-rw-r--r--cpp/src/IcePack/Client.cpp10
-rw-r--r--cpp/src/IcePack/ComponentBuilder.cpp10
-rw-r--r--cpp/src/IcePack/ComponentBuilder.h10
-rw-r--r--cpp/src/IcePack/GPL.h10
-rw-r--r--cpp/src/IcePack/Grammar.y10
-rw-r--r--cpp/src/IcePack/IcePackNode.cpp10
-rw-r--r--cpp/src/IcePack/IcePackRegistry.cpp10
-rw-r--r--cpp/src/IcePack/Internal.ice10
-rw-r--r--cpp/src/IcePack/LocatorI.cpp10
-rw-r--r--cpp/src/IcePack/LocatorI.h10
-rw-r--r--cpp/src/IcePack/LocatorRegistryI.cpp10
-rw-r--r--cpp/src/IcePack/LocatorRegistryI.h10
-rw-r--r--cpp/src/IcePack/Makefile10
-rw-r--r--cpp/src/IcePack/NodeI.cpp10
-rw-r--r--cpp/src/IcePack/NodeI.h10
-rw-r--r--cpp/src/IcePack/NodeInfo.cpp10
-rw-r--r--cpp/src/IcePack/NodeInfo.h10
-rw-r--r--cpp/src/IcePack/NodeRegistryI.cpp10
-rw-r--r--cpp/src/IcePack/NodeRegistryI.h10
-rw-r--r--cpp/src/IcePack/ObjectRegistryI.cpp10
-rw-r--r--cpp/src/IcePack/ObjectRegistryI.h10
-rw-r--r--cpp/src/IcePack/Parser.cpp10
-rw-r--r--cpp/src/IcePack/Parser.h10
-rw-r--r--cpp/src/IcePack/QueryI.cpp10
-rw-r--r--cpp/src/IcePack/QueryI.h10
-rw-r--r--cpp/src/IcePack/Registry.cpp10
-rw-r--r--cpp/src/IcePack/Registry.h10
-rw-r--r--cpp/src/IcePack/Scanner.l10
-rw-r--r--cpp/src/IcePack/ServerAdapterI.cpp10
-rw-r--r--cpp/src/IcePack/ServerAdapterI.h10
-rw-r--r--cpp/src/IcePack/ServerBuilder.cpp10
-rw-r--r--cpp/src/IcePack/ServerBuilder.h10
-rw-r--r--cpp/src/IcePack/ServerDeployerI.cpp10
-rw-r--r--cpp/src/IcePack/ServerDeployerI.h10
-rw-r--r--cpp/src/IcePack/ServerFactory.cpp10
-rw-r--r--cpp/src/IcePack/ServerFactory.h10
-rw-r--r--cpp/src/IcePack/ServerI.cpp10
-rw-r--r--cpp/src/IcePack/ServerI.h10
-rw-r--r--cpp/src/IcePack/ServerRegistryI.cpp10
-rw-r--r--cpp/src/IcePack/ServerRegistryI.h10
-rw-r--r--cpp/src/IcePack/ServiceBuilder.cpp10
-rw-r--r--cpp/src/IcePack/ServiceBuilder.h10
-rw-r--r--cpp/src/IcePack/TraceLevels.cpp10
-rw-r--r--cpp/src/IcePack/TraceLevels.h10
-rw-r--r--cpp/src/IcePack/WaitQueue.cpp10
-rw-r--r--cpp/src/IcePack/WaitQueue.h10
-rw-r--r--cpp/src/IcePatch/Calc.cpp10
-rw-r--r--cpp/src/IcePatch/Client.cpp10
-rw-r--r--cpp/src/IcePatch/ClientUtil.cpp10
-rw-r--r--cpp/src/IcePatch/FileDescFactory.cpp10
-rw-r--r--cpp/src/IcePatch/FileLocator.cpp10
-rw-r--r--cpp/src/IcePatch/FileLocator.h10
-rw-r--r--cpp/src/IcePatch/IcePatchI.cpp10
-rw-r--r--cpp/src/IcePatch/IcePatchI.h10
-rw-r--r--cpp/src/IcePatch/Makefile12
-rw-r--r--cpp/src/IcePatch/Server.cpp10
-rw-r--r--cpp/src/IcePatch/Util.cpp10
-rw-r--r--cpp/src/IceSSL/BaseCerts.cpp10
-rw-r--r--cpp/src/IceSSL/BaseCerts.h10
-rw-r--r--cpp/src/IceSSL/CertificateAuthority.cpp10
-rw-r--r--cpp/src/IceSSL/CertificateAuthority.h10
-rw-r--r--cpp/src/IceSSL/CertificateDesc.cpp10
-rw-r--r--cpp/src/IceSSL/CertificateDesc.h10
-rw-r--r--cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp10
-rw-r--r--cpp/src/IceSSL/ClientContext.cpp10
-rw-r--r--cpp/src/IceSSL/ClientContext.h10
-rw-r--r--cpp/src/IceSSL/ConfigParser.cpp10
-rw-r--r--cpp/src/IceSSL/ConfigParser.h10
-rw-r--r--cpp/src/IceSSL/Context.cpp10
-rw-r--r--cpp/src/IceSSL/Context.h10
-rw-r--r--cpp/src/IceSSL/ContextF.h10
-rw-r--r--cpp/src/IceSSL/Convert.cpp10
-rw-r--r--cpp/src/IceSSL/Convert.h10
-rw-r--r--cpp/src/IceSSL/DHParams.cpp10
-rw-r--r--cpp/src/IceSSL/DHParams.h10
-rw-r--r--cpp/src/IceSSL/DHParamsF.h10
-rw-r--r--cpp/src/IceSSL/DefaultCertificateVerifier.cpp10
-rw-r--r--cpp/src/IceSSL/DefaultCertificateVerifier.h10
-rw-r--r--cpp/src/IceSSL/GeneralConfig.cpp10
-rw-r--r--cpp/src/IceSSL/GeneralConfig.h10
-rw-r--r--cpp/src/IceSSL/Makefile12
-rw-r--r--cpp/src/IceSSL/OpenSSL.h10
-rw-r--r--cpp/src/IceSSL/OpenSSLJanitors.cpp10
-rw-r--r--cpp/src/IceSSL/OpenSSLJanitors.h10
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp10
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.h10
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginIF.h10
-rw-r--r--cpp/src/IceSSL/OpenSSLUtils.cpp10
-rw-r--r--cpp/src/IceSSL/OpenSSLUtils.h10
-rw-r--r--cpp/src/IceSSL/RSACertificateGen.cpp10
-rw-r--r--cpp/src/IceSSL/RSAKeyPair.cpp10
-rw-r--r--cpp/src/IceSSL/RSAPrivateKey.cpp10
-rw-r--r--cpp/src/IceSSL/RSAPublicKey.cpp10
-rw-r--r--cpp/src/IceSSL/ServerContext.cpp10
-rw-r--r--cpp/src/IceSSL/ServerContext.h10
-rw-r--r--cpp/src/IceSSL/SingleCertificateVerifier.cpp10
-rw-r--r--cpp/src/IceSSL/SingleCertificateVerifier.h10
-rw-r--r--cpp/src/IceSSL/SslAcceptor.cpp10
-rw-r--r--cpp/src/IceSSL/SslAcceptor.h10
-rw-r--r--cpp/src/IceSSL/SslClientTransceiver.cpp10
-rw-r--r--cpp/src/IceSSL/SslClientTransceiver.h10
-rw-r--r--cpp/src/IceSSL/SslConnector.cpp10
-rw-r--r--cpp/src/IceSSL/SslConnector.h10
-rw-r--r--cpp/src/IceSSL/SslEndpoint.cpp10
-rw-r--r--cpp/src/IceSSL/SslEndpoint.h10
-rw-r--r--cpp/src/IceSSL/SslException.cpp10
-rw-r--r--cpp/src/IceSSL/SslServerTransceiver.cpp10
-rw-r--r--cpp/src/IceSSL/SslServerTransceiver.h10
-rw-r--r--cpp/src/IceSSL/SslTransceiver.cpp10
-rw-r--r--cpp/src/IceSSL/SslTransceiver.h10
-rw-r--r--cpp/src/IceSSL/SslTransceiverF.h10
-rw-r--r--cpp/src/IceSSL/TempCerts.cpp10
-rw-r--r--cpp/src/IceSSL/TempCerts.h10
-rw-r--r--cpp/src/IceSSL/TraceLevels.cpp10
-rw-r--r--cpp/src/IceSSL/TraceLevels.h10
-rw-r--r--cpp/src/IceSSL/TraceLevelsF.h10
-rw-r--r--cpp/src/IceStorm/Admin.cpp10
-rw-r--r--cpp/src/IceStorm/Event.h10
-rw-r--r--cpp/src/IceStorm/Flushable.h10
-rw-r--r--cpp/src/IceStorm/Flusher.cpp10
-rw-r--r--cpp/src/IceStorm/Flusher.h10
-rw-r--r--cpp/src/IceStorm/GPL.h10
-rw-r--r--cpp/src/IceStorm/Grammar.y10
-rw-r--r--cpp/src/IceStorm/IceStormInternal.ice10
-rw-r--r--cpp/src/IceStorm/LinkProxy.cpp10
-rw-r--r--cpp/src/IceStorm/LinkProxy.h10
-rw-r--r--cpp/src/IceStorm/LinkRecord.ice10
-rw-r--r--cpp/src/IceStorm/LinkSubscriber.cpp10
-rw-r--r--cpp/src/IceStorm/LinkSubscriber.h10
-rw-r--r--cpp/src/IceStorm/Makefile12
-rw-r--r--cpp/src/IceStorm/OnewayBatchSubscriber.cpp10
-rw-r--r--cpp/src/IceStorm/OnewayBatchSubscriber.h10
-rw-r--r--cpp/src/IceStorm/OnewayProxy.cpp10
-rw-r--r--cpp/src/IceStorm/OnewayProxy.h10
-rw-r--r--cpp/src/IceStorm/OnewaySubscriber.cpp10
-rw-r--r--cpp/src/IceStorm/OnewaySubscriber.h10
-rw-r--r--cpp/src/IceStorm/Parser.cpp10
-rw-r--r--cpp/src/IceStorm/Parser.h10
-rw-r--r--cpp/src/IceStorm/QueuedProxy.cpp10
-rw-r--r--cpp/src/IceStorm/QueuedProxy.h10
-rw-r--r--cpp/src/IceStorm/Scanner.l10
-rw-r--r--cpp/src/IceStorm/Service.cpp10
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp10
-rw-r--r--cpp/src/IceStorm/Subscriber.h10
-rw-r--r--cpp/src/IceStorm/SubscriberFactory.cpp10
-rw-r--r--cpp/src/IceStorm/SubscriberFactory.h10
-rw-r--r--cpp/src/IceStorm/TopicI.cpp10
-rw-r--r--cpp/src/IceStorm/TopicI.h10
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp10
-rw-r--r--cpp/src/IceStorm/TopicManagerI.h10
-rw-r--r--cpp/src/IceStorm/TraceLevels.cpp10
-rw-r--r--cpp/src/IceStorm/TraceLevels.h10
-rw-r--r--cpp/src/IceStorm/WeightedGraph.cpp10
-rw-r--r--cpp/src/IceStorm/WeightedGraph.h10
-rw-r--r--cpp/src/IceUtil/Base64.cpp10
-rw-r--r--cpp/src/IceUtil/Cond.cpp10
-rw-r--r--cpp/src/IceUtil/CountDownLatch.cpp10
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp10
-rw-r--r--cpp/src/IceUtil/Exception.cpp10
-rw-r--r--cpp/src/IceUtil/GC.cpp10
-rw-r--r--cpp/src/IceUtil/GCRecMutex.cpp10
-rw-r--r--cpp/src/IceUtil/GCShared.cpp10
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp10
-rw-r--r--cpp/src/IceUtil/Makefile13
-rw-r--r--cpp/src/IceUtil/OutputUtil.cpp10
-rw-r--r--cpp/src/IceUtil/RWRecMutex.cpp10
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp10
-rw-r--r--cpp/src/IceUtil/StaticMutex.cpp10
-rw-r--r--cpp/src/IceUtil/StringUtil.cpp10
-rw-r--r--cpp/src/IceUtil/Thread.cpp10
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp10
-rw-r--r--cpp/src/IceUtil/Time.cpp10
-rw-r--r--cpp/src/IceUtil/UUID.cpp10
-rw-r--r--cpp/src/IceUtil/Unicode.cpp10
-rw-r--r--cpp/src/IceXML/Makefile12
-rw-r--r--cpp/src/IceXML/Parser.cpp10
-rw-r--r--cpp/src/Makefile10
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp10
-rwxr-xr-xcpp/src/Slice/CsUtil.cpp10
-rw-r--r--cpp/src/Slice/Grammar.y10
-rw-r--r--cpp/src/Slice/GrammarUtil.h10
-rw-r--r--cpp/src/Slice/JavaUtil.cpp10
-rw-r--r--cpp/src/Slice/Makefile10
-rw-r--r--cpp/src/Slice/Parser.cpp10
-rw-r--r--cpp/src/Slice/Preprocessor.cpp10
-rw-r--r--cpp/src/Slice/Scanner.l10
-rw-r--r--cpp/src/icecpp/Makefile10
-rw-r--r--cpp/src/icecpp/config.h10
-rw-r--r--cpp/src/slice2cpp/Gen.cpp12
-rw-r--r--cpp/src/slice2cpp/Gen.h10
-rw-r--r--cpp/src/slice2cpp/Main.cpp10
-rw-r--r--cpp/src/slice2cpp/Makefile10
-rwxr-xr-xcpp/src/slice2cs/Gen.cpp10
-rw-r--r--cpp/src/slice2cs/Gen.h10
-rw-r--r--cpp/src/slice2cs/Main.cpp10
-rw-r--r--cpp/src/slice2cs/Makefile10
-rw-r--r--cpp/src/slice2docbook/Gen.cpp10
-rw-r--r--cpp/src/slice2docbook/Gen.h10
-rw-r--r--cpp/src/slice2docbook/Main.cpp10
-rw-r--r--cpp/src/slice2docbook/Makefile10
-rw-r--r--cpp/src/slice2freeze/Main.cpp10
-rw-r--r--cpp/src/slice2freeze/Makefile10
-rw-r--r--cpp/src/slice2freezej/Main.cpp10
-rw-r--r--cpp/src/slice2freezej/Makefile10
-rw-r--r--cpp/src/slice2java/Gen.cpp10
-rw-r--r--cpp/src/slice2java/Gen.h10
-rw-r--r--cpp/src/slice2java/Main.cpp10
-rw-r--r--cpp/src/slice2java/Makefile10
-rw-r--r--cpp/test/Freeze/Makefile10
-rw-r--r--cpp/test/Freeze/complex/Client.cpp10
-rw-r--r--cpp/test/Freeze/complex/Complex.ice10
-rw-r--r--cpp/test/Freeze/complex/Grammar.y10
-rw-r--r--cpp/test/Freeze/complex/Makefile10
-rw-r--r--cpp/test/Freeze/complex/NodeI.h10
-rw-r--r--cpp/test/Freeze/complex/Parser.cpp10
-rw-r--r--cpp/test/Freeze/complex/Parser.h10
-rw-r--r--cpp/test/Freeze/complex/Scanner.l10
-rwxr-xr-xcpp/test/Freeze/complex/run.py10
-rw-r--r--cpp/test/Freeze/dbmap/Client.cpp10
-rw-r--r--cpp/test/Freeze/dbmap/Makefile10
-rwxr-xr-xcpp/test/Freeze/dbmap/run.py10
-rw-r--r--cpp/test/Freeze/evictor/Client.cpp10
-rw-r--r--cpp/test/Freeze/evictor/Makefile10
-rw-r--r--cpp/test/Freeze/evictor/Server.cpp10
-rw-r--r--cpp/test/Freeze/evictor/Test.ice10
-rw-r--r--cpp/test/Freeze/evictor/TestI.cpp10
-rw-r--r--cpp/test/Freeze/evictor/TestI.h10
-rwxr-xr-xcpp/test/Freeze/evictor/run.py10
-rw-r--r--cpp/test/FreezeScript/Makefile10
-rw-r--r--cpp/test/FreezeScript/dbmap/Makefile10
-rw-r--r--cpp/test/FreezeScript/dbmap/makedb.cpp10
-rwxr-xr-xcpp/test/FreezeScript/dbmap/run.py10
-rw-r--r--cpp/test/FreezeScript/evictor/Makefile10
-rw-r--r--cpp/test/FreezeScript/evictor/makedb.cpp10
-rwxr-xr-xcpp/test/FreezeScript/evictor/run.py10
-rw-r--r--cpp/test/Glacier/Makefile10
-rw-r--r--cpp/test/Glacier/starter/Callback.ice10
-rw-r--r--cpp/test/Glacier/starter/CallbackI.cpp10
-rw-r--r--cpp/test/Glacier/starter/CallbackI.h10
-rw-r--r--cpp/test/Glacier/starter/Client.cpp10
-rw-r--r--cpp/test/Glacier/starter/Makefile10
-rw-r--r--cpp/test/Glacier/starter/Server.cpp10
-rwxr-xr-xcpp/test/Glacier/starter/run.py10
-rw-r--r--cpp/test/Ice/Makefile10
-rw-r--r--cpp/test/Ice/adapterDeactivation/AllTests.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Client.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Collocated.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Makefile10
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.h10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Server.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Test.ice10
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.h10
-rwxr-xr-xcpp/test/Ice/adapterDeactivation/run.py10
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Client.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Collocated.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Makefile10
-rw-r--r--cpp/test/Ice/exceptions/Server.cpp10
-rw-r--r--cpp/test/Ice/exceptions/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Test.ice10
-rw-r--r--cpp/test/Ice/exceptions/TestAMD.ice10
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.h10
-rw-r--r--cpp/test/Ice/exceptions/TestI.cpp10
-rw-r--r--cpp/test/Ice/exceptions/TestI.h10
-rwxr-xr-xcpp/test/Ice/exceptions/run.py10
-rw-r--r--cpp/test/Ice/facets/AllTests.cpp10
-rw-r--r--cpp/test/Ice/facets/Client.cpp10
-rw-r--r--cpp/test/Ice/facets/Collocated.cpp10
-rw-r--r--cpp/test/Ice/facets/Makefile10
-rw-r--r--cpp/test/Ice/facets/Server.cpp10
-rw-r--r--cpp/test/Ice/facets/Test.ice10
-rw-r--r--cpp/test/Ice/facets/TestI.cpp10
-rw-r--r--cpp/test/Ice/facets/TestI.h10
-rwxr-xr-xcpp/test/Ice/facets/run.py10
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/Client.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/Makefile10
-rw-r--r--cpp/test/Ice/faultTolerance/Server.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/Test.ice10
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.h10
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py10
-rw-r--r--cpp/test/Ice/gc/Client.cpp10
-rw-r--r--cpp/test/Ice/gc/Makefile10
-rw-r--r--cpp/test/Ice/gc/Test.ice10
-rwxr-xr-xcpp/test/Ice/gc/run.py10
-rw-r--r--cpp/test/Ice/inheritance/AllTests.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Client.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Collocated.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Makefile10
-rw-r--r--cpp/test/Ice/inheritance/Server.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Test.ice10
-rw-r--r--cpp/test/Ice/inheritance/TestI.cpp10
-rw-r--r--cpp/test/Ice/inheritance/TestI.h10
-rwxr-xr-xcpp/test/Ice/inheritance/run.py10
-rw-r--r--cpp/test/Ice/location/AllTests.cpp10
-rw-r--r--cpp/test/Ice/location/Client.cpp10
-rw-r--r--cpp/test/Ice/location/Collocated.cpp10
-rw-r--r--cpp/test/Ice/location/Makefile10
-rw-r--r--cpp/test/Ice/location/Server.cpp10
-rw-r--r--cpp/test/Ice/location/ServerLocator.cpp10
-rw-r--r--cpp/test/Ice/location/ServerLocator.h10
-rw-r--r--cpp/test/Ice/location/Test.ice10
-rw-r--r--cpp/test/Ice/location/TestI.cpp10
-rw-r--r--cpp/test/Ice/location/TestI.h10
-rwxr-xr-xcpp/test/Ice/location/run.py10
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp10
-rw-r--r--cpp/test/Ice/objects/Client.cpp10
-rw-r--r--cpp/test/Ice/objects/Collocated.cpp10
-rw-r--r--cpp/test/Ice/objects/Makefile10
-rw-r--r--cpp/test/Ice/objects/Server.cpp10
-rw-r--r--cpp/test/Ice/objects/Test.ice10
-rw-r--r--cpp/test/Ice/objects/TestI.cpp10
-rw-r--r--cpp/test/Ice/objects/TestI.h10
-rwxr-xr-xcpp/test/Ice/objects/run.py10
-rw-r--r--cpp/test/Ice/operations/AllTests.cpp10
-rw-r--r--cpp/test/Ice/operations/Client.cpp10
-rw-r--r--cpp/test/Ice/operations/Collocated.cpp10
-rw-r--r--cpp/test/Ice/operations/Makefile10
-rw-r--r--cpp/test/Ice/operations/Server.cpp10
-rw-r--r--cpp/test/Ice/operations/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/operations/Test.ice10
-rw-r--r--cpp/test/Ice/operations/TestAMD.ice10
-rw-r--r--cpp/test/Ice/operations/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/operations/TestAMDI.h10
-rw-r--r--cpp/test/Ice/operations/TestI.cpp10
-rw-r--r--cpp/test/Ice/operations/TestI.h10
-rw-r--r--cpp/test/Ice/operations/Twoways.cpp10
-rw-r--r--cpp/test/Ice/operations/TwowaysAMI.cpp10
-rwxr-xr-xcpp/test/Ice/operations/run.py10
-rw-r--r--cpp/test/Ice/slicing/Makefile10
-rw-r--r--cpp/test/Ice/slicing/exceptions/AllTests.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Client.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Makefile10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Server.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivate.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Test.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.h10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.h10
-rwxr-xr-xcpp/test/Ice/slicing/exceptions/run.py10
-rw-r--r--cpp/test/Ice/slicing/objects/AllTests.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/Client.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/ClientPrivate.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/Forward.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/Makefile10
-rw-r--r--cpp/test/Ice/slicing/objects/Server.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivate.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/Test.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.h10
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.h10
-rwxr-xr-xcpp/test/Ice/slicing/objects/run.py10
-rw-r--r--cpp/test/IcePack/Makefile10
-rw-r--r--cpp/test/IcePack/deployer/AllTests.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Client.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Makefile10
-rw-r--r--cpp/test/IcePack/deployer/Server.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Service.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Test.ice10
-rw-r--r--cpp/test/IcePack/deployer/TestI.cpp10
-rw-r--r--cpp/test/IcePack/deployer/TestI.h10
-rwxr-xr-xcpp/test/IcePack/deployer/run.py10
-rw-r--r--cpp/test/IcePack/simple/AllTests.cpp10
-rw-r--r--cpp/test/IcePack/simple/Client.cpp10
-rw-r--r--cpp/test/IcePack/simple/Makefile10
-rw-r--r--cpp/test/IcePack/simple/Server.cpp10
-rw-r--r--cpp/test/IcePack/simple/Test.ice10
-rw-r--r--cpp/test/IcePack/simple/TestI.cpp10
-rw-r--r--cpp/test/IcePack/simple/TestI.h10
-rwxr-xr-xcpp/test/IcePack/simple/run.py10
-rw-r--r--cpp/test/IceSSL/Makefile10
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp10
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/Makefile10
-rwxr-xr-xcpp/test/IceSSL/certificateAndKeyParsing/run.py10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Client.cpp10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Makefile10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Pinger.ice10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Server.cpp10
-rwxr-xr-xcpp/test/IceSSL/certificateVerification/run.py10
-rw-r--r--cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp10
-rw-r--r--cpp/test/IceSSL/certificateVerifier/Makefile10
-rwxr-xr-xcpp/test/IceSSL/certificateVerifier/run.py10
-rw-r--r--cpp/test/IceSSL/configuration/Configuration.cpp10
-rw-r--r--cpp/test/IceSSL/configuration/Makefile10
-rwxr-xr-xcpp/test/IceSSL/configuration/run.py10
-rw-r--r--cpp/test/IceSSL/loadPEM/LoadPEM.cpp10
-rw-r--r--cpp/test/IceSSL/loadPEM/Makefile10
-rwxr-xr-xcpp/test/IceSSL/loadPEM/run.py10
-rw-r--r--cpp/test/IceStorm/Makefile10
-rw-r--r--cpp/test/IceStorm/federation/Event.ice10
-rw-r--r--cpp/test/IceStorm/federation/Makefile10
-rw-r--r--cpp/test/IceStorm/federation/Publisher.cpp10
-rw-r--r--cpp/test/IceStorm/federation/Subscriber.cpp10
-rwxr-xr-xcpp/test/IceStorm/federation/run.py10
-rwxr-xr-xcpp/test/IceStorm/federation2/run.py10
-rw-r--r--cpp/test/IceStorm/single/Makefile10
-rw-r--r--cpp/test/IceStorm/single/Publisher.cpp10
-rw-r--r--cpp/test/IceStorm/single/Single.ice10
-rw-r--r--cpp/test/IceStorm/single/Subscriber.cpp10
-rwxr-xr-xcpp/test/IceStorm/single/run.py10
-rw-r--r--cpp/test/IceUtil/Makefile10
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Client.cpp10
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Makefile10
-rw-r--r--cpp/test/IceUtil/inputUtil/Client.cpp10
-rw-r--r--cpp/test/IceUtil/inputUtil/Makefile10
-rwxr-xr-xcpp/test/IceUtil/inputUtil/run.py10
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.h10
-rw-r--r--cpp/test/IceUtil/thread/Client.cpp10
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.h10
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.h10
-rw-r--r--cpp/test/IceUtil/thread/Makefile10
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/RWRecMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/RWRecMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/StartTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/StartTest.h10
-rw-r--r--cpp/test/IceUtil/thread/StaticMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/StaticMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/TestBase.cpp10
-rw-r--r--cpp/test/IceUtil/thread/TestBase.h10
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.cpp10
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.h10
-rwxr-xr-xcpp/test/IceUtil/thread/run.py10
-rw-r--r--cpp/test/IceUtil/unicode/Client.cpp10
-rw-r--r--cpp/test/IceUtil/unicode/Makefile10
-rwxr-xr-xcpp/test/IceUtil/unicode/run.py10
-rw-r--r--cpp/test/IceUtil/uuid/Client.cpp10
-rw-r--r--cpp/test/IceUtil/uuid/Makefile10
-rwxr-xr-xcpp/test/IceUtil/uuid/run.py10
-rw-r--r--cpp/test/Makefile10
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.ice10
-rw-r--r--cpp/test/Slice/errorDetection/CaseSensitive.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ClassRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DataMemberRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DeclaratorMissing.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DictionaryRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateParameter.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateThrows.ice10
-rw-r--r--cpp/test/Slice/errorDetection/EnumEmpty.ice10
-rw-r--r--cpp/test/Slice/errorDetection/EnumRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDeclaration.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice10
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceMismatch.ice10
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/LocalMismatch.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NotClassOrInterface.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NotException.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NotType.ice10
-rw-r--r--cpp/test/Slice/errorDetection/OperationRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsClass.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsModule.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice10
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.ice10
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.ice10
-rw-r--r--cpp/test/Slice/errorDetection/SequenceRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.ice10
-rw-r--r--cpp/test/Slice/errorDetection/Undefined.ice10
-rw-r--r--cpp/test/Slice/errorDetection/WrongProxyType.ice10
-rw-r--r--cpp/test/Slice/errorDetection/include/IcePrefix.ice10
-rwxr-xr-xcpp/test/Slice/errorDetection/run.py10
-rw-r--r--cpp/test/include/TestCommon.h10
-rw-r--r--java/Makefile10
-rwxr-xr-xjava/allTests.py10
-rw-r--r--java/ant/Slice2FreezeJTask.java10
-rw-r--r--java/ant/Slice2JavaTask.java10
-rw-r--r--java/ant/SliceDefine.java10
-rw-r--r--java/ant/SliceTask.java10
-rw-r--r--java/build.xml16
-rw-r--r--java/config/IcePackAdmin.py10
-rw-r--r--java/config/TestUtil.py10
-rw-r--r--java/config/build.properties10
-rw-r--r--java/demo/Freeze/bench/Client.java10
-rw-r--r--java/demo/Freeze/bench/StopWatch.java10
-rw-r--r--java/demo/Freeze/bench/Test.ice10
-rw-r--r--java/demo/Freeze/bench/build.xml16
-rw-r--r--java/demo/Freeze/build.xml16
-rw-r--r--java/demo/Freeze/library/BookFactory.java10
-rw-r--r--java/demo/Freeze/library/BookI.java10
-rw-r--r--java/demo/Freeze/library/Client.java10
-rw-r--r--java/demo/Freeze/library/Collocated.java10
-rw-r--r--java/demo/Freeze/library/Grammar.java10
-rw-r--r--java/demo/Freeze/library/Library.ice10
-rw-r--r--java/demo/Freeze/library/LibraryI.java10
-rw-r--r--java/demo/Freeze/library/Parser.java10
-rw-r--r--java/demo/Freeze/library/RunParser.java10
-rw-r--r--java/demo/Freeze/library/Scanner.java10
-rw-r--r--java/demo/Freeze/library/Server.java10
-rw-r--r--java/demo/Freeze/library/Token.java10
-rw-r--r--java/demo/Freeze/library/build.xml16
-rw-r--r--java/demo/Freeze/phonebook/Client.java10
-rw-r--r--java/demo/Freeze/phonebook/Collocated.java10
-rw-r--r--java/demo/Freeze/phonebook/ContactFactory.java10
-rw-r--r--java/demo/Freeze/phonebook/ContactI.java10
-rw-r--r--java/demo/Freeze/phonebook/Grammar.java10
-rw-r--r--java/demo/Freeze/phonebook/Parser.java10
-rw-r--r--java/demo/Freeze/phonebook/PhoneBook.ice10
-rw-r--r--java/demo/Freeze/phonebook/PhoneBookI.java10
-rw-r--r--java/demo/Freeze/phonebook/RunParser.java10
-rw-r--r--java/demo/Freeze/phonebook/Scanner.java10
-rw-r--r--java/demo/Freeze/phonebook/Server.java10
-rw-r--r--java/demo/Freeze/phonebook/Token.java10
-rw-r--r--java/demo/Freeze/phonebook/build.xml16
-rw-r--r--java/demo/Glacier/build.xml16
-rw-r--r--java/demo/Glacier/session/Client.java10
-rw-r--r--java/demo/Glacier/session/HelloSession.ice10
-rw-r--r--java/demo/Glacier/session/HelloSessionI.java10
-rw-r--r--java/demo/Glacier/session/HelloSessionManagerI.java10
-rw-r--r--java/demo/Glacier/session/Server.java10
-rw-r--r--java/demo/Glacier/session/build.xml16
-rw-r--r--java/demo/Ice/build.xml16
-rw-r--r--java/demo/Ice/callback/Callback.ice10
-rw-r--r--java/demo/Ice/callback/CallbackClient.java10
-rw-r--r--java/demo/Ice/callback/CallbackI.java10
-rw-r--r--java/demo/Ice/callback/CallbackReceiverI.java10
-rw-r--r--java/demo/Ice/callback/CallbackServer.java10
-rw-r--r--java/demo/Ice/callback/Client.java10
-rw-r--r--java/demo/Ice/callback/Server.java10
-rw-r--r--java/demo/Ice/callback/build.xml16
-rw-r--r--java/demo/Ice/hello/Client.java10
-rw-r--r--java/demo/Ice/hello/Hello.ice10
-rw-r--r--java/demo/Ice/hello/HelloI.java10
-rw-r--r--java/demo/Ice/hello/Server.java10
-rw-r--r--java/demo/Ice/hello/build.xml16
-rw-r--r--java/demo/Ice/latency/Client.java10
-rw-r--r--java/demo/Ice/latency/Latency.ice10
-rw-r--r--java/demo/Ice/latency/Server.java10
-rw-r--r--java/demo/Ice/latency/build.xml16
-rw-r--r--java/demo/Ice/nested/Client.java10
-rw-r--r--java/demo/Ice/nested/Nested.ice10
-rw-r--r--java/demo/Ice/nested/NestedClient.java10
-rw-r--r--java/demo/Ice/nested/NestedI.java10
-rw-r--r--java/demo/Ice/nested/NestedServer.java10
-rw-r--r--java/demo/Ice/nested/Server.java10
-rw-r--r--java/demo/Ice/nested/build.xml16
-rw-r--r--java/demo/Ice/throughput/Client.java10
-rw-r--r--java/demo/Ice/throughput/Server.java10
-rw-r--r--java/demo/Ice/throughput/Throughput.ice10
-rw-r--r--java/demo/Ice/throughput/ThroughputI.java10
-rw-r--r--java/demo/Ice/throughput/build.xml16
-rw-r--r--java/demo/Ice/value/Client.java10
-rw-r--r--java/demo/Ice/value/DerivedPrinterI.java10
-rw-r--r--java/demo/Ice/value/InitialI.java10
-rw-r--r--java/demo/Ice/value/ObjectFactory.java10
-rw-r--r--java/demo/Ice/value/PrinterI.java10
-rw-r--r--java/demo/Ice/value/Server.java10
-rw-r--r--java/demo/Ice/value/Value.ice10
-rw-r--r--java/demo/Ice/value/build.xml16
-rw-r--r--java/demo/IceBox/build.xml16
-rw-r--r--java/demo/IceBox/hello/Client.java10
-rw-r--r--java/demo/IceBox/hello/Hello.ice10
-rw-r--r--java/demo/IceBox/hello/HelloI.java10
-rw-r--r--java/demo/IceBox/hello/HelloServiceI.java10
-rw-r--r--java/demo/IceBox/hello/build.xml16
-rw-r--r--java/demo/IcePack/build.xml16
-rw-r--r--java/demo/IcePack/hello/Client.java10
-rw-r--r--java/demo/IcePack/hello/Hello.ice10
-rw-r--r--java/demo/IcePack/hello/HelloFactoryI.java10
-rw-r--r--java/demo/IcePack/hello/HelloI.java10
-rw-r--r--java/demo/IcePack/hello/HelloServiceI.java10
-rw-r--r--java/demo/IcePack/hello/Server.java10
-rw-r--r--java/demo/IcePack/hello/build.xml16
-rw-r--r--java/demo/IcePack/simple/Client.java10
-rw-r--r--java/demo/IcePack/simple/Hello.ice10
-rw-r--r--java/demo/IcePack/simple/HelloI.java10
-rw-r--r--java/demo/IcePack/simple/HelloServiceI.java10
-rw-r--r--java/demo/IcePack/simple/Server.java10
-rw-r--r--java/demo/IcePack/simple/build.xml16
-rw-r--r--java/demo/book/evictor/EvictorBase.java10
-rw-r--r--java/demo/book/evictor/LinkedList.java10
-rw-r--r--java/demo/build.xml16
-rwxr-xr-xjava/makebindist.py10
-rwxr-xr-xjava/makedist.py10
-rwxr-xr-xjava/src/Freeze/ConnectionI.java26
-rw-r--r--java/src/Freeze/EvictorElement.java10
-rw-r--r--java/src/Freeze/EvictorI.java10
-rw-r--r--java/src/Freeze/EvictorIteratorI.java10
-rw-r--r--java/src/Freeze/FatalErrorCallback.java10
-rw-r--r--java/src/Freeze/Index.java10
-rw-r--r--java/src/Freeze/LinkedList.java10
-rw-r--r--java/src/Freeze/Map.java10
-rw-r--r--java/src/Freeze/ObjectStore.java10
-rwxr-xr-xjava/src/Freeze/SharedDb.java10
-rw-r--r--java/src/Freeze/SharedDbEnv.java10
-rwxr-xr-xjava/src/Freeze/TransactionI.java26
-rw-r--r--java/src/Freeze/Util.java10
-rw-r--r--java/src/Ice/AMD_Object_ice_invoke.java10
-rw-r--r--java/src/Ice/AMI_Object_ice_invoke.java10
-rw-r--r--java/src/Ice/Application.java10
-rw-r--r--java/src/Ice/Blobject.java10
-rw-r--r--java/src/Ice/BlobjectAsync.java10
-rw-r--r--java/src/Ice/BooleanHolder.java10
-rw-r--r--java/src/Ice/ByteHolder.java10
-rw-r--r--java/src/Ice/CommunicatorI.java10
-rw-r--r--java/src/Ice/DoubleHolder.java10
-rw-r--r--java/src/Ice/FloatHolder.java10
-rw-r--r--java/src/Ice/IntHolder.java10
-rw-r--r--java/src/Ice/LocalException.java10
-rw-r--r--java/src/Ice/LocalObject.java10
-rw-r--r--java/src/Ice/LocalObjectHolder.java10
-rw-r--r--java/src/Ice/LocalObjectImpl.java10
-rw-r--r--java/src/Ice/LoggerI.java10
-rw-r--r--java/src/Ice/LongHolder.java10
-rw-r--r--java/src/Ice/Object.java10
-rw-r--r--java/src/Ice/ObjectAdapterI.java10
-rw-r--r--java/src/Ice/ObjectHolder.java10
-rw-r--r--java/src/Ice/ObjectImpl.java10
-rw-r--r--java/src/Ice/ObjectPrx.java10
-rw-r--r--java/src/Ice/ObjectPrxHelper.java10
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java10
-rw-r--r--java/src/Ice/ObjectPrxHolder.java10
-rw-r--r--java/src/Ice/PluginFactory.java10
-rw-r--r--java/src/Ice/PluginManagerI.java10
-rw-r--r--java/src/Ice/PropertiesI.java10
-rw-r--r--java/src/Ice/ProxyIdentityFacetKey.java10
-rw-r--r--java/src/Ice/ProxyIdentityKey.java10
-rw-r--r--java/src/Ice/RoutingTable.java10
-rw-r--r--java/src/Ice/ShortHolder.java10
-rw-r--r--java/src/Ice/StringHolder.java10
-rw-r--r--java/src/Ice/SysLoggerI.java10
-rw-r--r--java/src/Ice/UserException.java10
-rw-r--r--java/src/Ice/Util.java10
-rw-r--r--java/src/Ice/_AMD_Object_ice_invoke.java10
-rw-r--r--java/src/Ice/_ObjectDel.java10
-rw-r--r--java/src/Ice/_ObjectDelD.java10
-rw-r--r--java/src/Ice/_ObjectDelM.java10
-rw-r--r--java/src/IceBox/Admin.java10
-rw-r--r--java/src/IceBox/Server.java10
-rw-r--r--java/src/IceBox/ServiceManagerI.java10
-rw-r--r--java/src/IceInternal/Acceptor.java10
-rw-r--r--java/src/IceInternal/BasicStream.java10
-rw-r--r--java/src/IceInternal/BufferManager.java10
-rw-r--r--java/src/IceInternal/Connection.java10
-rw-r--r--java/src/IceInternal/ConnectionMonitor.java10
-rw-r--r--java/src/IceInternal/Connector.java10
-rw-r--r--java/src/IceInternal/DefaultsAndOverrides.java10
-rw-r--r--java/src/IceInternal/Direct.java10
-rw-r--r--java/src/IceInternal/DispatchStatus.java10
-rw-r--r--java/src/IceInternal/Endpoint.java10
-rw-r--r--java/src/IceInternal/EndpointFactory.java10
-rw-r--r--java/src/IceInternal/EndpointFactoryManager.java10
-rw-r--r--java/src/IceInternal/EndpointHolder.java10
-rw-r--r--java/src/IceInternal/EventHandler.java10
-rw-r--r--java/src/IceInternal/Incoming.java10
-rw-r--r--java/src/IceInternal/IncomingAsync.java10
-rw-r--r--java/src/IceInternal/IncomingBase.java10
-rw-r--r--java/src/IceInternal/IncomingConnectionFactory.java10
-rw-r--r--java/src/IceInternal/Instance.java10
-rwxr-xr-xjava/src/IceInternal/IntMap.java10
-rw-r--r--java/src/IceInternal/ListPatcher.java10
-rw-r--r--java/src/IceInternal/LocatorInfo.java10
-rw-r--r--java/src/IceInternal/LocatorManager.java10
-rw-r--r--java/src/IceInternal/LocatorTable.java10
-rw-r--r--java/src/IceInternal/Network.java10
-rw-r--r--java/src/IceInternal/NonRepeatable.java10
-rw-r--r--java/src/IceInternal/ObjectAdapterFactory.java10
-rw-r--r--java/src/IceInternal/ObjectFactoryManager.java10
-rw-r--r--java/src/IceInternal/Outgoing.java10
-rw-r--r--java/src/IceInternal/OutgoingAsync.java10
-rw-r--r--java/src/IceInternal/OutgoingConnectionFactory.java10
-rw-r--r--java/src/IceInternal/Patcher.java10
-rw-r--r--java/src/IceInternal/Protocol.java10
-rw-r--r--java/src/IceInternal/ProxyFactory.java10
-rw-r--r--java/src/IceInternal/Reference.java10
-rw-r--r--java/src/IceInternal/ReferenceFactory.java10
-rw-r--r--java/src/IceInternal/RouterInfo.java10
-rw-r--r--java/src/IceInternal/RouterManager.java10
-rw-r--r--java/src/IceInternal/SequencePatcher.java10
-rw-r--r--java/src/IceInternal/ServantManager.java10
-rw-r--r--java/src/IceInternal/TcpAcceptor.java10
-rw-r--r--java/src/IceInternal/TcpConnector.java10
-rw-r--r--java/src/IceInternal/TcpEndpoint.java10
-rw-r--r--java/src/IceInternal/TcpEndpointFactory.java10
-rw-r--r--java/src/IceInternal/TcpTransceiver.java10
-rw-r--r--java/src/IceInternal/ThreadPool.java10
-rw-r--r--java/src/IceInternal/TraceLevels.java10
-rw-r--r--java/src/IceInternal/TraceUtil.java10
-rw-r--r--java/src/IceInternal/Transceiver.java10
-rw-r--r--java/src/IceInternal/UdpEndpoint.java10
-rw-r--r--java/src/IceInternal/UdpEndpointFactory.java10
-rw-r--r--java/src/IceInternal/UdpTransceiver.java10
-rw-r--r--java/src/IceInternal/UnknownEndpoint.java10
-rw-r--r--java/src/IceInternal/UserExceptionFactory.java10
-rw-r--r--java/src/IceInternal/UserExceptionFactoryManager.java10
-rw-r--r--java/src/IceInternal/ValueWriter.java10
-rw-r--r--java/src/IceUtil/Cache.java10
-rw-r--r--java/src/IceUtil/CountDownLatch.java10
-rw-r--r--java/src/IceUtil/OutputBase.java10
-rw-r--r--java/src/IceUtil/Store.java10
-rw-r--r--java/src/IceUtil/StringUtil.java10
-rw-r--r--java/src/IceUtil/Version.java10
-rw-r--r--java/src/IceUtil/XMLOutput.java10
-rw-r--r--java/test/Freeze/build.xml16
-rw-r--r--java/test/Freeze/complex/Client.java10
-rw-r--r--java/test/Freeze/complex/Complex.ice10
-rw-r--r--java/test/Freeze/complex/Complex/AddNodeI.java10
-rw-r--r--java/test/Freeze/complex/Complex/MultiplyNodeI.java10
-rw-r--r--java/test/Freeze/complex/Complex/NumberNodeI.java10
-rw-r--r--java/test/Freeze/complex/Complex/ObjectFactoryI.java10
-rw-r--r--java/test/Freeze/complex/ParseError.java10
-rw-r--r--java/test/Freeze/complex/Parser.java10
-rw-r--r--java/test/Freeze/complex/build.xml16
-rwxr-xr-xjava/test/Freeze/complex/run.py10
-rw-r--r--java/test/Freeze/dbmap/Client.java10
-rw-r--r--java/test/Freeze/dbmap/build.xml16
-rwxr-xr-xjava/test/Freeze/dbmap/run.py10
-rw-r--r--java/test/Freeze/evictor/Client.java10
-rw-r--r--java/test/Freeze/evictor/FacetI.java10
-rw-r--r--java/test/Freeze/evictor/RemoteEvictorFactoryI.java10
-rw-r--r--java/test/Freeze/evictor/RemoteEvictorI.java10
-rw-r--r--java/test/Freeze/evictor/ServantI.java10
-rw-r--r--java/test/Freeze/evictor/Server.java10
-rw-r--r--java/test/Freeze/evictor/Test.ice10
-rw-r--r--java/test/Freeze/evictor/build.xml16
-rwxr-xr-xjava/test/Freeze/evictor/run.py10
-rw-r--r--java/test/Glacier/build.xml16
-rw-r--r--java/test/Glacier/starter/Callback.ice10
-rw-r--r--java/test/Glacier/starter/CallbackClient.java10
-rw-r--r--java/test/Glacier/starter/CallbackI.java10
-rw-r--r--java/test/Glacier/starter/CallbackReceiverI.java10
-rw-r--r--java/test/Glacier/starter/CallbackServer.java10
-rw-r--r--java/test/Glacier/starter/Client.java10
-rw-r--r--java/test/Glacier/starter/Server.java10
-rw-r--r--java/test/Glacier/starter/build.xml16
-rwxr-xr-xjava/test/Glacier/starter/run.py10
-rw-r--r--java/test/Ice/adapterDeactivation/AllTests.java10
-rw-r--r--java/test/Ice/adapterDeactivation/Client.java10
-rw-r--r--java/test/Ice/adapterDeactivation/Collocated.java10
-rw-r--r--java/test/Ice/adapterDeactivation/CookieI.java10
-rw-r--r--java/test/Ice/adapterDeactivation/ServantLocatorI.java10
-rw-r--r--java/test/Ice/adapterDeactivation/Server.java10
-rw-r--r--java/test/Ice/adapterDeactivation/Test.ice10
-rw-r--r--java/test/Ice/adapterDeactivation/TestI.java10
-rw-r--r--java/test/Ice/adapterDeactivation/build.xml16
-rwxr-xr-xjava/test/Ice/adapterDeactivation/run.py10
-rw-r--r--java/test/Ice/build.xml16
-rw-r--r--java/test/Ice/custom/AllTests.java10
-rw-r--r--java/test/Ice/custom/Client.java10
-rw-r--r--java/test/Ice/custom/Collocated.java10
-rw-r--r--java/test/Ice/custom/Server.java10
-rw-r--r--java/test/Ice/custom/Test.ice10
-rw-r--r--java/test/Ice/custom/TestI.java10
-rw-r--r--java/test/Ice/custom/build.xml16
-rwxr-xr-xjava/test/Ice/custom/run.py10
-rw-r--r--java/test/Ice/exceptions/AllTests.java10
-rw-r--r--java/test/Ice/exceptions/Client.java10
-rw-r--r--java/test/Ice/exceptions/Collocated.java10
-rw-r--r--java/test/Ice/exceptions/DummyLogger.java10
-rw-r--r--java/test/Ice/exceptions/EmptyI.java10
-rw-r--r--java/test/Ice/exceptions/ObjectFactoryI.java10
-rw-r--r--java/test/Ice/exceptions/ServantLocatorI.java10
-rw-r--r--java/test/Ice/exceptions/Server.java10
-rw-r--r--java/test/Ice/exceptions/Test.ice10
-rw-r--r--java/test/Ice/exceptions/ThrowerI.java10
-rw-r--r--java/test/Ice/exceptions/build.xml16
-rwxr-xr-xjava/test/Ice/exceptions/run.py10
-rw-r--r--java/test/Ice/exceptionsAMD/DummyLogger.java10
-rw-r--r--java/test/Ice/exceptionsAMD/Server.java10
-rw-r--r--java/test/Ice/exceptionsAMD/TestAMD.ice10
-rw-r--r--java/test/Ice/exceptionsAMD/ThrowerI.java10
-rw-r--r--java/test/Ice/exceptionsAMD/build.xml16
-rw-r--r--java/test/Ice/facets/AI.java10
-rw-r--r--java/test/Ice/facets/AllTests.java10
-rw-r--r--java/test/Ice/facets/BI.java10
-rw-r--r--java/test/Ice/facets/CI.java10
-rw-r--r--java/test/Ice/facets/Client.java10
-rw-r--r--java/test/Ice/facets/Collocated.java10
-rw-r--r--java/test/Ice/facets/DI.java10
-rw-r--r--java/test/Ice/facets/EI.java10
-rw-r--r--java/test/Ice/facets/EmptyI.java10
-rw-r--r--java/test/Ice/facets/FI.java10
-rw-r--r--java/test/Ice/facets/GI.java10
-rw-r--r--java/test/Ice/facets/HI.java10
-rw-r--r--java/test/Ice/facets/Server.java10
-rw-r--r--java/test/Ice/facets/Test.ice10
-rw-r--r--java/test/Ice/facets/build.xml16
-rwxr-xr-xjava/test/Ice/facets/run.py10
-rw-r--r--java/test/Ice/faultTolerance/AllTests.java10
-rw-r--r--java/test/Ice/faultTolerance/Client.java10
-rw-r--r--java/test/Ice/faultTolerance/Server.java10
-rw-r--r--java/test/Ice/faultTolerance/Test.ice10
-rw-r--r--java/test/Ice/faultTolerance/TestI.java10
-rw-r--r--java/test/Ice/faultTolerance/build.xml16
-rwxr-xr-xjava/test/Ice/faultTolerance/run.py10
-rw-r--r--java/test/Ice/inheritance/AllTests.java10
-rw-r--r--java/test/Ice/inheritance/CAI.java10
-rw-r--r--java/test/Ice/inheritance/CBI.java10
-rw-r--r--java/test/Ice/inheritance/CCI.java10
-rw-r--r--java/test/Ice/inheritance/CDI.java10
-rw-r--r--java/test/Ice/inheritance/Client.java10
-rw-r--r--java/test/Ice/inheritance/Collocated.java10
-rw-r--r--java/test/Ice/inheritance/IAI.java10
-rw-r--r--java/test/Ice/inheritance/IB1I.java10
-rw-r--r--java/test/Ice/inheritance/IB2I.java10
-rw-r--r--java/test/Ice/inheritance/ICI.java10
-rw-r--r--java/test/Ice/inheritance/InitialI.java10
-rw-r--r--java/test/Ice/inheritance/Server.java10
-rw-r--r--java/test/Ice/inheritance/Test.ice10
-rw-r--r--java/test/Ice/inheritance/build.xml16
-rwxr-xr-xjava/test/Ice/inheritance/run.py10
-rw-r--r--java/test/Ice/location/AllTests.java10
-rw-r--r--java/test/Ice/location/Client.java10
-rw-r--r--java/test/Ice/location/HelloI.java10
-rw-r--r--java/test/Ice/location/Server.java10
-rw-r--r--java/test/Ice/location/ServerLocator.java10
-rw-r--r--java/test/Ice/location/ServerLocatorRegistry.java10
-rw-r--r--java/test/Ice/location/ServerManagerI.java10
-rw-r--r--java/test/Ice/location/Test.ice10
-rw-r--r--java/test/Ice/location/TestI.java10
-rw-r--r--java/test/Ice/location/build.xml16
-rwxr-xr-xjava/test/Ice/location/run.py10
-rw-r--r--java/test/Ice/objects/AllTests.java10
-rw-r--r--java/test/Ice/objects/BI.java10
-rw-r--r--java/test/Ice/objects/CI.java10
-rw-r--r--java/test/Ice/objects/Client.java10
-rw-r--r--java/test/Ice/objects/Collocated.java10
-rw-r--r--java/test/Ice/objects/DI.java10
-rw-r--r--java/test/Ice/objects/InitialI.java10
-rw-r--r--java/test/Ice/objects/Server.java10
-rw-r--r--java/test/Ice/objects/Test.ice10
-rw-r--r--java/test/Ice/objects/build.xml16
-rwxr-xr-xjava/test/Ice/objects/run.py10
-rw-r--r--java/test/Ice/operations/AllTests.java10
-rw-r--r--java/test/Ice/operations/Client.java10
-rw-r--r--java/test/Ice/operations/Collocated.java10
-rw-r--r--java/test/Ice/operations/MyDerivedClassI.java10
-rw-r--r--java/test/Ice/operations/Server.java10
-rw-r--r--java/test/Ice/operations/Test.ice10
-rw-r--r--java/test/Ice/operations/Twoways.java10
-rw-r--r--java/test/Ice/operations/TwowaysAMI.java10
-rw-r--r--java/test/Ice/operations/build.xml16
-rwxr-xr-xjava/test/Ice/operations/run.py10
-rw-r--r--java/test/Ice/operationsAMD/MyDerivedClassI.java10
-rw-r--r--java/test/Ice/operationsAMD/Server.java10
-rw-r--r--java/test/Ice/operationsAMD/TestAMD.ice10
-rw-r--r--java/test/Ice/operationsAMD/build.xml16
-rw-r--r--java/test/Ice/slicing/build.xml16
-rw-r--r--java/test/Ice/slicing/exceptions/Test.ice10
-rw-r--r--java/test/Ice/slicing/exceptions/build.xml16
-rw-r--r--java/test/Ice/slicing/exceptions/csrc/AllTests.java10
-rw-r--r--java/test/Ice/slicing/exceptions/csrc/Client.java10
-rwxr-xr-xjava/test/Ice/slicing/exceptions/run.py10
-rw-r--r--java/test/Ice/slicing/exceptions/ssrc/Server.java10
-rw-r--r--java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice10
-rw-r--r--java/test/Ice/slicing/exceptions/ssrc/TestI.java10
-rw-r--r--java/test/Ice/slicing/exceptionsAMD/Server.java10
-rw-r--r--java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice10
-rw-r--r--java/test/Ice/slicing/exceptionsAMD/TestAMD.ice10
-rw-r--r--java/test/Ice/slicing/exceptionsAMD/TestI.java10
-rw-r--r--java/test/Ice/slicing/exceptionsAMD/build.xml16
-rw-r--r--java/test/Ice/slicing/objects/Forward.ice10
-rw-r--r--java/test/Ice/slicing/objects/Test.ice10
-rw-r--r--java/test/Ice/slicing/objects/build.xml16
-rw-r--r--java/test/Ice/slicing/objects/csrc/AllTests.java10
-rw-r--r--java/test/Ice/slicing/objects/csrc/Client.java10
-rw-r--r--java/test/Ice/slicing/objects/csrc/ClientPrivate.ice10
-rwxr-xr-xjava/test/Ice/slicing/objects/run.py10
-rw-r--r--java/test/Ice/slicing/objects/ssrc/Server.java10
-rw-r--r--java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice10
-rw-r--r--java/test/Ice/slicing/objects/ssrc/TestI.java10
-rw-r--r--java/test/Ice/slicing/objectsAMD/Forward.ice10
-rw-r--r--java/test/Ice/slicing/objectsAMD/Server.java10
-rw-r--r--java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice10
-rw-r--r--java/test/Ice/slicing/objectsAMD/TestAMD.ice10
-rw-r--r--java/test/Ice/slicing/objectsAMD/TestI.java10
-rw-r--r--java/test/Ice/slicing/objectsAMD/build.xml16
-rw-r--r--java/test/Ice/translator/DoubleModuleNoPackage.ice10
-rw-r--r--java/test/Ice/translator/DoubleModuleWithPackage.ice10
-rw-r--r--java/test/Ice/translator/NoModuleNoPackage.ice10
-rw-r--r--java/test/Ice/translator/NoModuleWithPackage.ice10
-rw-r--r--java/test/Ice/translator/SingleModuleNoPackage.ice10
-rw-r--r--java/test/Ice/translator/SingleModuleWithPackage.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage1.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage2.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage3.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage4.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage5.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage6.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleNoPackage7.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage1.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage10.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage11.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage2.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage3.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage4.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage5.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage6.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage7.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage8.ice10
-rw-r--r--java/test/Ice/translator/TestDoubleModuleWithPackage9.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleNoPackage.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage1.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage2.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage3.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage4.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage5.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage6.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage7.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage8.ice10
-rw-r--r--java/test/Ice/translator/TestNoModuleWithPackage9.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage1.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage2.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage3.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage4.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage5.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage6.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage7.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleNoPackage8.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage1.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage10.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage11.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage12.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage13.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage2.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage3.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage4.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage5.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage6.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage7.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage8.ice10
-rw-r--r--java/test/Ice/translator/TestSingleModuleWithPackage9.ice10
-rw-r--r--java/test/Ice/translator/build.xml16
-rw-r--r--java/test/IcePack/build.xml16
-rw-r--r--java/test/IcePack/deployer/AllTests.java10
-rw-r--r--java/test/IcePack/deployer/Client.java10
-rw-r--r--java/test/IcePack/deployer/FreezeService.java10
-rw-r--r--java/test/IcePack/deployer/Server.java10
-rw-r--r--java/test/IcePack/deployer/Service.java10
-rw-r--r--java/test/IcePack/deployer/Test.ice10
-rw-r--r--java/test/IcePack/deployer/TestI.java10
-rw-r--r--java/test/IcePack/deployer/build.xml16
-rwxr-xr-xjava/test/IcePack/deployer/run.py10
-rw-r--r--java/test/IcePack/simple/AllTests.java10
-rw-r--r--java/test/IcePack/simple/Client.java10
-rw-r--r--java/test/IcePack/simple/Server.java10
-rw-r--r--java/test/IcePack/simple/Test.ice10
-rw-r--r--java/test/IcePack/simple/TestI.java10
-rw-r--r--java/test/IcePack/simple/build.xml16
-rwxr-xr-xjava/test/IcePack/simple/run.py10
-rw-r--r--java/test/build.xml16
1496 files changed, 7819 insertions, 7718 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index 0ec5b8045c8..296d8a21a73 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = .
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 08b48b82386..4eb0d01eeb9 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
import getopt
diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py
index bd2437ea2a9..d35d0e9ea03 100644
--- a/cpp/config/IcePackAdmin.py
+++ b/cpp/config/IcePackAdmin.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import sys, os, TestUtil
import time
from threading import Thread
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index c2c5657267a..05eb7e8c4e8 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# Select an installation base directory. The directory will be created
# if it does not exist.
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 63d31c1866b..80d6f5cb466 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# This file is included by Make.rules when uname is Darwin.
#
diff --git a/cpp/config/Make.rules.FreeBSD b/cpp/config/Make.rules.FreeBSD
index 918e8656dd9..c070aee709c 100644
--- a/cpp/config/Make.rules.FreeBSD
+++ b/cpp/config/Make.rules.FreeBSD
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# This file is included by Make.rules when uname is FreeBSD
#
diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX
index 1c60699d9f5..5228e3de2e6 100644
--- a/cpp/config/Make.rules.HP-UX
+++ b/cpp/config/Make.rules.HP-UX
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# This file is included by Make.rules when uname is HP-UX..
#
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 250ed5dd44b..e026c735cd8 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# This file is included by Make.rules when uname is Linux.
#
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index 55340fa1529..f2be3e5dc2a 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# This file is included by Make.rules when uname is SunOS.
#
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index b6461c9fe2d..cb598403418 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# Set protocol to "ssl" in case you want to run the tests with the SSL
# protocol. Otherwise TCP is used.
diff --git a/cpp/config/makedepend.py b/cpp/config/makedepend.py
index ea504300262..18a45b0adb4 100755
--- a/cpp/config/makedepend.py
+++ b/cpp/config/makedepend.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import fileinput
previous = ""
diff --git a/cpp/demo/Freeze/Makefile b/cpp/demo/Freeze/Makefile
index d00a42d54e4..5ed12a2038d 100644
--- a/cpp/demo/Freeze/Makefile
+++ b/cpp/demo/Freeze/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp
index aa50d7b2ba6..8e927eda27f 100644
--- a/cpp/demo/Freeze/backup/Client.cpp
+++ b/cpp/demo/Freeze/backup/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IntLongMap.h>
#include <IceUtil/Time.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile
index 40e5045b292..faee7ad17a3 100644
--- a/cpp/demo/Freeze/backup/Makefile
+++ b/cpp/demo/Freeze/backup/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 5eafd95583e..3fdab602785 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <Freeze/Freeze.h>
#include <BenchTypes.h>
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index cbcef82cab9..44da66ee36b 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice
index ce2087e1eae..d32b95cb2f9 100644
--- a/cpp/demo/Freeze/bench/Test.ice
+++ b/cpp/demo/Freeze/bench/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
struct Struct1
{
long l;
diff --git a/cpp/demo/Freeze/library/BookFactory.cpp b/cpp/demo/Freeze/library/BookFactory.cpp
index 389e6848d2a..55db8e07182 100644
--- a/cpp/demo/Freeze/library/BookFactory.cpp
+++ b/cpp/demo/Freeze/library/BookFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <BookFactory.h>
using namespace std;
diff --git a/cpp/demo/Freeze/library/BookFactory.h b/cpp/demo/Freeze/library/BookFactory.h
index 2a6452be8e7..1730ab61862 100644
--- a/cpp/demo/Freeze/library/BookFactory.h
+++ b/cpp/demo/Freeze/library/BookFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef BOOK_FACTORY_H
#define BOOK_FACTORY_H
diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index 855ac30f2d3..c70e171dcc5 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 1cf79be8ec0..06b7745156f 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <BookFactory.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Grammar.y b/cpp/demo/Freeze/library/Grammar.y
index 5e586120fd2..e3c9346149f 100644
--- a/cpp/demo/Freeze/library/Grammar.y
+++ b/cpp/demo/Freeze/library/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice
index d25784bc1c5..e437c235493 100644
--- a/cpp/demo/Freeze/library/Library.ice
+++ b/cpp/demo/Freeze/library/Library.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LIBRARY_ICE
#define LIBRARY_ICE
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index 19d9276f24f..1ed4bce7d9c 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/Freeze.h>
#include <LibraryI.h>
diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h
index b3f4c065528..2a51f77c168 100644
--- a/cpp/demo/Freeze/library/LibraryI.h
+++ b/cpp/demo/Freeze/library/LibraryI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LIBRARY_I_H
#define LIBRARY_I_H
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile
index beed209438a..96ad95996ed 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 3f5211f5f42..8028e306a52 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h
index 3e9d4646e7b..a3650b9cd51 100644
--- a/cpp/demo/Freeze/library/Parser.h
+++ b/cpp/demo/Freeze/library/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PARSER_H
#define PARSER_H
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp
index e234320ad28..f7d1bbd5d55 100644
--- a/cpp/demo/Freeze/library/RunParser.cpp
+++ b/cpp/demo/Freeze/library/RunParser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l
index a63cc2bb733..96cbb62a4b3 100644
--- a/cpp/demo/Freeze/library/Scanner.l
+++ b/cpp/demo/Freeze/library/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
#include <Grammar.h>
diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index 758be5b11eb..9d496a4c56a 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <BookFactory.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp
index 68288c0ad55..7b21c8a07f0 100644
--- a/cpp/demo/Freeze/phonebook/Client.cpp
+++ b/cpp/demo/Freeze/phonebook/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 0f210a234d6..1f98f3a1509 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <ContactFactory.h>
#include <NameIndex.h>
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.cpp b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
index 112f4364485..a596a7872b2 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <ContactFactory.h>
#include <PhoneBookI.h>
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.h b/cpp/demo/Freeze/phonebook/ContactFactory.h
index c1d3f03c4b3..f980052673a 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.h
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CONTACT_FACTORY_H
#define CONTACT_FACTORY_H
diff --git a/cpp/demo/Freeze/phonebook/Grammar.y b/cpp/demo/Freeze/phonebook/Grammar.y
index b9d5f092b14..7cbb21d2773 100644
--- a/cpp/demo/Freeze/phonebook/Grammar.y
+++ b/cpp/demo/Freeze/phonebook/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 2ec4d4629a8..23c805b7794 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -1,18 +1,18 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp
index b77be8751e7..8bffb61f96f 100644
--- a/cpp/demo/Freeze/phonebook/Parser.cpp
+++ b/cpp/demo/Freeze/phonebook/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h
index 43c0028046e..34890d7f5f5 100644
--- a/cpp/demo/Freeze/phonebook/Parser.h
+++ b/cpp/demo/Freeze/phonebook/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PARSER_H
#define PARSER_H
diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice
index 2dedc1b90a0..ddbe5fafb7b 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBook.ice
+++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PHONE_BOOK_ICE
#define PHONE_BOOK_ICE
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index ea6fda416f4..23f62f2fcc7 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <PhoneBookI.h>
#include <IceUtil/UUID.h>
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h
index 90595856546..4bae446e71e 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.h
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PHONE_BOOK_I_H
#define PHONE_BOOK_I_H
diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp
index 537ec8b9057..5e5823194fe 100644
--- a/cpp/demo/Freeze/phonebook/RunParser.cpp
+++ b/cpp/demo/Freeze/phonebook/RunParser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l
index 158bd36c831..de99029de14 100644
--- a/cpp/demo/Freeze/phonebook/Scanner.l
+++ b/cpp/demo/Freeze/phonebook/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
#include <Grammar.h>
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index 9dcac3c1980..c65b1789a15 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <ContactFactory.h>
#include <NameIndex.h>
diff --git a/cpp/demo/Glacier/Makefile b/cpp/demo/Glacier/Makefile
index e8512368672..3bf586c1cbf 100644
--- a/cpp/demo/Glacier/Makefile
+++ b/cpp/demo/Glacier/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp
index 5a0eacee54c..dfd4d86fccd 100644
--- a/cpp/demo/Glacier/session/Client.cpp
+++ b/cpp/demo/Glacier/session/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Glacier/Glacier.h>
#include <Glacier/Router.h>
diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice
index 2542290ef8f..32f111b0783 100644
--- a/cpp/demo/Glacier/session/HelloSession.ice
+++ b/cpp/demo/Glacier/session/HelloSession.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/Glacier/session/HelloSessionI.cpp b/cpp/demo/Glacier/session/HelloSessionI.cpp
index d05d9d142cd..87adad827dc 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.cpp
+++ b/cpp/demo/Glacier/session/HelloSessionI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloSessionI.h>
diff --git a/cpp/demo/Glacier/session/HelloSessionI.h b/cpp/demo/Glacier/session/HelloSessionI.h
index dd805ac3fe9..6365bf13e29 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.h
+++ b/cpp/demo/Glacier/session/HelloSessionI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_SESSION_I_H
#define HELLO_SESSION_I_H
diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile
index df5b0301870..4268b607751 100644
--- a/cpp/demo/Glacier/session/Makefile
+++ b/cpp/demo/Glacier/session/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Glacier/session/Server.cpp b/cpp/demo/Glacier/session/Server.cpp
index dca4f02dc52..283d9a33af4 100644
--- a/cpp/demo/Glacier/session/Server.cpp
+++ b/cpp/demo/Glacier/session/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Glacier/Glacier.h>
#include <HelloSessionI.h>
diff --git a/cpp/demo/Ice/MFC/client/Hello.ice b/cpp/demo/Ice/MFC/client/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/MFC/client/Hello.ice
+++ b/cpp/demo/Ice/MFC/client/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.cpp b/cpp/demo/Ice/MFC/client/HelloClient.cpp
index ceb2bdbe2c6..cc7e46308c0 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClient.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#include "stdafx.h"
#include "HelloClient.h"
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.h b/cpp/demo/Ice/MFC/client/HelloClient.h
index b234ca6063e..46cac8a9d4e 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.h
+++ b/cpp/demo/Ice/MFC/client/HelloClient.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef HELLO_CLIENT_H
#define HELLO_CLIENT_H
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
index f2873e6e1a6..b08986a3f3d 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#include "stdafx.h"
#include "HelloClient.h"
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
index e61f8a286c7..75bc633b0c7 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef HELLO_CLIENT_DLG_H
#define HELLO_CLIENT_DLG_H
diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp
index 01112a78de2..0f0125b30f8 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/client/stdafx.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
// stdafx.cpp : source file that includes just the standard includes
// HelloClient.pch will be the pre-compiled header
diff --git a/cpp/demo/Ice/MFC/client/stdafx.h b/cpp/demo/Ice/MFC/client/stdafx.h
index ca0dd089a3d..22c4a5ecac9 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.h
+++ b/cpp/demo/Ice/MFC/client/stdafx.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,
diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/MFC/server/Hello.ice
+++ b/cpp/demo/Ice/MFC/server/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/Ice/MFC/server/HelloI.cpp b/cpp/demo/Ice/MFC/server/HelloI.cpp
index eff20bbc173..2e43f383d68 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include "stdafx.h"
#include <HelloI.h>
diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h
index a8423d91f08..1361d688faf 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.h
+++ b/cpp/demo/Ice/MFC/server/HelloI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_I_H
#define HELLO_I_H
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.cpp b/cpp/demo/Ice/MFC/server/HelloServer.cpp
index 6899eb18b47..148d2538a57 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloServer.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#include "stdafx.h"
#include "HelloServer.h"
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.h b/cpp/demo/Ice/MFC/server/HelloServer.h
index ef7b4c511b5..8451e9dc382 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.h
+++ b/cpp/demo/Ice/MFC/server/HelloServer.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef HELLO_SERVER_H
#define HELLO_SERVER_H
diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
index cb0ecd67682..2414737df43 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#include "stdafx.h"
#include "HelloServer.h"
diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.h b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
index 253a2f30431..5072d4efc04 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.h
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef HELLO_SERVER_DLG_H
#define HELLO_SERVER_DLG_H
diff --git a/cpp/demo/Ice/MFC/server/LogI.cpp b/cpp/demo/Ice/MFC/server/LogI.cpp
index 58b6f3b7265..ace1b31db96 100644
--- a/cpp/demo/Ice/MFC/server/LogI.cpp
+++ b/cpp/demo/Ice/MFC/server/LogI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include "stdafx.h"
#include "LogI.h"
diff --git a/cpp/demo/Ice/MFC/server/LogI.h b/cpp/demo/Ice/MFC/server/LogI.h
index 59f75de5c3d..e769da7cb22 100644
--- a/cpp/demo/Ice/MFC/server/LogI.h
+++ b/cpp/demo/Ice/MFC/server/LogI.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef LOG_I_H
#define LOG_I_H
diff --git a/cpp/demo/Ice/MFC/server/stdafx.cpp b/cpp/demo/Ice/MFC/server/stdafx.cpp
index 4222b45616b..dd3111c0bce 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/server/stdafx.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
// stdafx.cpp : source file that includes just the standard includes
// HelloServer.pch will be the pre-compiled header
diff --git a/cpp/demo/Ice/MFC/server/stdafx.h b/cpp/demo/Ice/MFC/server/stdafx.h
index ca0dd089a3d..22c4a5ecac9 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.h
+++ b/cpp/demo/Ice/MFC/server/stdafx.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,
diff --git a/cpp/demo/Ice/Makefile b/cpp/demo/Ice/Makefile
index 7cd2a3c101b..cfe6268bbcd 100644
--- a/cpp/demo/Ice/Makefile
+++ b/cpp/demo/Ice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index 2686a46dc84..da64c2948e3 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp
index 935eee32c50..b9bdf2032bc 100644
--- a/cpp/demo/Ice/callback/CallbackI.cpp
+++ b/cpp/demo/Ice/callback/CallbackI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <CallbackI.h>
diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h
index 15abb3a04e3..1b3167c75e8 100644
--- a/cpp/demo/Ice/callback/CallbackI.h
+++ b/cpp/demo/Ice/callback/CallbackI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index e0b6c667465..0c1cc916cc0 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <CallbackI.h>
diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile
index 07aa1f7046b..6df65ae3589 100644
--- a/cpp/demo/Ice/callback/Makefile
+++ b/cpp/demo/Ice/callback/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index c76636468c8..74be3ab32d2 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <CallbackI.h>
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 1f63bf78ab0..1eddb644749 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Hello.h>
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/Ice/hello/HelloI.cpp b/cpp/demo/Ice/hello/HelloI.cpp
index 880603c5f46..6f29d3b5332 100644
--- a/cpp/demo/Ice/hello/HelloI.cpp
+++ b/cpp/demo/Ice/hello/HelloI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloI.h>
diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h
index e57da289476..12ed5ba1f9b 100644
--- a/cpp/demo/Ice/hello/HelloI.h
+++ b/cpp/demo/Ice/hello/HelloI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_I_H
#define HELLO_I_H
diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile
index 7e7f62ec26f..33ce7dc9504 100644
--- a/cpp/demo/Ice/hello/Makefile
+++ b/cpp/demo/Ice/hello/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index 6d50c4ed612..de0870dd26c 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloI.h>
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index bfd75f4debb..97ba57bb900 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Latency.h>
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 3bd70571733..b11e6cf4e94 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LATENCY_ICE
#define LATENCY_ICE
diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile
index ad9ce94abc8..d615fc43246 100644
--- a/cpp/demo/Ice/latency/Makefile
+++ b/cpp/demo/Ice/latency/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp
index ade737b0ee4..1c3495ce1f9 100644
--- a/cpp/demo/Ice/latency/Server.cpp
+++ b/cpp/demo/Ice/latency/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Latency.h>
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 2ea1f26cac9..bc9f3d6e4ae 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <NestedI.h>
diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile
index 775dc25d3b7..d6d3ce4c05b 100644
--- a/cpp/demo/Ice/nested/Makefile
+++ b/cpp/demo/Ice/nested/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index ba810a21d41..e629bbe88d2 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef NESTED_ICE
#define NESTED_ICE
diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp
index 58cc395d7de..a8c094e2f6c 100644
--- a/cpp/demo/Ice/nested/NestedI.cpp
+++ b/cpp/demo/Ice/nested/NestedI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <NestedI.h>
diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h
index cf61f6fa5d4..c2c91b4a4af 100644
--- a/cpp/demo/Ice/nested/NestedI.h
+++ b/cpp/demo/Ice/nested/NestedI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef NESTED_I_H
#define NESTED_I_H
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 2ab208d715b..67b4f2f2b53 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <NestedI.h>
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index c807e409300..fda3b586a58 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Throughput.h>
diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile
index 5edade485fc..26dbf057250 100644
--- a/cpp/demo/Ice/throughput/Makefile
+++ b/cpp/demo/Ice/throughput/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp
index 46f1d63d72c..3b1e23f1fe4 100644
--- a/cpp/demo/Ice/throughput/Server.cpp
+++ b/cpp/demo/Ice/throughput/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <ThroughputI.h>
using namespace std;
diff --git a/cpp/demo/Ice/throughput/Throughput.ice b/cpp/demo/Ice/throughput/Throughput.ice
index e28cef29cf4..3b02a3861d9 100644
--- a/cpp/demo/Ice/throughput/Throughput.ice
+++ b/cpp/demo/Ice/throughput/Throughput.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef THROUGHPUT_ICE
#define THROUGHPUT_ICE
diff --git a/cpp/demo/Ice/throughput/ThroughputI.h b/cpp/demo/Ice/throughput/ThroughputI.h
index 3326f6979b1..f7d34ca5ee1 100644
--- a/cpp/demo/Ice/throughput/ThroughputI.h
+++ b/cpp/demo/Ice/throughput/ThroughputI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef THROUGHPUT_I_H
#define THROUGHPUT_I_H
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 9c875cb9eb3..e300c3933ca 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Value.h>
#include <ObjectFactory.h>
diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile
index d6b3aff023c..05bf1c2f0a8 100644
--- a/cpp/demo/Ice/value/Makefile
+++ b/cpp/demo/Ice/value/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp
index cf6f501dcac..462cc1f0a39 100644
--- a/cpp/demo/Ice/value/ObjectFactory.cpp
+++ b/cpp/demo/Ice/value/ObjectFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <ObjectFactory.h>
#include <ValueI.h>
diff --git a/cpp/demo/Ice/value/ObjectFactory.h b/cpp/demo/Ice/value/ObjectFactory.h
index a19f8efcaf5..9cd2b21686d 100644
--- a/cpp/demo/Ice/value/ObjectFactory.h
+++ b/cpp/demo/Ice/value/ObjectFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVANT_FACTORY_H
#define SERVANT_FACTORY_H
diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp
index d03ccef1126..62feea2ca91 100644
--- a/cpp/demo/Ice/value/Server.cpp
+++ b/cpp/demo/Ice/value/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <ValueI.h>
diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice
index 4a69d6b6a7d..b4196a7bee3 100644
--- a/cpp/demo/Ice/value/Value.ice
+++ b/cpp/demo/Ice/value/Value.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef VALUE_ICE
#define VALUE_ICE
diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp
index 20c986db61f..782318aeb1c 100644
--- a/cpp/demo/Ice/value/ValueI.cpp
+++ b/cpp/demo/Ice/value/ValueI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <ValueI.h>
diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h
index 6dea83ec19b..03007466407 100644
--- a/cpp/demo/Ice/value/ValueI.h
+++ b/cpp/demo/Ice/value/ValueI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef VALUE_I_H
#define VALUE_I_H
diff --git a/cpp/demo/IceBox/Makefile b/cpp/demo/IceBox/Makefile
index 70ab1b3ede2..1f9de301f04 100644
--- a/cpp/demo/IceBox/Makefile
+++ b/cpp/demo/IceBox/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index 365267b0799..bac947faae7 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Hello.h>
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index c9ccce18906..7fc2c380953 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/IceBox/hello/HelloI.cpp b/cpp/demo/IceBox/hello/HelloI.cpp
index ac5499dd37c..59b519fa825 100644
--- a/cpp/demo/IceBox/hello/HelloI.cpp
+++ b/cpp/demo/IceBox/hello/HelloI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloI.h>
diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h
index b8f82d21c1a..cbcb981cd84 100644
--- a/cpp/demo/IceBox/hello/HelloI.h
+++ b/cpp/demo/IceBox/hello/HelloI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_I_H
#define HELLO_I_H
diff --git a/cpp/demo/IceBox/hello/HelloServiceI.cpp b/cpp/demo/IceBox/hello/HelloServiceI.cpp
index c4f93d562f7..491e6333007 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.cpp
+++ b/cpp/demo/IceBox/hello/HelloServiceI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloServiceI.h>
#include <HelloI.h>
diff --git a/cpp/demo/IceBox/hello/HelloServiceI.h b/cpp/demo/IceBox/hello/HelloServiceI.h
index f6f0c816d9c..4a1773b497c 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.h
+++ b/cpp/demo/IceBox/hello/HelloServiceI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_SERVICE_I_H
#define HELLO_SERVICE_I_H
diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile
index c241f01ca86..5801d7731d2 100644
--- a/cpp/demo/IceBox/hello/Makefile
+++ b/cpp/demo/IceBox/hello/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/IcePack/Makefile b/cpp/demo/IcePack/Makefile
index 687a0d06c24..2845533b65c 100644
--- a/cpp/demo/IcePack/Makefile
+++ b/cpp/demo/IcePack/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IcePack/hello/Client.cpp b/cpp/demo/IcePack/hello/Client.cpp
index 173d113d40f..53477355ddf 100644
--- a/cpp/demo/IcePack/hello/Client.cpp
+++ b/cpp/demo/IcePack/hello/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Query.h>
#include <Hello.h>
diff --git a/cpp/demo/IcePack/hello/Hello.ice b/cpp/demo/IcePack/hello/Hello.ice
index c071142f40d..97af57216f4 100644
--- a/cpp/demo/IcePack/hello/Hello.ice
+++ b/cpp/demo/IcePack/hello/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/IcePack/hello/HelloI.cpp b/cpp/demo/IcePack/hello/HelloI.cpp
index 3885e64c6db..3a159ec3257 100644
--- a/cpp/demo/IcePack/hello/HelloI.cpp
+++ b/cpp/demo/IcePack/hello/HelloI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Admin.h>
#include <HelloI.h>
diff --git a/cpp/demo/IcePack/hello/HelloI.h b/cpp/demo/IcePack/hello/HelloI.h
index a5ad2807b9f..da4fbb0da0b 100644
--- a/cpp/demo/IcePack/hello/HelloI.h
+++ b/cpp/demo/IcePack/hello/HelloI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_I_H
#define HELLO_I_H
diff --git a/cpp/demo/IcePack/hello/HelloServiceI.cpp b/cpp/demo/IcePack/hello/HelloServiceI.cpp
index a09d4e8aca3..05ceca015d2 100644
--- a/cpp/demo/IcePack/hello/HelloServiceI.cpp
+++ b/cpp/demo/IcePack/hello/HelloServiceI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloServiceI.h>
#include <HelloI.h>
diff --git a/cpp/demo/IcePack/hello/HelloServiceI.h b/cpp/demo/IcePack/hello/HelloServiceI.h
index ce4fa871165..f7ac55fe62a 100644
--- a/cpp/demo/IcePack/hello/HelloServiceI.h
+++ b/cpp/demo/IcePack/hello/HelloServiceI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_SERVICE_I_H
#define HELLO_SERVICE_I_H
diff --git a/cpp/demo/IcePack/hello/Makefile b/cpp/demo/IcePack/hello/Makefile
index b9e0342f0a2..f16e86f46ed 100644
--- a/cpp/demo/IcePack/hello/Makefile
+++ b/cpp/demo/IcePack/hello/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/IcePack/hello/Server.cpp b/cpp/demo/IcePack/hello/Server.cpp
index 2e2a0089fa7..715d2ebec46 100644
--- a/cpp/demo/IcePack/hello/Server.cpp
+++ b/cpp/demo/IcePack/hello/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloI.h>
diff --git a/cpp/demo/IcePack/simple/Client.cpp b/cpp/demo/IcePack/simple/Client.cpp
index 4e6ab941b42..0fbb8ce7a54 100644
--- a/cpp/demo/IcePack/simple/Client.cpp
+++ b/cpp/demo/IcePack/simple/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Query.h>
#include <Hello.h>
diff --git a/cpp/demo/IcePack/simple/Hello.ice b/cpp/demo/IcePack/simple/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/IcePack/simple/Hello.ice
+++ b/cpp/demo/IcePack/simple/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/cpp/demo/IcePack/simple/HelloI.cpp b/cpp/demo/IcePack/simple/HelloI.cpp
index 880603c5f46..6f29d3b5332 100644
--- a/cpp/demo/IcePack/simple/HelloI.cpp
+++ b/cpp/demo/IcePack/simple/HelloI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloI.h>
diff --git a/cpp/demo/IcePack/simple/HelloI.h b/cpp/demo/IcePack/simple/HelloI.h
index e57da289476..12ed5ba1f9b 100644
--- a/cpp/demo/IcePack/simple/HelloI.h
+++ b/cpp/demo/IcePack/simple/HelloI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_I_H
#define HELLO_I_H
diff --git a/cpp/demo/IcePack/simple/HelloServiceI.cpp b/cpp/demo/IcePack/simple/HelloServiceI.cpp
index bdaa3193fbd..7ce780a3009 100644
--- a/cpp/demo/IcePack/simple/HelloServiceI.cpp
+++ b/cpp/demo/IcePack/simple/HelloServiceI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloServiceI.h>
#include <HelloI.h>
diff --git a/cpp/demo/IcePack/simple/HelloServiceI.h b/cpp/demo/IcePack/simple/HelloServiceI.h
index f6f0c816d9c..4a1773b497c 100644
--- a/cpp/demo/IcePack/simple/HelloServiceI.h
+++ b/cpp/demo/IcePack/simple/HelloServiceI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_SERVICE_I_H
#define HELLO_SERVICE_I_H
diff --git a/cpp/demo/IcePack/simple/Makefile b/cpp/demo/IcePack/simple/Makefile
index 4b979b68c93..dae4fc28851 100644
--- a/cpp/demo/IcePack/simple/Makefile
+++ b/cpp/demo/IcePack/simple/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/demo/IcePack/simple/Server.cpp b/cpp/demo/IcePack/simple/Server.cpp
index ab9d956d157..dffcf6c4e77 100644
--- a/cpp/demo/IcePack/simple/Server.cpp
+++ b/cpp/demo/IcePack/simple/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <HelloI.h>
diff --git a/cpp/demo/IceStorm/Makefile b/cpp/demo/IceStorm/Makefile
index 86cf8854d60..20a6ef3fc3a 100644
--- a/cpp/demo/IceStorm/Makefile
+++ b/cpp/demo/IceStorm/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IceStorm/clock/Clock.ice b/cpp/demo/IceStorm/clock/Clock.ice
index 1b1f7144e82..706a254640f 100644
--- a/cpp/demo/IceStorm/clock/Clock.ice
+++ b/cpp/demo/IceStorm/clock/Clock.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CLOCK_ICE
#define CLOCK_ICE
diff --git a/cpp/demo/IceStorm/clock/ClockI.cpp b/cpp/demo/IceStorm/clock/ClockI.cpp
index 5f73e795a2e..815b156788a 100644
--- a/cpp/demo/IceStorm/clock/ClockI.cpp
+++ b/cpp/demo/IceStorm/clock/ClockI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <ClockI.h>
diff --git a/cpp/demo/IceStorm/clock/ClockI.h b/cpp/demo/IceStorm/clock/ClockI.h
index 94274653b1b..8b835daa8ec 100644
--- a/cpp/demo/IceStorm/clock/ClockI.h
+++ b/cpp/demo/IceStorm/clock/ClockI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CLOCK_I_H
#define CLOCK_I_H
diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile
index 41681abe769..d32f13231af 100644
--- a/cpp/demo/IceStorm/clock/Makefile
+++ b/cpp/demo/IceStorm/clock/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
PUBLISHER = publisher
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index a98491ae54c..e942acc7528 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp
index 04f934a532c..855881f6534 100644
--- a/cpp/demo/IceStorm/clock/Subscriber.cpp
+++ b/cpp/demo/IceStorm/clock/Subscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IceStorm/IceStorm.h>
#include <IceUtil/UUID.h>
diff --git a/cpp/demo/IceUtil/Makefile b/cpp/demo/IceUtil/Makefile
index 89d9370b435..f48d73d749b 100644
--- a/cpp/demo/IceUtil/Makefile
+++ b/cpp/demo/IceUtil/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IceUtil/workqueue/Makefile b/cpp/demo/IceUtil/workqueue/Makefile
index a04203e3ff2..306f78ec33d 100644
--- a/cpp/demo/IceUtil/workqueue/Makefile
+++ b/cpp/demo/IceUtil/workqueue/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = workqueue
diff --git a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
index 9c0e4b9dea6..2f0a0ac49c3 100644
--- a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
+++ b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Thread.h>
#include <IceUtil/Exception.h>
#include <IceUtil/Monitor.h>
diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile
index 1a95bbeef1f..41c10fc7ce9 100644
--- a/cpp/demo/Makefile
+++ b/cpp/demo/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile
index a5093b98683..a0d9a426547 100644
--- a/cpp/doc/Makefile
+++ b/cpp/doc/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ..
TARGETS = manual/index.html
diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h
index c373f5371fa..7c141d5269a 100644
--- a/cpp/include/Freeze/Freeze.h
+++ b/cpp/include/Freeze/Freeze.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_FREEZE_H
#define FREEZE_FREEZE_H
diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h
index a575c5e5b1d..c8c40478c4b 100644
--- a/cpp/include/Freeze/Index.h
+++ b/cpp/include/Freeze/Index.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_INDEX_H
#define FREEZE_INDEX_H
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h
index c9658cdd049..3ea9ba8ff43 100644
--- a/cpp/include/Freeze/Initialize.h
+++ b/cpp/include/Freeze/Initialize.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_INITIALIZE_H
#define FREEZE_INITIALIZE_H
diff --git a/cpp/include/Freeze/Makefile b/cpp/include/Freeze/Makefile
index 3f63510aa2f..cf5a4660cb3 100644
--- a/cpp/include/Freeze/Makefile
+++ b/cpp/include/Freeze/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
index 561e78e60d3..ce1648bb7d5 100644
--- a/cpp/include/Freeze/Map.h
+++ b/cpp/include/Freeze/Map.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_MAP_H
#define FREEZE_MAP_H
diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h
index 78834c7a439..0b3ffab9d97 100644
--- a/cpp/include/Freeze/TransactionHolder.h
+++ b/cpp/include/Freeze/TransactionHolder.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_TRANSACTION_HOLDER_H
#define FREEZE_TRANSACTION_HOLDER_H
diff --git a/cpp/include/Glacier/Glacier.h b/cpp/include/Glacier/Glacier.h
index d7d49862a4b..5b452fa85b5 100644
--- a/cpp/include/Glacier/Glacier.h
+++ b/cpp/include/Glacier/Glacier.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_H
#define GLACIER_H
diff --git a/cpp/include/Glacier/Makefile b/cpp/include/Glacier/Makefile
index ce9a8c2be3a..24ced4bd046 100644
--- a/cpp/include/Glacier/Makefile
+++ b/cpp/include/Glacier/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index d8ab0b60237..43dbdbfa10d 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_APPLICATION_H
#define ICE_APPLICATION_H
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index bb9f66d8bcb..daf67c15080 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STREAM_H
#define ICE_STREAM_H
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index f7931a56e2b..90868430396 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_BUFFER_H
#define ICE_BUFFER_H
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 92dc4665ac7..9fc932b9595 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONFIG_H
#define ICE_CONFIG_H
diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h
index 377aa60260e..a7bb0d2d582 100644
--- a/cpp/include/Ice/ConnectionF.h
+++ b/cpp/include/Ice/ConnectionF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTION_F_H
#define ICE_CONNECTION_F_H
diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h
index 00278d08cf3..c9aba0a2d4b 100644
--- a/cpp/include/Ice/ConnectionFactoryF.h
+++ b/cpp/include/Ice/ConnectionFactoryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTION_FACTORY_F_H
#define ICE_CONNECTION_FACTORY_F_H
diff --git a/cpp/include/Ice/ConnectionMonitorF.h b/cpp/include/Ice/ConnectionMonitorF.h
index 2d48279a6df..f28b574d09a 100644
--- a/cpp/include/Ice/ConnectionMonitorF.h
+++ b/cpp/include/Ice/ConnectionMonitorF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTION_MONITOR_F_H
#define ICE_CONNECTION_MONITOR_F_H
diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h
index b66bf33dbab..77129ba70bc 100644
--- a/cpp/include/Ice/Direct.h
+++ b/cpp/include/Ice/Direct.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_DIRECT_H
#define ICE_DIRECT_H
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index d1256d2c091..688d8b9b628 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_DYNAMIC_LIBRARY_H
#define ICE_DYNAMIC_LIBRARY_H
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index aa8691bdf98..da173c8a561 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_DYNAMIC_LIBRARY_F_H
#define ICE_DYNAMIC_LIBRARY_F_H
diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h
index d9df74a7d9f..63f6c1277e3 100644
--- a/cpp/include/Ice/EndpointF.h
+++ b/cpp/include/Ice/EndpointF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ENDPOINT_F_H
#define ICE_ENDPOINT_F_H
diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h
index 768012bcaaf..a53bea7c494 100644
--- a/cpp/include/Ice/EndpointFactory.h
+++ b/cpp/include/Ice/EndpointFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ENDPOINT_FACTORY_H
#define ICE_ENDPOINT_FACTORY_H
diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h
index 6cbeff31210..020bee6e1bc 100644
--- a/cpp/include/Ice/EndpointFactoryF.h
+++ b/cpp/include/Ice/EndpointFactoryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ENDPOINT_FACTORY_F_H
#define ICE_ENDPOINT_FACTORY_F_H
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 6b977165ec1..0fe6d9eddae 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_EXCEPTION_H
#define ICE_EXCEPTION_H
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index 83fc7636c84..cbb4eb5ebad 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_FACTORYTABLE_H
#define ICE_FACTORYTABLE_H
diff --git a/cpp/include/Ice/FactoryTableDef.h b/cpp/include/Ice/FactoryTableDef.h
index dd4fdb3fa0c..637360bbaaf 100644
--- a/cpp/include/Ice/FactoryTableDef.h
+++ b/cpp/include/Ice/FactoryTableDef.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_FACTORY_TABLE_DEF_H
#define ICE_FACTORY_TABLE_DEF_H
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index b221ea8f769..7f1045e8813 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_FUNCTIONAL_H
#define ICE_FUNCTIONAL_H
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 6f251c7029f..c5fe59fe274 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_HANDLE_H
#define ICE_HANDLE_H
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index f6a932893b2..490c3ce70b1 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ICE_H
#define ICE_ICE_H
diff --git a/cpp/include/Ice/IdentityUtil.h b/cpp/include/Ice/IdentityUtil.h
index ae91f16dc7d..ed864a33a05 100644
--- a/cpp/include/Ice/IdentityUtil.h
+++ b/cpp/include/Ice/IdentityUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_IDENTITY_UTIL_H
#define ICE_IDENTITY_UTIL_H
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 47d081fbbe1..ca95657b322 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_INCOMING_H
#define ICE_INCOMING_H
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 3d72593cf56..b8dafb78df5 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_INCOMING_ASYNC_H
#define ICE_INCOMING_ASYNC_H
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index b8496eb84f8..3a99af6d766 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 8270564941a..16900008983 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_INITIALIZE_H
#define ICE_INITIALIZE_H
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index a925453c73c..73cae1355a9 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_INSTANCE_F_H
#define ICE_INSTANCE_F_H
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 63c61f1b140..4b16fddf1bf 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOCAL_OBJECT_H
#define ICE_LOCAL_OBJECT_H
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 5b59f1ea431..709b0ae678b 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 d21ff9d9473..ceb7daf3806 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOGGER_UTIL_H
#define ICE_LOGGER_UTIL_H
diff --git a/cpp/include/Ice/Makefile b/cpp/include/Ice/Makefile
index c4747bdf535..4876331d855 100644
--- a/cpp/include/Ice/Makefile
+++ b/cpp/include/Ice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index a9ba7718540..df362df30eb 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_H
#define ICE_OBJECT_H
diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h
index f7f71280a56..d357db8aa83 100644
--- a/cpp/include/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/include/Ice/ObjectAdapterFactoryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
#define ICE_OBJECT_ADAPTER_FACTORY_F_H
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index acf5fdf383d..0d1963a04b3 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_F_H
#define ICE_OBJECT_F_H
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 27783e8b6ce..d3db45835f7 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OUTGOING_H
#define ICE_OUTGOING_H
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 0becef7c46d..4ccda2d7542 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OUTGOING_ASYNC_H
#define ICE_OUTGOING_ASYNC_H
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index 371da9e162e..b2ba3eddb47 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OUTGOING_ASYNC_F_H
#define ICE_OUTGOING_ASYNC_F_H
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index 3fae4887c4c..ac720c15cf3 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
#define ICE_PROTOCOL_PLUGIN_FACADE_H
diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h
index c4bb1cd9ec3..0e4cfefdcc3 100644
--- a/cpp/include/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/include/Ice/ProtocolPluginFacadeF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
#define ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index d6bbad34003..5aef7898f4a 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROXY_H
#define ICE_PROXY_H
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index ee59804540f..00c75233303 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROXY_F_H
#define ICE_PROXY_F_H
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index 81ace1e4db6..0a8c57fcfee 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 2889035bade..1a63e7df34d 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROXY_HANDLE_H
#define ICE_PROXY_HANDLE_H
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index c3b96a3e493..81a8435e3d8 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_REFERENCE_F_H
#define ICE_REFERENCE_F_H
diff --git a/cpp/include/Ice/RoutingTable.h b/cpp/include/Ice/RoutingTable.h
index b4b82a62c06..b215f7ef2d3 100644
--- a/cpp/include/Ice/RoutingTable.h
+++ b/cpp/include/Ice/RoutingTable.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ROUTING_TABLE_H
#define ICE_ROUTING_TABLE_H
diff --git a/cpp/include/Ice/RoutingTableF.h b/cpp/include/Ice/RoutingTableF.h
index 1195438fcd5..56a34f22f68 100644
--- a/cpp/include/Ice/RoutingTableF.h
+++ b/cpp/include/Ice/RoutingTableF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ROUTING_TABLE_F_H
#define ICE_ROUTING_TABLE_F_H
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index 2d276d5b057..fc6d00f4a52 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 b7d0616a055..e0f80356041 100755
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVICE_H
#define ICE_SERVICE_H
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index c4286bf5b1b..aaea6efe465 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_USER_EXCEPTION_FACTORY_H
#define ICE_USER_EXCEPTION_FACTORY_H
diff --git a/cpp/include/Ice/UserExceptionFactoryF.h b/cpp/include/Ice/UserExceptionFactoryF.h
index 3b0127c42b1..a1fc7ce4f98 100644
--- a/cpp/include/Ice/UserExceptionFactoryF.h
+++ b/cpp/include/Ice/UserExceptionFactoryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_USER_EXCEPTION_FACTORYF_H
#define ICE_USER_EXCEPTION_FACTORYF_H
diff --git a/cpp/include/IceBox/Makefile b/cpp/include/IceBox/Makefile
index a8d4a901c3d..722f0358137 100644
--- a/cpp/include/IceBox/Makefile
+++ b/cpp/include/IceBox/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IcePack/Makefile b/cpp/include/IcePack/Makefile
index f76b34b4310..d5e2d7cb01f 100644
--- a/cpp/include/IcePack/Makefile
+++ b/cpp/include/IcePack/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IcePatch/ClientUtil.h b/cpp/include/IcePatch/ClientUtil.h
index 87b0f32c04d..79450082b1a 100644
--- a/cpp/include/IcePatch/ClientUtil.h
+++ b/cpp/include/IcePatch/ClientUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PATCH_CLIENT_UTIL_H
#define ICE_PATCH_CLIENT_UTIL_H
diff --git a/cpp/include/IcePatch/FileDescFactory.h b/cpp/include/IcePatch/FileDescFactory.h
index e6c14706624..147f4220a21 100644
--- a/cpp/include/IcePatch/FileDescFactory.h
+++ b/cpp/include/IcePatch/FileDescFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PATCH_FILE_DESC_FACTORY_H
#define ICE_PATCH_FILE_DESC_FACTORY_H
diff --git a/cpp/include/IcePatch/Makefile b/cpp/include/IcePatch/Makefile
index 306a2e01942..7375a0c7d22 100644
--- a/cpp/include/IcePatch/Makefile
+++ b/cpp/include/IcePatch/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h
index ebce9655c50..e2b8901b49e 100644
--- a/cpp/include/IcePatch/Util.h
+++ b/cpp/include/IcePatch/Util.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PATCH_UTIL_H
#define ICE_PATCH_UTIL_H
diff --git a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
index 6c9a2344d43..a34efc84263 100644
--- a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
+++ b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_VERIFIER_OPENSSL_H
#define ICE_SSL_CERTIFICATE_VERIFIER_OPENSSL_H
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 2f65d4f0eee..4fd6570f6ad 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -1,18 +1,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CONFIG_H
#define ICE_SSL_CONFIG_H
diff --git a/cpp/include/IceSSL/Makefile b/cpp/include/IceSSL/Makefile
index e23f97e7881..2f52c9efd86 100644
--- a/cpp/include/IceSSL/Makefile
+++ b/cpp/include/IceSSL/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceSSL/RSACertificateGen.h b/cpp/include/IceSSL/RSACertificateGen.h
index b5e86fa422e..b63b5a97a7f 100644
--- a/cpp/include/IceSSL/RSACertificateGen.h
+++ b/cpp/include/IceSSL/RSACertificateGen.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_GEN_H
#define ICE_SSL_CERTIFICATE_GEN_H
diff --git a/cpp/include/IceSSL/RSACertificateGenF.h b/cpp/include/IceSSL/RSACertificateGenF.h
index 30bf09764e7..cea7263294c 100644
--- a/cpp/include/IceSSL/RSACertificateGenF.h
+++ b/cpp/include/IceSSL/RSACertificateGenF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_GEN_F_H
#define ICE_SSL_CERTIFICATE_GEN_F_H
diff --git a/cpp/include/IceSSL/RSAKeyPair.h b/cpp/include/IceSSL/RSAKeyPair.h
index 945d0493da7..70cbe7d4665 100644
--- a/cpp/include/IceSSL/RSAKeyPair.h
+++ b/cpp/include/IceSSL/RSAKeyPair.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_RSA_KEY_PAIR_H
#define ICE_SSL_RSA_KEY_PAIR_H
diff --git a/cpp/include/IceSSL/RSAKeyPairF.h b/cpp/include/IceSSL/RSAKeyPairF.h
index d750be15ae8..fbd12b460b7 100644
--- a/cpp/include/IceSSL/RSAKeyPairF.h
+++ b/cpp/include/IceSSL/RSAKeyPairF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_RSA_KEY_PAIR_F_H
#define ICE_SSL_RSA_KEY_PAIR_F_H
diff --git a/cpp/include/IceSSL/RSAPrivateKey.h b/cpp/include/IceSSL/RSAPrivateKey.h
index dc355ce9525..ffed8dc02e4 100644
--- a/cpp/include/IceSSL/RSAPrivateKey.h
+++ b/cpp/include/IceSSL/RSAPrivateKey.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_RSA_PRIVATE_KEY_H
#define ICE_SSL_RSA_PRIVATE_KEY_H
diff --git a/cpp/include/IceSSL/RSAPrivateKeyF.h b/cpp/include/IceSSL/RSAPrivateKeyF.h
index 46c3b019209..14eac8adb4f 100644
--- a/cpp/include/IceSSL/RSAPrivateKeyF.h
+++ b/cpp/include/IceSSL/RSAPrivateKeyF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_RSA_PRIVATE_KEY_F_H
#define ICE_SSL_RSA_PRIVATE_KEY_F_H
diff --git a/cpp/include/IceSSL/RSAPublicKey.h b/cpp/include/IceSSL/RSAPublicKey.h
index dcec37086fc..8592cdd4c2f 100644
--- a/cpp/include/IceSSL/RSAPublicKey.h
+++ b/cpp/include/IceSSL/RSAPublicKey.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_RSA_PUBLIC_KEY_H
#define ICE_SSL_RSA_PUBLIC_KEY_H
diff --git a/cpp/include/IceSSL/RSAPublicKeyF.h b/cpp/include/IceSSL/RSAPublicKeyF.h
index 37cae7c06c5..105553dc73b 100644
--- a/cpp/include/IceSSL/RSAPublicKeyF.h
+++ b/cpp/include/IceSSL/RSAPublicKeyF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_RSA_PUBLIC_KEY_F_H
#define ICE_SSL_RSA_PUBLIC_KEY_F_H
diff --git a/cpp/include/IceStorm/Makefile b/cpp/include/IceStorm/Makefile
index 2e9b17cb7d0..75c7aca5f81 100644
--- a/cpp/include/IceStorm/Makefile
+++ b/cpp/include/IceStorm/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h
index 89c13de5234..fb0e232e107 100644
--- a/cpp/include/IceUtil/AbstractMutex.h
+++ b/cpp/include/IceUtil/AbstractMutex.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_ABSTRACT_MUTEX_H
#define ICE_UTIL_ABSTRACT_MUTEX_H
diff --git a/cpp/include/IceUtil/Algorithm.h b/cpp/include/IceUtil/Algorithm.h
index 71386cc30d5..341c4c3156f 100644
--- a/cpp/include/IceUtil/Algorithm.h
+++ b/cpp/include/IceUtil/Algorithm.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_ALGORITHM_H
#define ICE_UTIL_ALGORITHM_H
diff --git a/cpp/include/IceUtil/Base64.h b/cpp/include/IceUtil/Base64.h
index 843de5149cf..b4909600b6c 100644
--- a/cpp/include/IceUtil/Base64.h
+++ b/cpp/include/IceUtil/Base64.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_BASE_64_H
#define ICE_UTIL_BASE_64_H
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h
index 295aa270cd0..c185b418006 100644
--- a/cpp/include/IceUtil/Cache.h
+++ b/cpp/include/IceUtil/Cache.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_CACHE_H
#define ICE_UTIL_CACHE_H
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index c60f33552be..e076c9b3d2f 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_COND_H
#define ICE_UTIL_COND_H
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 3225af83584..6b83d0e361e 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_CONFIG_H
#define ICE_UTIL_CONFIG_H
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index 92bd29ad484..e85b3fc8031 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#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 a3d2200351b..98d963371ab 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_CTRL_C_HANDLER_H
#define ICE_UTIL_CTRL_C_HANDLER_H
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index ff1221f6731..0010bab3d47 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_EXCEPTION_H
#define ICE_UTIL_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index a070f70dc56..c0fe7a8fa30 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_FUNCTIONAL_H
#define ICE_UTIL_FUNCTIONAL_H
diff --git a/cpp/include/IceUtil/GC.h b/cpp/include/IceUtil/GC.h
index 64a0d2efa5d..2e1d5208de1 100644
--- a/cpp/include/IceUtil/GC.h
+++ b/cpp/include/IceUtil/GC.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_GC_H
#define ICE_GC_H
diff --git a/cpp/include/IceUtil/GCRecMutex.h b/cpp/include/IceUtil/GCRecMutex.h
index 19b99701964..f82ef2d7d4c 100644
--- a/cpp/include/IceUtil/GCRecMutex.h
+++ b/cpp/include/IceUtil/GCRecMutex.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_GC_REC_MUTEX_H
#define ICE_GC_REC_MUTEX_H
diff --git a/cpp/include/IceUtil/GCShared.h b/cpp/include/IceUtil/GCShared.h
index cfa9a1803e3..18be995b2a6 100644
--- a/cpp/include/IceUtil/GCShared.h
+++ b/cpp/include/IceUtil/GCShared.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_GC_SHARED_H
#define ICE_UTIL_GC_SHARED_H
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 0c4d93a8908..26a0738ab9c 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_HANDLE_H
#define ICE_UTIL_HANDLE_H
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index ff043ceefb9..0b9d0117c6b 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 d8d54c6fa56..8631d83bd8c 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 04e66348a6e..ecb2a1dca69 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_ITERATOR_H
#define ICE_UTIL_ITERATOR_H
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 9d466b1a1b6..56d347b52c0 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_LOCK_H
#define ICE_UTIL_LOCK_H
diff --git a/cpp/include/IceUtil/Makefile b/cpp/include/IceUtil/Makefile
index 2b5e63c4bac..75f9045bc94 100644
--- a/cpp/include/IceUtil/Makefile
+++ b/cpp/include/IceUtil/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index bdb1e02039c..63845f5338d 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_MONITOR_H
#define ICE_UTIL_MONITOR_H
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index c48191337e8..7e01e767eab 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_MUTEX_H
#define ICE_UTIL_MUTEX_H
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index 484e7ad7661..d42bc8cee0a 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_OUTPUT_UTIL_H
#define ICE_UTIL_OUTPUT_UTIL_H
diff --git a/cpp/include/IceUtil/RWRecMutex.h b/cpp/include/IceUtil/RWRecMutex.h
index eb1e9df51f6..163a0f98f0b 100644
--- a/cpp/include/IceUtil/RWRecMutex.h
+++ b/cpp/include/IceUtil/RWRecMutex.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_RW_REC_MUTEX_H
#define ICE_UTIL_RW_REC_MUTEX_H
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 528e44af7cd..0b284bd6bb7 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_RMUTEX_H
#define ICE_UTIL_RMUTEX_H
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index a6a7aff8895..2cbd20f3cad 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_SHARED_H
#define ICE_UTIL_SHARED_H
diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h
index 7650fe6224d..6dd867ae480 100644
--- a/cpp/include/IceUtil/StaticMutex.h
+++ b/cpp/include/IceUtil/StaticMutex.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_STATIC_MUTEX_H
#define ICE_UTIL_STATIC_MUTEX_H
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 9c7f05c0d9c..a5d7699fc5c 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STRING_UTIL_H
#define ICE_STRING_UTIL_H
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 5afbab260ec..8b2581097d5 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_THREAD_H
#define ICE_UTIL_THREAD_H
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 2a39b93d2d8..65dbe4ace86 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 c503f587121..e4d4c20e025 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_TIME_H
#define ICE_UTIL_TIME_H
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index b99fefe66eb..5a0a4afa506 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_UUID_H
#define ICE_UTIL_UUID_H
diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h
index 75ae345a90c..9f986891c24 100644
--- a/cpp/include/IceUtil/Unicode.h
+++ b/cpp/include/IceUtil/Unicode.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UTIL_UNICODE_H
#define ICE_UTIL_UNICODE_H
diff --git a/cpp/include/IceXML/Makefile b/cpp/include/IceXML/Makefile
index 2dcecfc5f61..e9574c23767 100644
--- a/cpp/include/IceXML/Makefile
+++ b/cpp/include/IceXML/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h
index 3c2205df153..7c6332a5213 100644
--- a/cpp/include/IceXML/Parser.h
+++ b/cpp/include/IceXML/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_XML_PARSER_H
#define ICE_XML_PARSER_H
diff --git a/cpp/include/Makefile b/cpp/include/Makefile
index cd1c742d2c0..be8b09162d2 100644
--- a/cpp/include/Makefile
+++ b/cpp/include/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index c1a746b32a0..8fc4f03e5a4 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef C_PLUS_PLUS_UTIL_H
#define C_PLUS_PLUS_UTIL_H
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index da08b104f0a..08ea6bc3c20 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CS_UTIL_H
#define CS_UTIL_H
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index 3d1405e348b..79681a06b17 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef JAVA_UTIL_H
#define JAVA_UTIL_H
diff --git a/cpp/include/Slice/Makefile b/cpp/include/Slice/Makefile
index 6b22617dcef..c8ad333ef18 100644
--- a/cpp/include/Slice/Makefile
+++ b/cpp/include/Slice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 16debcedcca..22a32857c13 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SLICE_PARSER_H
#define SLICE_PARSER_H
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index 273c31f3d49..5b1e66f7f03 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PREPROCESSOR_H
#define PREPROCESSOR_H
diff --git a/cpp/makedist.py b/cpp/makedist.py
index 06e74e7f62e..b123e46fe69 100755
--- a/cpp/makedist.py
+++ b/cpp/makedist.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys, shutil, fnmatch, re, glob
#
diff --git a/cpp/slice/Freeze/Connection.ice b/cpp/slice/Freeze/Connection.ice
index 7cda6dff368..9bce802571a 100755
--- a/cpp/slice/Freeze/Connection.ice
+++ b/cpp/slice/Freeze/Connection.ice
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef FREEZE_CONNECTION_ICE
#define FREEZE_CONNECTION_ICE
diff --git a/cpp/slice/Freeze/ConnectionF.ice b/cpp/slice/Freeze/ConnectionF.ice
index 4357f40bb4f..329e0938f41 100644
--- a/cpp/slice/Freeze/ConnectionF.ice
+++ b/cpp/slice/Freeze/ConnectionF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_CONNECTION_F_ICE
#define FREEZE_CONNECTION_F_ICE
diff --git a/cpp/slice/Freeze/DB.ice b/cpp/slice/Freeze/DB.ice
index 31a651bb525..2c88fd7fb65 100644
--- a/cpp/slice/Freeze/DB.ice
+++ b/cpp/slice/Freeze/DB.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_DB_ICE
#define FREEZE_DB_ICE
diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice
index bd5770ea0ef..8c06d410b2d 100644
--- a/cpp/slice/Freeze/Evictor.ice
+++ b/cpp/slice/Freeze/Evictor.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003-2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_EVICTOR_ICE
#define FREEZE_EVICTOR_ICE
diff --git a/cpp/slice/Freeze/EvictorF.ice b/cpp/slice/Freeze/EvictorF.ice
index 4b58e4c56aa..30526f18c2e 100644
--- a/cpp/slice/Freeze/EvictorF.ice
+++ b/cpp/slice/Freeze/EvictorF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_EVICTOR_F_ICE
#define FREEZE_EVICTOR_F_ICE
diff --git a/cpp/slice/Freeze/EvictorStorage.ice b/cpp/slice/Freeze/EvictorStorage.ice
index 50b1bfd6c8d..7e0c437a258 100644
--- a/cpp/slice/Freeze/EvictorStorage.ice
+++ b/cpp/slice/Freeze/EvictorStorage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_EVICTOR_STORAGE_ICE
#define FREEZE_EVICTOR_STORAGE_ICE
diff --git a/cpp/slice/Freeze/Exception.ice b/cpp/slice/Freeze/Exception.ice
index 76cefcaa629..9c2bd783b91 100644
--- a/cpp/slice/Freeze/Exception.ice
+++ b/cpp/slice/Freeze/Exception.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_EXCEPTION_ICE
#define FREEZE_EXCEPTION_ICE
diff --git a/cpp/slice/Freeze/Makefile b/cpp/slice/Freeze/Makefile
index d86ef4d48f4..d20798a8ec9 100644
--- a/cpp/slice/Freeze/Makefile
+++ b/cpp/slice/Freeze/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/Freeze/Transaction.ice b/cpp/slice/Freeze/Transaction.ice
index addf76aaddd..2756ca861fb 100755
--- a/cpp/slice/Freeze/Transaction.ice
+++ b/cpp/slice/Freeze/Transaction.ice
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
#ifndef FREEZE_TRANSACTION_ICE
#define FREEZE_TRANSACTION_ICE
diff --git a/cpp/slice/Glacier/Makefile b/cpp/slice/Glacier/Makefile
index a8008c61366..c2435235926 100644
--- a/cpp/slice/Glacier/Makefile
+++ b/cpp/slice/Glacier/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/Glacier/Router.ice b/cpp/slice/Glacier/Router.ice
index 085c7a4d33d..58effff1059 100644
--- a/cpp/slice/Glacier/Router.ice
+++ b/cpp/slice/Glacier/Router.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_ROUTER_ICE
#define GLACIER_ROUTER_ICE
diff --git a/cpp/slice/Glacier/Session.ice b/cpp/slice/Glacier/Session.ice
index 4ba335d4c27..c89528fdf1f 100644
--- a/cpp/slice/Glacier/Session.ice
+++ b/cpp/slice/Glacier/Session.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_SESSION_ICE
#define GLACIER_SESSION_ICE
diff --git a/cpp/slice/Glacier/SessionF.ice b/cpp/slice/Glacier/SessionF.ice
index eb6c63b8edc..05e72069fb9 100644
--- a/cpp/slice/Glacier/SessionF.ice
+++ b/cpp/slice/Glacier/SessionF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_SESSION_F_ICE
#define GLACIER_SESSION_F_ICE
diff --git a/cpp/slice/Glacier/SessionManager.ice b/cpp/slice/Glacier/SessionManager.ice
index 58cc4a0aea1..0375a8cda21 100644
--- a/cpp/slice/Glacier/SessionManager.ice
+++ b/cpp/slice/Glacier/SessionManager.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_SESSION_MANAGER_ICE
#define GLACIER_SESSION_MANAGER_ICE
diff --git a/cpp/slice/Glacier/SessionManagerF.ice b/cpp/slice/Glacier/SessionManagerF.ice
index 802d432d81c..d589d7f524c 100644
--- a/cpp/slice/Glacier/SessionManagerF.ice
+++ b/cpp/slice/Glacier/SessionManagerF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_SESSION_MANAGER_F_ICE
#define GLACIER_SESSION_MANAGER_F_ICE
diff --git a/cpp/slice/Glacier/Starter.ice b/cpp/slice/Glacier/Starter.ice
index ba43ec87672..8454dc38059 100644
--- a/cpp/slice/Glacier/Starter.ice
+++ b/cpp/slice/Glacier/Starter.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_ICE
#define GLACIER_ICE
diff --git a/cpp/slice/Ice/BuiltinSequences.ice b/cpp/slice/Ice/BuiltinSequences.ice
index 7ed77a475eb..7824ebae253 100644
--- a/cpp/slice/Ice/BuiltinSequences.ice
+++ b/cpp/slice/Ice/BuiltinSequences.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_BUILTIN_SEQUENCES_ICE
#define ICE_BUILTIN_SEQUENCES_ICE
diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice
index ed003a75b5e..e8958149dae 100644
--- a/cpp/slice/Ice/Communicator.ice
+++ b/cpp/slice/Ice/Communicator.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_COMMUNICATOR_ICE
#define ICE_COMMUNICATOR_ICE
diff --git a/cpp/slice/Ice/CommunicatorF.ice b/cpp/slice/Ice/CommunicatorF.ice
index 4f0fbbc73fc..2b2f83d1589 100644
--- a/cpp/slice/Ice/CommunicatorF.ice
+++ b/cpp/slice/Ice/CommunicatorF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_COMMUNICATOR_F_ICE
#define ICE_COMMUNICATOR_F_ICE
diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice
index fba2fcb81a0..ee569bf2a25 100644
--- a/cpp/slice/Ice/Current.ice
+++ b/cpp/slice/Ice/Current.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CURRENT_ICE
#define ICE_CURRENT_ICE
diff --git a/cpp/slice/Ice/Identity.ice b/cpp/slice/Ice/Identity.ice
index 3eeda7f6366..beb1a5c75bd 100644
--- a/cpp/slice/Ice/Identity.ice
+++ b/cpp/slice/Ice/Identity.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_IDENTITY_ICE
#define ICE_IDENTITY_ICE
diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice
index b196c664148..a5c1e1935e4 100644
--- a/cpp/slice/Ice/LocalException.ice
+++ b/cpp/slice/Ice/LocalException.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOCAL_EXCEPTION_ICE
#define ICE_LOCAL_EXCEPTION_ICE
diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice
index 65238e0f731..21af0c51896 100644
--- a/cpp/slice/Ice/Locator.ice
+++ b/cpp/slice/Ice/Locator.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOCATOR_ICE
#define ICE_LOCATOR_ICE
diff --git a/cpp/slice/Ice/LocatorF.ice b/cpp/slice/Ice/LocatorF.ice
index c31a2bb855f..be175252758 100644
--- a/cpp/slice/Ice/LocatorF.ice
+++ b/cpp/slice/Ice/LocatorF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOCATOR_F_ICE
#define ICE_LOCATOR_F_ICE
diff --git a/cpp/slice/Ice/Logger.ice b/cpp/slice/Ice/Logger.ice
index 9c9589385d8..700618503e7 100644
--- a/cpp/slice/Ice/Logger.ice
+++ b/cpp/slice/Ice/Logger.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOGGER_ICE
#define ICE_LOGGER_ICE
diff --git a/cpp/slice/Ice/LoggerF.ice b/cpp/slice/Ice/LoggerF.ice
index cd03d292cf5..d3684e06fa5 100644
--- a/cpp/slice/Ice/LoggerF.ice
+++ b/cpp/slice/Ice/LoggerF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOGGER_F_ICE
#define ICE_LOGGER_F_ICE
diff --git a/cpp/slice/Ice/Makefile b/cpp/slice/Ice/Makefile
index 2b34e3ab725..342eb433343 100644
--- a/cpp/slice/Ice/Makefile
+++ b/cpp/slice/Ice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index 705ffd1a530..fc1b8c29de8 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_ADAPTER_ICE
#define ICE_OBJECT_ADAPTER_ICE
diff --git a/cpp/slice/Ice/ObjectAdapterF.ice b/cpp/slice/Ice/ObjectAdapterF.ice
index 279e9bc36fe..433b1683409 100644
--- a/cpp/slice/Ice/ObjectAdapterF.ice
+++ b/cpp/slice/Ice/ObjectAdapterF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_ADAPTER_F_ICE
#define ICE_OBJECT_ADAPTER_F_ICE
diff --git a/cpp/slice/Ice/ObjectFactory.ice b/cpp/slice/Ice/ObjectFactory.ice
index 3db5100937e..7e482487b7c 100644
--- a/cpp/slice/Ice/ObjectFactory.ice
+++ b/cpp/slice/Ice/ObjectFactory.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_FACTORY_ICE
#define ICE_OBJECT_FACTORY_ICE
diff --git a/cpp/slice/Ice/ObjectFactoryF.ice b/cpp/slice/Ice/ObjectFactoryF.ice
index 60c3463588f..8c21c25a2c1 100644
--- a/cpp/slice/Ice/ObjectFactoryF.ice
+++ b/cpp/slice/Ice/ObjectFactoryF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVANT_FACTORY_F_ICE
#define ICE_SERVANT_FACTORY_F_ICE
diff --git a/cpp/slice/Ice/Plugin.ice b/cpp/slice/Ice/Plugin.ice
index 750f3951ecc..870e6cf119f 100644
--- a/cpp/slice/Ice/Plugin.ice
+++ b/cpp/slice/Ice/Plugin.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PLUGIN_ICE
#define ICE_PLUGIN_ICE
diff --git a/cpp/slice/Ice/PluginF.ice b/cpp/slice/Ice/PluginF.ice
index cbe04a50d7b..2992eb8a034 100644
--- a/cpp/slice/Ice/PluginF.ice
+++ b/cpp/slice/Ice/PluginF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PLUGIN_F_ICE
#define ICE_PLUGIN_F_ICE
diff --git a/cpp/slice/Ice/Process.ice b/cpp/slice/Ice/Process.ice
index dd9369809bc..61f2076a71d 100644
--- a/cpp/slice/Ice/Process.ice
+++ b/cpp/slice/Ice/Process.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROCESS_ICE
#define ICE_PROCESS_ICE
diff --git a/cpp/slice/Ice/ProcessF.ice b/cpp/slice/Ice/ProcessF.ice
index f78db5c617e..a18e9c1f7b7 100644
--- a/cpp/slice/Ice/ProcessF.ice
+++ b/cpp/slice/Ice/ProcessF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROCESS_F_ICE
#define ICE_PROCESS_F_ICE
diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice
index 4ff5aee0c3a..7fbdb5f4f1b 100644
--- a/cpp/slice/Ice/Properties.ice
+++ b/cpp/slice/Ice/Properties.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROPERTIES_ICE
#define ICE_PROPERTIES_ICE
diff --git a/cpp/slice/Ice/PropertiesF.ice b/cpp/slice/Ice/PropertiesF.ice
index 53368e96f14..a7a7f751443 100644
--- a/cpp/slice/Ice/PropertiesF.ice
+++ b/cpp/slice/Ice/PropertiesF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROPERTIES_F_ICE
#define ICE_PROPERTIES_F_ICE
diff --git a/cpp/slice/Ice/Router.ice b/cpp/slice/Ice/Router.ice
index 463e8ef2583..b4ca9990ce6 100644
--- a/cpp/slice/Ice/Router.ice
+++ b/cpp/slice/Ice/Router.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ROUTER_ICE
#define ICE_ROUTER_ICE
diff --git a/cpp/slice/Ice/RouterF.ice b/cpp/slice/Ice/RouterF.ice
index b4d2399be4b..f78734f812f 100644
--- a/cpp/slice/Ice/RouterF.ice
+++ b/cpp/slice/Ice/RouterF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ROUTER_F_ICE
#define ICE_ROUTER_F_ICE
diff --git a/cpp/slice/Ice/ServantLocator.ice b/cpp/slice/Ice/ServantLocator.ice
index 7dfed33e3c5..5e67c2a973c 100644
--- a/cpp/slice/Ice/ServantLocator.ice
+++ b/cpp/slice/Ice/ServantLocator.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVANT_LOCATOR_ICE
#define ICE_SERVANT_LOCATOR_ICE
diff --git a/cpp/slice/Ice/ServantLocatorF.ice b/cpp/slice/Ice/ServantLocatorF.ice
index 689f252d669..eca0ff2b99b 100644
--- a/cpp/slice/Ice/ServantLocatorF.ice
+++ b/cpp/slice/Ice/ServantLocatorF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVANT_LOCATOR_F_ICE
#define ICE_SERVANT_LOCATOR_F_ICE
diff --git a/cpp/slice/Ice/Stats.ice b/cpp/slice/Ice/Stats.ice
index cd9bfd97f7e..a9a68f6c9d6 100644
--- a/cpp/slice/Ice/Stats.ice
+++ b/cpp/slice/Ice/Stats.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STATS_ICE
#define ICE_STATS_ICE
diff --git a/cpp/slice/Ice/StatsF.ice b/cpp/slice/Ice/StatsF.ice
index d4ac50b38ba..7b04808ab66 100644
--- a/cpp/slice/Ice/StatsF.ice
+++ b/cpp/slice/Ice/StatsF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STATS_F_ICE
#define ICE_STATS_F_ICE
diff --git a/cpp/slice/IceBox/IceBox.ice b/cpp/slice/IceBox/IceBox.ice
index aef5ee60134..5b7dffe9a91 100644
--- a/cpp/slice/IceBox/IceBox.ice
+++ b/cpp/slice/IceBox/IceBox.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_BOX_ICE_BOX_ICE
#define ICE_BOX_ICE_BOX_ICE
diff --git a/cpp/slice/IceBox/Makefile b/cpp/slice/IceBox/Makefile
index 5bc10cf546c..50675bf3727 100644
--- a/cpp/slice/IceBox/Makefile
+++ b/cpp/slice/IceBox/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/IcePack/Admin.ice b/cpp/slice/IcePack/Admin.ice
index cbc975b56a8..5b60a6e0e7b 100644
--- a/cpp/slice/IcePack/Admin.ice
+++ b/cpp/slice/IcePack/Admin.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ADMIN_ICE
#define ICE_PACK_ADMIN_ICE
diff --git a/cpp/slice/IcePack/Exception.ice b/cpp/slice/IcePack/Exception.ice
index a0377e274db..26436a27688 100644
--- a/cpp/slice/IcePack/Exception.ice
+++ b/cpp/slice/IcePack/Exception.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_EXCEPTION_ICE
#define ICE_PACK_EXCEPTION_ICE
diff --git a/cpp/slice/IcePack/Makefile b/cpp/slice/IcePack/Makefile
index 54e30937188..cd22ffd2d7a 100644
--- a/cpp/slice/IcePack/Makefile
+++ b/cpp/slice/IcePack/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/IcePack/Query.ice b/cpp/slice/IcePack/Query.ice
index c183aa52d1b..69d202b7920 100644
--- a/cpp/slice/IcePack/Query.ice
+++ b/cpp/slice/IcePack/Query.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_QUERY_ICE
#define ICE_PACK_QUERY_ICE
diff --git a/cpp/slice/IcePatch/IcePatch.ice b/cpp/slice/IcePatch/IcePatch.ice
index 275ae0ddfb4..9189b511682 100644
--- a/cpp/slice/IcePatch/IcePatch.ice
+++ b/cpp/slice/IcePatch/IcePatch.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PATCH_ICE_PATCH_ICE
#define ICE_PATCH_ICE_PATCH_ICE
diff --git a/cpp/slice/IcePatch/Makefile b/cpp/slice/IcePatch/Makefile
index 3639f7507e5..26514c12a2d 100644
--- a/cpp/slice/IcePatch/Makefile
+++ b/cpp/slice/IcePatch/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/IceSSL/CertificateVerifier.ice b/cpp/slice/IceSSL/CertificateVerifier.ice
index a1f03fc7523..842ebb09a76 100644
--- a/cpp/slice/IceSSL/CertificateVerifier.ice
+++ b/cpp/slice/IceSSL/CertificateVerifier.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_VERIFIER_ICE
#define ICE_SSL_CERTIFICATE_VERIFIER_ICE
diff --git a/cpp/slice/IceSSL/CertificateVerifierF.ice b/cpp/slice/IceSSL/CertificateVerifierF.ice
index fa5760a1537..1637d61c8c1 100644
--- a/cpp/slice/IceSSL/CertificateVerifierF.ice
+++ b/cpp/slice/IceSSL/CertificateVerifierF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_VERIFIER_F_ICE
#define ICE_SSL_CERTIFICATE_VERIFIER_F_ICE
diff --git a/cpp/slice/IceSSL/Exception.ice b/cpp/slice/IceSSL/Exception.ice
index 1c2111fab4f..85de44199e2 100644
--- a/cpp/slice/IceSSL/Exception.ice
+++ b/cpp/slice/IceSSL/Exception.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_EXCEPTION_ICE
#define ICE_SSL_EXCEPTION_ICE
diff --git a/cpp/slice/IceSSL/Makefile b/cpp/slice/IceSSL/Makefile
index 82f3e8f6b31..0ff025a10c9 100644
--- a/cpp/slice/IceSSL/Makefile
+++ b/cpp/slice/IceSSL/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/IceSSL/Plugin.ice b/cpp/slice/IceSSL/Plugin.ice
index e55db6abeff..e0f336167de 100644
--- a/cpp/slice/IceSSL/Plugin.ice
+++ b/cpp/slice/IceSSL/Plugin.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_PLUGIN_ICE
#define ICE_SSL_PLUGIN_ICE
diff --git a/cpp/slice/IceSSL/PluginF.ice b/cpp/slice/IceSSL/PluginF.ice
index a6196d60e4f..b706f560a4c 100644
--- a/cpp/slice/IceSSL/PluginF.ice
+++ b/cpp/slice/IceSSL/PluginF.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_PLUGIN_F_ICE
#define ICE_SSL_PLUGIN_F_ICE
diff --git a/cpp/slice/IceStorm/IceStorm.ice b/cpp/slice/IceStorm/IceStorm.ice
index c6776df6f96..d359d572ad6 100644
--- a/cpp/slice/IceStorm/IceStorm.ice
+++ b/cpp/slice/IceStorm/IceStorm.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STORM_ICE
#define ICE_STORM_ICE
diff --git a/cpp/slice/IceStorm/Makefile b/cpp/slice/IceStorm/Makefile
index 4804cc58782..15041e34d6b 100644
--- a/cpp/slice/IceStorm/Makefile
+++ b/cpp/slice/IceStorm/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/slice/Makefile b/cpp/slice/Makefile
index a711dff804d..96b63f42e3c 100644
--- a/cpp/slice/Makefile
+++ b/cpp/slice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp
index 4934925bcc4..55864b18840 100644
--- a/cpp/src/Freeze/ConnectionI.cpp
+++ b/cpp/src/Freeze/ConnectionI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/ConnectionI.h>
#include <Freeze/MapI.h>
#include <Freeze/Initialize.h>
diff --git a/cpp/src/Freeze/ConnectionI.h b/cpp/src/Freeze/ConnectionI.h
index ba0b9f5b556..9bc308e6357 100644
--- a/cpp/src/Freeze/ConnectionI.h
+++ b/cpp/src/Freeze/ConnectionI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_CONNECTIONI_H
#define FREEZE_CONNECTIONI_H
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index f7b988f8f36..654cc24240a 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003-2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/EvictorI.h>
#include <Freeze/Initialize.h>
#include <IceUtil/AbstractMutex.h>
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index b5d61be1ae2..d1a0f9ed3b9 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003-2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_EVICTOR_I_H
#define FREEZE_EVICTOR_I_H
diff --git a/cpp/src/Freeze/EvictorIteratorI.cpp b/cpp/src/Freeze/EvictorIteratorI.cpp
index b4a6386ac6d..1fec3fb94ed 100644
--- a/cpp/src/Freeze/EvictorIteratorI.cpp
+++ b/cpp/src/Freeze/EvictorIteratorI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003-2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/EvictorIteratorI.h>
#include <Freeze/ObjectStore.h>
#include <Freeze/EvictorI.h>
diff --git a/cpp/src/Freeze/EvictorIteratorI.h b/cpp/src/Freeze/EvictorIteratorI.h
index 1b292cd0d96..1408c94f555 100644
--- a/cpp/src/Freeze/EvictorIteratorI.h
+++ b/cpp/src/Freeze/EvictorIteratorI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_EVICTOR_ITERATOR_I_H
#define FREEZE_EVICTOR_ITERATOR_I_H
diff --git a/cpp/src/Freeze/Index.cpp b/cpp/src/Freeze/Index.cpp
index a5343171740..ebe80fb4226 100644
--- a/cpp/src/Freeze/Index.cpp
+++ b/cpp/src/Freeze/Index.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/Index.h>
#include <Freeze/IndexI.h>
diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp
index 48ed36c874f..6e2bf08ad47 100644
--- a/cpp/src/Freeze/IndexI.cpp
+++ b/cpp/src/Freeze/IndexI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003-2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/IndexI.h>
#include <Freeze/Util.h>
#include <Freeze/ObjectStore.h>
diff --git a/cpp/src/Freeze/IndexI.h b/cpp/src/Freeze/IndexI.h
index 73af92f97f2..bf637408b0f 100644
--- a/cpp/src/Freeze/IndexI.h
+++ b/cpp/src/Freeze/IndexI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_INDEX_I_H
#define FREEZE_INDEX_I_H
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 0368b1788e1..711e373fca7 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,Freeze,$(VERSION))
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
index 0ce27824a86..36eb69fe0bf 100644
--- a/cpp/src/Freeze/MapI.cpp
+++ b/cpp/src/Freeze/MapI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/MapI.h>
#include <Freeze/Exception.h>
#include <Freeze/SharedDb.h>
diff --git a/cpp/src/Freeze/MapI.h b/cpp/src/Freeze/MapI.h
index 05c4720eb5e..a5681554b7d 100644
--- a/cpp/src/Freeze/MapI.h
+++ b/cpp/src/Freeze/MapI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_MAP_I_H
#define FREEZE_MAP_I_H
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp
index ab45a2da208..cae14a90935 100644
--- a/cpp/src/Freeze/ObjectStore.cpp
+++ b/cpp/src/Freeze/ObjectStore.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/ObjectStore.h>
#include <Freeze/EvictorI.h>
#include <Freeze/Util.h>
diff --git a/cpp/src/Freeze/ObjectStore.h b/cpp/src/Freeze/ObjectStore.h
index 8e0c2a500ca..9b3f044dc87 100644
--- a/cpp/src/Freeze/ObjectStore.h
+++ b/cpp/src/Freeze/ObjectStore.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_OBJECT_STORE_H
#define FREEZE_OBJECT_STORE_H
diff --git a/cpp/src/Freeze/SharedDb.cpp b/cpp/src/Freeze/SharedDb.cpp
index 19e88243a29..f3fc331f39f 100644
--- a/cpp/src/Freeze/SharedDb.cpp
+++ b/cpp/src/Freeze/SharedDb.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/SharedDb.h>
#include <IceUtil/StaticMutex.h>
#include <Freeze/Exception.h>
diff --git a/cpp/src/Freeze/SharedDb.h b/cpp/src/Freeze/SharedDb.h
index c2fad563dd7..3c3ad41bdd1 100644
--- a/cpp/src/Freeze/SharedDb.h
+++ b/cpp/src/Freeze/SharedDb.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SHARED_DB_H
#define FREEZE_SHARED_DB_H
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp
index f088c65511d..c42d97a0d6d 100644
--- a/cpp/src/Freeze/SharedDbEnv.cpp
+++ b/cpp/src/Freeze/SharedDbEnv.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/SharedDbEnv.h>
#include <IceUtil/StaticMutex.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/src/Freeze/SharedDbEnv.h b/cpp/src/Freeze/SharedDbEnv.h
index 20874777d71..c7f884f31d2 100644
--- a/cpp/src/Freeze/SharedDbEnv.h
+++ b/cpp/src/Freeze/SharedDbEnv.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SHARED_DB_ENV_H
#define FREEZE_SHARED_DB_ENV_H
diff --git a/cpp/src/Freeze/TransactionHolder.cpp b/cpp/src/Freeze/TransactionHolder.cpp
index 8b758624467..232243d1ab2 100644
--- a/cpp/src/Freeze/TransactionHolder.cpp
+++ b/cpp/src/Freeze/TransactionHolder.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/TransactionHolder.h>
using namespace Freeze;
diff --git a/cpp/src/Freeze/TransactionI.cpp b/cpp/src/Freeze/TransactionI.cpp
index 514800a741f..104d8578878 100644
--- a/cpp/src/Freeze/TransactionI.cpp
+++ b/cpp/src/Freeze/TransactionI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/TransactionI.h>
#include <Freeze/ConnectionI.h>
#include <Freeze/Exception.h>
diff --git a/cpp/src/Freeze/TransactionI.h b/cpp/src/Freeze/TransactionI.h
index e3e4e73ef9f..7ce7a3d0404 100644
--- a/cpp/src/Freeze/TransactionI.h
+++ b/cpp/src/Freeze/TransactionI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_TRANSACTIONI_H
#define FREEZE_TRANSACTIONI_H
diff --git a/cpp/src/Freeze/Util.cpp b/cpp/src/Freeze/Util.cpp
index f148429d68f..c2fe143e012 100644
--- a/cpp/src/Freeze/Util.cpp
+++ b/cpp/src/Freeze/Util.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/Util.h>
#include <Freeze/Exception.h>
diff --git a/cpp/src/Freeze/Util.h b/cpp/src/Freeze/Util.h
index bde789ce8f1..ddcaf61bea2 100644
--- a/cpp/src/Freeze/Util.h
+++ b/cpp/src/Freeze/Util.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_UTIL_H
#define FREEZE_UTIL_H
diff --git a/cpp/src/FreezeScript/AssignVisitor.cpp b/cpp/src/FreezeScript/AssignVisitor.cpp
index ec1fb7ea5da..6b69ae59ac8 100644
--- a/cpp/src/FreezeScript/AssignVisitor.cpp
+++ b/cpp/src/FreezeScript/AssignVisitor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/AssignVisitor.h>
#include <FreezeScript/Util.h>
diff --git a/cpp/src/FreezeScript/AssignVisitor.h b/cpp/src/FreezeScript/AssignVisitor.h
index f9a4d4031d5..4f8dcdaaf20 100644
--- a/cpp/src/FreezeScript/AssignVisitor.h
+++ b/cpp/src/FreezeScript/AssignVisitor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_ASSIGN_VISITOR_H
#define FREEZE_SCRIPT_ASSIGN_VISITOR_H
diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp
index 9435add2f95..e1966c49576 100644
--- a/cpp/src/FreezeScript/Data.cpp
+++ b/cpp/src/FreezeScript/Data.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Data.h>
#include <FreezeScript/Util.h>
#include <FreezeScript/Exception.h>
diff --git a/cpp/src/FreezeScript/Data.h b/cpp/src/FreezeScript/Data.h
index b7adb5c7da6..751739e85ad 100644
--- a/cpp/src/FreezeScript/Data.h
+++ b/cpp/src/FreezeScript/Data.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_DATA_H
#define FREEZE_SCRIPT_DATA_H
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index acd93c25837..7f39c1a65ce 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/DumpDescriptors.h>
#include <FreezeScript/Util.h>
#include <FreezeScript/Exception.h>
diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp
index 97b46feb112..f2475c60d8b 100644
--- a/cpp/src/FreezeScript/DumpDescriptors.cpp
+++ b/cpp/src/FreezeScript/DumpDescriptors.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/DumpDescriptors.h>
#include <FreezeScript/AssignVisitor.h>
#include <FreezeScript/Print.h>
diff --git a/cpp/src/FreezeScript/DumpDescriptors.h b/cpp/src/FreezeScript/DumpDescriptors.h
index 701de89e266..b304e968d51 100644
--- a/cpp/src/FreezeScript/DumpDescriptors.h
+++ b/cpp/src/FreezeScript/DumpDescriptors.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_DUMP_DESCRIPTORS_H
#define FREEZE_SCRIPT_DUMP_DESCRIPTORS_H
diff --git a/cpp/src/FreezeScript/Error.cpp b/cpp/src/FreezeScript/Error.cpp
index 4c906f558f9..517fc69838b 100644
--- a/cpp/src/FreezeScript/Error.cpp
+++ b/cpp/src/FreezeScript/Error.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Error.h>
#include <FreezeScript/Exception.h>
#include <FreezeScript/Util.h>
diff --git a/cpp/src/FreezeScript/Error.h b/cpp/src/FreezeScript/Error.h
index 33affea978d..ada113f6810 100644
--- a/cpp/src/FreezeScript/Error.h
+++ b/cpp/src/FreezeScript/Error.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_ERROR_H
#define FREEZE_SCRIPT_ERROR_H
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
index bc4df45df3b..7e77be65302 100644
--- a/cpp/src/FreezeScript/Exception.cpp
+++ b/cpp/src/FreezeScript/Exception.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Exception.h>
using namespace std;
diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h
index 9f9a7aaf5c7..c4eea166b35 100644
--- a/cpp/src/FreezeScript/Exception.h
+++ b/cpp/src/FreezeScript/Exception.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_EXCEPTION_H
#define FREEZE_SCRIPT_EXCEPTION_H
diff --git a/cpp/src/FreezeScript/Functions.cpp b/cpp/src/FreezeScript/Functions.cpp
index d1b6344e907..f70aa9efbd0 100644
--- a/cpp/src/FreezeScript/Functions.cpp
+++ b/cpp/src/FreezeScript/Functions.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Functions.h>
#include <FreezeScript/Util.h>
#include <IceUtil/UUID.h>
diff --git a/cpp/src/FreezeScript/Functions.h b/cpp/src/FreezeScript/Functions.h
index 0dcb9f272b9..7c67a85f75c 100644
--- a/cpp/src/FreezeScript/Functions.h
+++ b/cpp/src/FreezeScript/Functions.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_FUNCTIONS_H
#define FREEZE_SCRIPT_FUNCTIONS_H
diff --git a/cpp/src/FreezeScript/Grammar.y b/cpp/src/FreezeScript/Grammar.y
index 9793fc73008..642837069de 100644
--- a/cpp/src/FreezeScript/Grammar.y
+++ b/cpp/src/FreezeScript/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/GrammarUtil.h>
#ifdef _WIN32
diff --git a/cpp/src/FreezeScript/GrammarUtil.h b/cpp/src/FreezeScript/GrammarUtil.h
index 1a438a1f573..c7accce5294 100644
--- a/cpp/src/FreezeScript/GrammarUtil.h
+++ b/cpp/src/FreezeScript/GrammarUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_GRAMMAR_UTIL_H
#define FREEZE_SCRIPT_GRAMMAR_UTIL_H
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index 0cd511f5a6d..f7984374810 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2004
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
TRANSFORMDB = $(top_srcdir)/bin/transformdb
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
index a3f0db5b42c..0013fce8e01 100644
--- a/cpp/src/FreezeScript/Parser.cpp
+++ b/cpp/src/FreezeScript/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Parser.h>
#include <FreezeScript/GrammarUtil.h>
#include <IceUtil/Mutex.h>
diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h
index 82e15e5cb1f..1691d7fdff4 100644
--- a/cpp/src/FreezeScript/Parser.h
+++ b/cpp/src/FreezeScript/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_PARSER_H
#define FREEZE_SCRIPT_PARSER_H
diff --git a/cpp/src/FreezeScript/Print.cpp b/cpp/src/FreezeScript/Print.cpp
index e6773848313..b7b09d85422 100644
--- a/cpp/src/FreezeScript/Print.cpp
+++ b/cpp/src/FreezeScript/Print.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Print.h>
#include <FreezeScript/Util.h>
#include <IceUtil/OutputUtil.h>
diff --git a/cpp/src/FreezeScript/Print.h b/cpp/src/FreezeScript/Print.h
index b4ece9e8fe3..69bb013dba9 100644
--- a/cpp/src/FreezeScript/Print.h
+++ b/cpp/src/FreezeScript/Print.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_PRINT_H
#define FREEZE_SCRIPT_PRINT_H
diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l
index 75643e79423..8455a6fe2f0 100644
--- a/cpp/src/FreezeScript/Scanner.l
+++ b/cpp/src/FreezeScript/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/GrammarUtil.h> // Before Grammar.h, so that YYSTYPE is defined
#include <FreezeScript/Grammar.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/FreezeScript/TransformAnalyzer.cpp b/cpp/src/FreezeScript/TransformAnalyzer.cpp
index cc47b1dd791..087c7d92532 100644
--- a/cpp/src/FreezeScript/TransformAnalyzer.cpp
+++ b/cpp/src/FreezeScript/TransformAnalyzer.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/TransformAnalyzer.h>
#include <FreezeScript/Util.h>
#include <IceUtil/OutputUtil.h>
diff --git a/cpp/src/FreezeScript/TransformAnalyzer.h b/cpp/src/FreezeScript/TransformAnalyzer.h
index 6415f0a26ab..7fc5856071f 100644
--- a/cpp/src/FreezeScript/TransformAnalyzer.h
+++ b/cpp/src/FreezeScript/TransformAnalyzer.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_TRANSFORM_ANALYZER_H
#define FREEZE_SCRIPT_TRANSFORM_ANALYZER_H
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index b1644906a7c..e8ac95a430f 100644
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/TransformVisitor.h>
#include <FreezeScript/Util.h>
diff --git a/cpp/src/FreezeScript/TransformVisitor.h b/cpp/src/FreezeScript/TransformVisitor.h
index 8d594fb3193..b42f4a25705 100644
--- a/cpp/src/FreezeScript/TransformVisitor.h
+++ b/cpp/src/FreezeScript/TransformVisitor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_TRANSFORM_VISITOR_H
#define FREEZE_SCRIPT_TRANSFORM_VISITOR_H
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index 9628338e30f..f1794f41d1e 100644
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Transformer.h>
#include <FreezeScript/Parser.h>
#include <FreezeScript/TransformVisitor.h>
diff --git a/cpp/src/FreezeScript/Transformer.h b/cpp/src/FreezeScript/Transformer.h
index a40118f3f2d..b80af4c7fce 100644
--- a/cpp/src/FreezeScript/Transformer.h
+++ b/cpp/src/FreezeScript/Transformer.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_TRANSFORMER_H
#define FREEZE_SCRIPT_TRANSFORMER_H
diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp
index a2aa87b44c1..39f48bd8464 100644
--- a/cpp/src/FreezeScript/Util.cpp
+++ b/cpp/src/FreezeScript/Util.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Util.h>
#include <FreezeScript/Exception.h>
#include <Slice/Preprocessor.h>
diff --git a/cpp/src/FreezeScript/Util.h b/cpp/src/FreezeScript/Util.h
index 5822bdf004b..3776f6bc47e 100644
--- a/cpp/src/FreezeScript/Util.h
+++ b/cpp/src/FreezeScript/Util.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FREEZE_SCRIPT_UTIL_H
#define FREEZE_SCRIPT_UTIL_H
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 01f7537bf91..7ce9b986ef2 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <FreezeScript/Transformer.h>
#include <FreezeScript/TransformAnalyzer.h>
#include <FreezeScript/Exception.h>
diff --git a/cpp/src/Glacier/Blobject.cpp b/cpp/src/Glacier/Blobject.cpp
index 15da41f95ee..d223c865bd4 100644
--- a/cpp/src/Glacier/Blobject.cpp
+++ b/cpp/src/Glacier/Blobject.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/RoutingTable.h>
#include <Glacier/Blobject.h>
diff --git a/cpp/src/Glacier/Blobject.h b/cpp/src/Glacier/Blobject.h
index 892c039bb56..e1628d1e439 100644
--- a/cpp/src/Glacier/Blobject.h
+++ b/cpp/src/Glacier/Blobject.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef BLOBJECT_H
#define BLOBJECT_H
diff --git a/cpp/src/Glacier/ClientBlobject.cpp b/cpp/src/Glacier/ClientBlobject.cpp
index 2614ab8b96e..0e029b31ba6 100644
--- a/cpp/src/Glacier/ClientBlobject.cpp
+++ b/cpp/src/Glacier/ClientBlobject.cpp
@@ -1,18 +1,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/RoutingTable.h>
#include <Ice/IdentityUtil.h>
diff --git a/cpp/src/Glacier/ClientBlobject.h b/cpp/src/Glacier/ClientBlobject.h
index 080eac14388..804cc93c63d 100644
--- a/cpp/src/Glacier/ClientBlobject.h
+++ b/cpp/src/Glacier/ClientBlobject.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CLIENT_BLOBJECT_H
#define CLIENT_BLOBJECT_H
diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp
index c6e166cc164..d6c4cb0fde6 100644
--- a/cpp/src/Glacier/GlacierRouter.cpp
+++ b/cpp/src/Glacier/GlacierRouter.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <Ice/RoutingTable.h>
#include <Glacier/RouterI.h>
diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp
index 2bb116a574b..c24856c3068 100644
--- a/cpp/src/Glacier/GlacierStarter.cpp
+++ b/cpp/src/Glacier/GlacierStarter.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Service.h>
#include <Glacier/StarterI.h>
#include <fstream>
diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index a75d86806a0..e7481ef374c 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,Glacier,$(VERSION))
diff --git a/cpp/src/Glacier/Request.cpp b/cpp/src/Glacier/Request.cpp
index 1c8bee7aed0..a24c926471b 100644
--- a/cpp/src/Glacier/Request.cpp
+++ b/cpp/src/Glacier/Request.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Glacier/Request.h>
using namespace std;
diff --git a/cpp/src/Glacier/Request.h b/cpp/src/Glacier/Request.h
index 6bc13b156fb..fb53d5bff96 100644
--- a/cpp/src/Glacier/Request.h
+++ b/cpp/src/Glacier/Request.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef MISSIVE_H
#define MISSIVE_H
diff --git a/cpp/src/Glacier/RouterI.cpp b/cpp/src/Glacier/RouterI.cpp
index e6dd369cb5b..cb61e63d090 100644
--- a/cpp/src/Glacier/RouterI.cpp
+++ b/cpp/src/Glacier/RouterI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/RoutingTable.h>
#include <Glacier/RouterI.h>
#include <Glacier/Session.h>
diff --git a/cpp/src/Glacier/RouterI.h b/cpp/src/Glacier/RouterI.h
index a1a84541a11..7de3ab5d29b 100644
--- a/cpp/src/Glacier/RouterI.h
+++ b/cpp/src/Glacier/RouterI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_ROUTER_I_H
#define GLACIER_ROUTER_I_H
diff --git a/cpp/src/Glacier/ServerBlobject.cpp b/cpp/src/Glacier/ServerBlobject.cpp
index 2345f5b0462..f22cdd6d82f 100644
--- a/cpp/src/Glacier/ServerBlobject.cpp
+++ b/cpp/src/Glacier/ServerBlobject.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/RoutingTable.h>
#include <Glacier/ServerBlobject.h>
diff --git a/cpp/src/Glacier/ServerBlobject.h b/cpp/src/Glacier/ServerBlobject.h
index feb6e76fad3..5e35c3bf593 100644
--- a/cpp/src/Glacier/ServerBlobject.h
+++ b/cpp/src/Glacier/ServerBlobject.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVER_BLOBJECT_H
#define SERVER_BLOBJECT_H
diff --git a/cpp/src/Glacier/StarterI.cpp b/cpp/src/Glacier/StarterI.cpp
index ff1063c600a..c306def8834 100644
--- a/cpp/src/Glacier/StarterI.cpp
+++ b/cpp/src/Glacier/StarterI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/UUID.h>
#include <IceSSL/RSAKeyPair.h>
#include <Glacier/StarterI.h>
diff --git a/cpp/src/Glacier/StarterI.h b/cpp/src/Glacier/StarterI.h
index fb388ae2b97..9b7336c3f4d 100644
--- a/cpp/src/Glacier/StarterI.h
+++ b/cpp/src/Glacier/StarterI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GLACIER_STARTER_I_H
#define GLACIER_STARTER_I_H
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index 4ec7caa73ac..34dc67ef46e 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Acceptor.h>
using namespace std;
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index a752cfbec57..5262050c67b 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ACCEPTOR_H
#define ICE_ACCEPTOR_H
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 578b24fd374..d4965b5d525 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ACCEPTOR_F_H
#define ICE_ACCEPTOR_F_H
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 7d01726d313..61d51131eb3 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IceUtil/StaticMutex.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index ef9b58d172c..89f9bc3eda3 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/BasicStream.h>
#include <Ice/Instance.h>
#include <Ice/Object.h>
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 0434bb90a7a..4fca8881a46 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/CommunicatorI.h>
#include <Ice/Instance.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 46706472850..f91c27c202c 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_COMMUNICATOR_I_H
#define ICE_COMMUNICATOR_I_H
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index fed4204f9e6..b1bacda2d1b 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Connection.h>
#include <Ice/Instance.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/Ice/Connection.h b/cpp/src/Ice/Connection.h
index c5a716f56d8..9993b85d7e9 100644
--- a/cpp/src/Ice/Connection.h
+++ b/cpp/src/Ice/Connection.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTION_H
#define ICE_CONNECTION_H
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index f43d6fe65c8..8f6998ede76 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ConnectionFactory.h>
#include <Ice/Connection.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index d79ad31cd74..f8db7164286 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTION_FACTORY_H
#define ICE_CONNECTION_FACTORY_H
diff --git a/cpp/src/Ice/ConnectionMonitor.cpp b/cpp/src/Ice/ConnectionMonitor.cpp
index 657a01ba8e5..fec6b9471fd 100644
--- a/cpp/src/Ice/ConnectionMonitor.cpp
+++ b/cpp/src/Ice/ConnectionMonitor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ConnectionMonitor.h>
#include <Ice/Connection.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ConnectionMonitor.h b/cpp/src/Ice/ConnectionMonitor.h
index 1fabf467325..ed491655d91 100644
--- a/cpp/src/Ice/ConnectionMonitor.h
+++ b/cpp/src/Ice/ConnectionMonitor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTION_MONITOR_H
#define ICE_CONNECTION_MONITOR_H
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index b5e920e7ce2..212c10b8cf1 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Connector.h>
using namespace std;
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index cb08d436822..7964f07bf30 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTOR_H
#define ICE_CONNECTOR_H
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 18d5231ae82..4ec329be107 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_CONNECTOR_F_H
#define ICE_CONNECTOR_F_H
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index ce07b35254c..91fef83c7e5 100755
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/EventLoggerI.h>
extern "C" BOOL WINAPI _CRT_INIT(HINSTANCE, DWORD, LPVOID);
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 815bebb5a9a..ccdbc0cab20 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/DefaultsAndOverrides.h>
#include <Ice/Properties.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 3ee7146d27d..99c1efb87c9 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 f3b5ff8c72b..5d68772e663 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
#define ICE_DEFAULTS_AND_OVERRIDES_F_H
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index d875225dec2..ea3b9248f72 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Direct.h>
#include <Ice/ObjectAdapterI.h> // For inc/decDirectCount().
#include <Ice/ServantManager.h>
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index c8f7b013309..4008593be37 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/DynamicLibrary.h>
#ifndef _WIN32
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index cd8e70c5a9f..5daae22cc0a 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Endpoint.h>
using namespace std;
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index 7b747e310c1..0bf5cc3da68 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ENDPOINT_H
#define ICE_ENDPOINT_H
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index 5071a4d416a..c7c6188114d 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/EndpointFactory.h>
using namespace std;
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 82b0e99a614..ffd2b686244 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/EndpointFactoryManager.h>
#include <Ice/Endpoint.h>
#include <Ice/UnknownEndpoint.h>
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index 5d8a773489d..9d9ab4bb386 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 a102309e957..66eef2f1ba1 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
#define ICE_ENDPOINT_FACTORY_MANAGER_F_H
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 4caab02fa67..065d1cbd0ad 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index 99b9337b38f..2dc2d9a3977 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_EVENT_HANDLER_H
#define ICE_EVENT_HANDLER_H
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index 5e147225546..f20f048dc29 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_EVENT_HANDLER_F_H
#define ICE_EVENT_HANDLER_F_H
diff --git a/cpp/src/Ice/EventLoggerI.cpp b/cpp/src/Ice/EventLoggerI.cpp
index 69a59f89173..86b7168d04c 100755
--- a/cpp/src/Ice/EventLoggerI.cpp
+++ b/cpp/src/Ice/EventLoggerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/EventLoggerI.h>
#include <Ice/EventLoggerMsg.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/EventLoggerI.h b/cpp/src/Ice/EventLoggerI.h
index bede90e1095..30c3f5079b4 100755
--- a/cpp/src/Ice/EventLoggerI.h
+++ b/cpp/src/Ice/EventLoggerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_EVENT_LOGGER_I_H
#define ICE_EVENT_LOGGER_I_H
diff --git a/cpp/src/Ice/EventLoggerMsg.mc b/cpp/src/Ice/EventLoggerMsg.mc
index e6713473b2c..8e8e42ab55a 100755
--- a/cpp/src/Ice/EventLoggerMsg.mc
+++ b/cpp/src/Ice/EventLoggerMsg.mc
@@ -1,17 +1,17 @@
; // **********************************************************************
; //
-; // Copyright (c) 2003
+; // Copyright (c) 2003 - 2004
; // ZeroC, Inc.
-; // Billerica, MA, USA
+; // North Palm Beach, FL, USA
; //
; // All Rights Reserved.
; //
-; // Ice is free software; you can redistribute it and/or modify it under
-; // the terms of the GNU General Public License version 2 as published by
-; // the Free Software Foundation.
+; // This copy of Ice is licensed to you under the terms described in the
+; // ICE_LICENSE file included in this distribution.
; //
; // **********************************************************************
+
MessageId=0x0
SymbolicName=EVENT_LOGGER_MSG
Language=English
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index b40ef496872..0fb277a93a7 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Exception.h>
#include <Ice/LocalException.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index d18e32b3047..acbd959ff4f 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/FactoryTable.h>
#include <Ice/UserExceptionFactory.h>
diff --git a/cpp/src/Ice/FactoryTableDef.cpp b/cpp/src/Ice/FactoryTableDef.cpp
index 1b1db33163a..d4b59fa4ddd 100644
--- a/cpp/src/Ice/FactoryTableDef.cpp
+++ b/cpp/src/Ice/FactoryTableDef.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/FactoryTableDef.h>
#include <Ice/UserExceptionFactory.h>
diff --git a/cpp/src/Ice/IdentityUtil.cpp b/cpp/src/Ice/IdentityUtil.cpp
index 9acace97782..8be0b3ad371 100644
--- a/cpp/src/Ice/IdentityUtil.cpp
+++ b/cpp/src/Ice/IdentityUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/IdentityUtil.h>
#include <Ice/LocalException.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index acba0edf3b0..5c9c8166067 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Incoming.h>
#include <Ice/ObjectAdapter.h>
#include <Ice/ServantLocator.h>
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 5288047d08c..13a23192b03 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/IncomingAsync.h>
#include <Ice/ServantLocator.h>
#include <Ice/Object.h>
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index acf1764ef13..08817b14b30 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/GC.h>
#include <Ice/CommunicatorI.h>
#include <Ice/PropertiesI.h>
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index d90713b40fd..03aca971709 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Instance.h>
#include <Ice/TraceLevels.h>
#include <Ice/DefaultsAndOverrides.h>
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index c6b338ecf0b..b59ad0c7d6e 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_INSTANCE_H
#define ICE_INSTANCE_H
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index b4ba1c0bc4c..27191445e46 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LocalObject.h>
using namespace std;
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 358ec4fe298..c9d5173ab3f 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LocatorInfo.h>
#include <Ice/Locator.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index de145639820..1ce223f7816 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOCATOR_INFO_H
#define ICE_LOCATOR_INFO_H
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index a5eff28a5d3..9c4f8ea6406 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOCATOR_INFO_F_H
#define ICE_LOCATOR_INFO_F_H
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index 2bafc2675a6..e1767d53161 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Time.h>
#include <Ice/LoggerI.h>
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 3c13e73a58c..fb4d3dc8d32 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_LOGGER_I_H
#define ICE_LOGGER_I_H
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index f31a9eea8d6..244add39861 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LoggerUtil.h>
#include <Ice/Logger.h>
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 5d1685e744c..efccb93e1c2 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -1,17 +1,17 @@
-#**********************************************************************
+# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,Ice,$(VERSION))
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 2924f8aeee4..424b29af7f0 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Network.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 60362a24ef0..36c7414151e 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_NETWORK_H
#define ICE_NETWORK_H
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 8397f120910..1c09c2c5ef9 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Object.h>
#include <Ice/Incoming.h>
#include <Ice/IncomingAsync.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 569317fb33f..88fc010408b 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/ObjectAdapterI.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 4e885140a56..3a59b50aaf4 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
#define ICE_OBJECT_ADAPTER_FACTORY_H
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index c6bf2161e4b..c89aa3b0487 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/UUID.h>
#include <Ice/ObjectAdapterI.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index f7194ebcd12..205781e293d 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OBJECT_ADAPTER_I_H
#define ICE_OBJECT_ADAPTER_I_H
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
index e51743e7b59..e650fc0ddc0 100644
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ b/cpp/src/Ice/ObjectFactoryManager.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ObjectFactoryManager.h>
#include <Ice/ObjectFactory.h>
#include <Ice/Functional.h>
diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h
index 0f01a289b57..34630d2abc5 100644
--- a/cpp/src/Ice/ObjectFactoryManager.h
+++ b/cpp/src/Ice/ObjectFactoryManager.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVANT_FACTORY_MANAGER_H
#define ICE_SERVANT_FACTORY_MANAGER_H
diff --git a/cpp/src/Ice/ObjectFactoryManagerF.h b/cpp/src/Ice/ObjectFactoryManagerF.h
index 63dada348a9..0165bcee2ee 100644
--- a/cpp/src/Ice/ObjectFactoryManagerF.h
+++ b/cpp/src/Ice/ObjectFactoryManagerF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVANT_FACTORY_MANAGER_F_H
#define ICE_SERVANT_FACTORY_MANAGER_F_H
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 10230c52bb0..b5c531ee2bc 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Outgoing.h>
#include <Ice/Object.h>
#include <Ice/Connection.h>
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index c22f08de8c4..6dcb3c38583 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/OutgoingAsync.h>
#include <Ice/Object.h>
#include <Ice/Connection.h>
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index b859bfd00cf..d7b0001cc3f 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/PluginManagerI.h>
#include <Ice/DynamicLibrary.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index a6e5b6e25d1..73608b6905e 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PLUGIN_MANAGER_I_H
#define ICE_PLUGIN_MANAGER_I_H
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 5518ae026d8..4171f41c8da 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/PropertiesI.h>
#include <Ice/Initialize.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index df384de3412..fd29b9c51f3 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROPERTIES_I_H
#define ICE_PROPERTIES_I_H
diff --git a/cpp/src/Ice/Protocol.h b/cpp/src/Ice/Protocol.h
index ec8b602d4b0..d08db1bf139 100644
--- a/cpp/src/Ice/Protocol.h
+++ b/cpp/src/Ice/Protocol.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROTOCOL_H
#define ICE_PROTOCOL_H
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index 1b266b44475..f0c0830fe90 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ProtocolPluginFacade.h>
#include <Ice/Instance.h>
#include <Ice/EndpointFactoryManager.h>
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 0be8de892c0..24c515308ef 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Proxy.h>
#include <Ice/ProxyFactory.h>
#include <Ice/Object.h>
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index 3d87073f912..952e58efd90 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Thread.h>
#include <Ice/ProxyFactory.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 59d6dc9e45b..ec2f510ab4e 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PROXY_FACTORY_H
#define ICE_PROXY_FACTORY_H
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index a40c9ac17b8..e25a7fd0b72 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Reference.h>
#include <Ice/ReferenceFactory.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index 8ffad3ccc3a..2b778719588 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_REFERENCE_H
#define ICE_REFERENCE_H
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index ba919e7a0e9..4c924aeb085 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ReferenceFactory.h>
#include <Ice/ProxyFactory.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index fdab85920f0..d85cdebb149 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_REFERENCE_FACTORY_H
#define ICE_REFERENCE_FACTORY_H
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index 01040ed88d4..5d78f8aa3c7 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_REFERENCE_FACTORY_F_H
#define ICE_REFERENCE_FACTORY_F_H
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index b849e285293..77da5e8c5a9 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/RouterInfo.h>
#include <Ice/Router.h>
#include <Ice/RoutingTable.h>
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 93e105ac8dd..1bdecc97cb3 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ROUTER_INFO_H
#define ICE_ROUTER_INFO_H
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 8ce83eee0b9..00e6402141a 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_ROUTER_INFO_F_H
#define ICE_ROUTER_INFO_F_H
diff --git a/cpp/src/Ice/RoutingTable.cpp b/cpp/src/Ice/RoutingTable.cpp
index d3016d3b00b..fc62a3a42e0 100644
--- a/cpp/src/Ice/RoutingTable.cpp
+++ b/cpp/src/Ice/RoutingTable.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/RoutingTable.h>
#include <Ice/Proxy.h>
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index e925173b5fc..ee74d53c519 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ServantManager.h>
#include <Ice/ServantLocator.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index f4e4fb9260f..1f1663d2932 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SERVANT_MANAGER_H
#define ICE_SERVANT_MANAGER_H
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index eb83f70b6e4..a824c7a01b9 100755
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/Thread.h>
#include <IceUtil/Monitor.h>
diff --git a/cpp/src/Ice/StringUtil.cpp b/cpp/src/Ice/StringUtil.cpp
index 0c3710cae4f..aa56f23c719 100644
--- a/cpp/src/Ice/StringUtil.cpp
+++ b/cpp/src/Ice/StringUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Config.h>
#include <Ice/StringUtil.h>
diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h
index 207d9612f9d..df46870d7c6 100644
--- a/cpp/src/Ice/StringUtil.h
+++ b/cpp/src/Ice/StringUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STRING_UTIL_H
#define ICE_STRING_UTIL_H
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index ab18a0982c6..f2c21078e32 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/SysLoggerI.h>
#include <syslog.h>
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index 71b9de0a7f8..72361327e33 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SYS_LOGGER_I_H
#define ICE_SYS_LOGGER_I_H
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 9b06f6ccde9..187beedacb3 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/TcpAcceptor.h>
#include <Ice/TcpTransceiver.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index 6865580724f..e80eef8ef15 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TCP_ACCEPTOR_H
#define ICE_TCP_ACCEPTOR_H
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 573619fd09d..d695f0d3183 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/TcpConnector.h>
#include <Ice/TcpTransceiver.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index ef30cbbd555..c854a241938 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TCP_CONNECTOR_H
#define ICE_TCP_CONNECTOR_H
diff --git a/cpp/src/Ice/TcpEndpoint.cpp b/cpp/src/Ice/TcpEndpoint.cpp
index 6712ae08213..e5ba211caff 100644
--- a/cpp/src/Ice/TcpEndpoint.cpp
+++ b/cpp/src/Ice/TcpEndpoint.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/TcpEndpoint.h>
#include <Ice/Network.h>
#include <Ice/TcpAcceptor.h>
diff --git a/cpp/src/Ice/TcpEndpoint.h b/cpp/src/Ice/TcpEndpoint.h
index f7cd5283c8e..dd4f511d631 100644
--- a/cpp/src/Ice/TcpEndpoint.h
+++ b/cpp/src/Ice/TcpEndpoint.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TCP_ENDPOINT_H
#define ICE_TCP_ENDPOINT_H
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index c3176d3d28a..59b40375b2a 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/TcpTransceiver.h>
#include <Ice/Instance.h>
#include <Ice/TraceLevels.h>
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 3b4e22e934d..bae3f6e9b74 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TCP_TRANSCEIVER_H
#define ICE_TCP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 0f361a6f702..0df54aa805b 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/ThreadPool.h>
#include <Ice/EventHandler.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index af6ef1bd180..cb8b5a7e40b 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_THREAD_POOL_H
#define ICE_THREAD_POOL_H
diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h
index 6b9bb4dfd79..6b15b5294e8 100644
--- a/cpp/src/Ice/ThreadPoolF.h
+++ b/cpp/src/Ice/ThreadPoolF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_THREAD_POOL_F_H
#define ICE_THREAD_POOL_F_H
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp
index c1365bbf8a0..99427753814 100644
--- a/cpp/src/Ice/TraceLevels.cpp
+++ b/cpp/src/Ice/TraceLevels.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/TraceLevels.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index c2da0aad22c..99226b61a89 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TRACE_LEVELS_H
#define ICE_TRACE_LEVELS_H
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index 3ca1dfb5dbb..ed79d86f1d6 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef 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 5a5946a7e3f..50e9cfddea7 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/StaticMutex.h>
#include <IceUtil/StringUtil.h>
#include <Ice/TraceUtil.h>
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index 7006c575598..4e65eab6620 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TRACE_UTIL_H
#define ICE_TRACE_UTIL_H
diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp
index c45722b77b1..4f4d8815f7a 100644
--- a/cpp/src/Ice/Transceiver.cpp
+++ b/cpp/src/Ice/Transceiver.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Transceiver.h>
using namespace std;
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index b5cd431fdae..c98563ab511 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TRANSCEIVER_H
#define ICE_TRANSCEIVER_H
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index ef443504118..556c366170e 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_TRANSCEIVER_F_H
#define ICE_TRANSCEIVER_F_H
diff --git a/cpp/src/Ice/UdpEndpoint.cpp b/cpp/src/Ice/UdpEndpoint.cpp
index ae7e635df53..f55b3630d65 100644
--- a/cpp/src/Ice/UdpEndpoint.cpp
+++ b/cpp/src/Ice/UdpEndpoint.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/UdpEndpoint.h>
#include <Ice/Network.h>
#include <Ice/UdpTransceiver.h>
diff --git a/cpp/src/Ice/UdpEndpoint.h b/cpp/src/Ice/UdpEndpoint.h
index 46538d8e3be..beeb6f15f1a 100644
--- a/cpp/src/Ice/UdpEndpoint.h
+++ b/cpp/src/Ice/UdpEndpoint.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UDP_ENDPOINT_H
#define ICE_UDP_ENDPOINT_H
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 6ee05d8d2b6..d3d8e360fa7 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/UdpTransceiver.h>
#include <Ice/Instance.h>
#include <Ice/TraceLevels.h>
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index e54b034d3bd..6e7918c3dc8 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UDP_TRANSCEIVER_H
#define ICE_UDP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/UnknownEndpoint.cpp b/cpp/src/Ice/UnknownEndpoint.cpp
index 45d808d24bf..1188ed06fe7 100644
--- a/cpp/src/Ice/UnknownEndpoint.cpp
+++ b/cpp/src/Ice/UnknownEndpoint.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/UnknownEndpoint.h>
#include <Ice/BasicStream.h>
#include <Ice/Exception.h>
diff --git a/cpp/src/Ice/UnknownEndpoint.h b/cpp/src/Ice/UnknownEndpoint.h
index 347f27f41cb..e30579c7810 100644
--- a/cpp/src/Ice/UnknownEndpoint.h
+++ b/cpp/src/Ice/UnknownEndpoint.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_UNKNOWN_ENDPOINT_H
#define ICE_UNKNOWN_ENDPOINT_H
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index bc35e03fdd8..537f21b6866 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index eb0cdd38aa2..fccfb95d38d 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceBox/IceBox.h>
using namespace std;
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index ca9e28d7667..be82aa82d0e 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -1,17 +1,17 @@
-#**********************************************************************
+# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION))
diff --git a/cpp/src/IceBox/Server.cpp b/cpp/src/IceBox/Server.cpp
index 00d5b81effd..e44bd1e93a4 100644
--- a/cpp/src/IceBox/Server.cpp
+++ b/cpp/src/IceBox/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceBox/ServiceManagerI.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index b3c0908ff6a..8bc4d057428 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/DynamicLibrary.h>
#include <IceBox/ServiceManagerI.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index d3add45a099..5a22b8ea0dc 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVICE_MANAGER_I_H
#define SERVICE_MANAGER_I_H
diff --git a/cpp/src/IcePack/Activator.ice b/cpp/src/IcePack/Activator.ice
index 312ad650303..8b9e419aa24 100644
--- a/cpp/src/IcePack/Activator.ice
+++ b/cpp/src/IcePack/Activator.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ACTIVATOR_ICE
#define ICE_PACK_ACTIVATOR_ICE
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp
index 46d6f444a9d..3d9e6bf998a 100644
--- a/cpp/src/IcePack/ActivatorI.cpp
+++ b/cpp/src/IcePack/ActivatorI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/ActivatorI.h>
#include <IcePack/Admin.h>
diff --git a/cpp/src/IcePack/ActivatorI.h b/cpp/src/IcePack/ActivatorI.h
index 451eccd2bba..21e4562a339 100644
--- a/cpp/src/IcePack/ActivatorI.h
+++ b/cpp/src/IcePack/ActivatorI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ACTIVATOR_H
#define ICE_PACK_ACTIVATOR_H
diff --git a/cpp/src/IcePack/AdapterFactory.cpp b/cpp/src/IcePack/AdapterFactory.cpp
index c960034383b..99284620a03 100644
--- a/cpp/src/IcePack/AdapterFactory.cpp
+++ b/cpp/src/IcePack/AdapterFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
#include <Freeze/Evictor.h>
diff --git a/cpp/src/IcePack/AdapterFactory.h b/cpp/src/IcePack/AdapterFactory.h
index 74fd698a6a1..2824722ba0a 100644
--- a/cpp/src/IcePack/AdapterFactory.h
+++ b/cpp/src/IcePack/AdapterFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ADAPTER_FACTORY_H
#define ICE_PACK_ADAPTER_FACTORY_H
diff --git a/cpp/src/IcePack/AdapterI.cpp b/cpp/src/IcePack/AdapterI.cpp
index ba48b2d31bf..23bd78a6e72 100644
--- a/cpp/src/IcePack/AdapterI.cpp
+++ b/cpp/src/IcePack/AdapterI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/AdapterI.h>
#include <IcePack/AdapterFactory.h>
diff --git a/cpp/src/IcePack/AdapterI.h b/cpp/src/IcePack/AdapterI.h
index 16926cfef81..b960eee4638 100644
--- a/cpp/src/IcePack/AdapterI.h
+++ b/cpp/src/IcePack/AdapterI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ADAPTER_I_H
#define ICE_PACK_ADAPTER_I_H
diff --git a/cpp/src/IcePack/AdapterRegistryI.cpp b/cpp/src/IcePack/AdapterRegistryI.cpp
index 26d3dca3da2..61226cbe443 100644
--- a/cpp/src/IcePack/AdapterRegistryI.cpp
+++ b/cpp/src/IcePack/AdapterRegistryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePack/AdapterRegistryI.h>
#include <IcePack/TraceLevels.h>
#include <Freeze/Initialize.h>
diff --git a/cpp/src/IcePack/AdapterRegistryI.h b/cpp/src/IcePack/AdapterRegistryI.h
index 7361c0f8d24..c2fb212c594 100644
--- a/cpp/src/IcePack/AdapterRegistryI.h
+++ b/cpp/src/IcePack/AdapterRegistryI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ADAPTER_REGISTRY_I_H
#define ICE_PACK_ADAPTER_REGISTRY_I_H
diff --git a/cpp/src/IcePack/AdminI.cpp b/cpp/src/IcePack/AdminI.cpp
index 925bfcf36a5..574d7d1a539 100644
--- a/cpp/src/IcePack/AdminI.cpp
+++ b/cpp/src/IcePack/AdminI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/AdminI.h>
#include <IcePack/ApplicationBuilder.h>
diff --git a/cpp/src/IcePack/AdminI.h b/cpp/src/IcePack/AdminI.h
index 43fce2d7e96..ecee15bdf5b 100644
--- a/cpp/src/IcePack/AdminI.h
+++ b/cpp/src/IcePack/AdminI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_ADMIN_I_H
#define ICE_PACK_ADMIN_I_H
diff --git a/cpp/src/IcePack/ApplicationBuilder.cpp b/cpp/src/IcePack/ApplicationBuilder.cpp
index 087158c779c..a2955e56c24 100644
--- a/cpp/src/IcePack/ApplicationBuilder.cpp
+++ b/cpp/src/IcePack/ApplicationBuilder.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePack/ApplicationBuilder.h>
using namespace std;
diff --git a/cpp/src/IcePack/ApplicationBuilder.h b/cpp/src/IcePack/ApplicationBuilder.h
index 05996ba2c9a..4ef80d90fb8 100644
--- a/cpp/src/IcePack/ApplicationBuilder.h
+++ b/cpp/src/IcePack/ApplicationBuilder.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVICE_BUILDER_H
#define ICE_PACK_SERVICE_BUILDER_H
diff --git a/cpp/src/IcePack/Client.cpp b/cpp/src/IcePack/Client.cpp
index 484b1bafba3..293378ba312 100644
--- a/cpp/src/IcePack/Client.cpp
+++ b/cpp/src/IcePack/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IcePack/Parser.h>
#include <fstream>
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp
index 4c31f890aa6..9412f36a44d 100644
--- a/cpp/src/IcePack/ComponentBuilder.cpp
+++ b/cpp/src/IcePack/ComponentBuilder.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifdef __sun
#define _POSIX_PTHREAD_SEMANTICS
#endif
diff --git a/cpp/src/IcePack/ComponentBuilder.h b/cpp/src/IcePack/ComponentBuilder.h
index fcb270065f3..bdca1fdedef 100644
--- a/cpp/src/IcePack/ComponentBuilder.h
+++ b/cpp/src/IcePack/ComponentBuilder.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_COMPONENT_BUILDER_H
#define ICE_PACK_COMPONENT_BUILDER_H
diff --git a/cpp/src/IcePack/GPL.h b/cpp/src/IcePack/GPL.h
index 9c735707855..8e2e2472af8 100644
--- a/cpp/src/IcePack/GPL.h
+++ b/cpp/src/IcePack/GPL.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_GPL_H
#define ICE_GPL_H
diff --git a/cpp/src/IcePack/Grammar.y b/cpp/src/IcePack/Grammar.y
index 3bcd35ce1e2..7ef7d781a2f 100644
--- a/cpp/src/IcePack/Grammar.y
+++ b/cpp/src/IcePack/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Parser.h>
diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp
index 81c3c337988..a4bb6091da7 100644
--- a/cpp/src/IcePack/IcePackNode.cpp
+++ b/cpp/src/IcePack/IcePackNode.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/Service.h>
#include <IcePack/Activator.h>
diff --git a/cpp/src/IcePack/IcePackRegistry.cpp b/cpp/src/IcePack/IcePackRegistry.cpp
index e353b95c902..ed4091b505d 100644
--- a/cpp/src/IcePack/IcePackRegistry.cpp
+++ b/cpp/src/IcePack/IcePackRegistry.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/Service.h>
#include <IcePack/Registry.h>
diff --git a/cpp/src/IcePack/Internal.ice b/cpp/src/IcePack/Internal.ice
index 4accef4724a..e5e236a0757 100644
--- a/cpp/src/IcePack/Internal.ice
+++ b/cpp/src/IcePack/Internal.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_INTERNAL_ICE
#define ICE_PACK_INTERNAL_ICE
diff --git a/cpp/src/IcePack/LocatorI.cpp b/cpp/src/IcePack/LocatorI.cpp
index 0cafa447cf7..13733373d29 100644
--- a/cpp/src/IcePack/LocatorI.cpp
+++ b/cpp/src/IcePack/LocatorI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/LocatorI.h>
diff --git a/cpp/src/IcePack/LocatorI.h b/cpp/src/IcePack/LocatorI.h
index 99ce76bf5c9..f321820c071 100644
--- a/cpp/src/IcePack/LocatorI.h
+++ b/cpp/src/IcePack/LocatorI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_LOCATOR_I_H
#define ICE_PACK_LOCATOR_I_H
diff --git a/cpp/src/IcePack/LocatorRegistryI.cpp b/cpp/src/IcePack/LocatorRegistryI.cpp
index 588a4b279b3..421f9dad5d8 100644
--- a/cpp/src/IcePack/LocatorRegistryI.cpp
+++ b/cpp/src/IcePack/LocatorRegistryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/LocatorRegistryI.h>
#include <IcePack/AdapterI.h>
diff --git a/cpp/src/IcePack/LocatorRegistryI.h b/cpp/src/IcePack/LocatorRegistryI.h
index 184a638ec53..363f2e2d526 100644
--- a/cpp/src/IcePack/LocatorRegistryI.h
+++ b/cpp/src/IcePack/LocatorRegistryI.h
@@ -1,18 +1,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_LOCATOR_REGISTRY_I_H
#define ICE_PACK_LOCATOR_REGISTRY_I_H
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index 26a027a1a02..91252b7232c 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IcePack,$(VERSION))
diff --git a/cpp/src/IcePack/NodeI.cpp b/cpp/src/IcePack/NodeI.cpp
index 1e18f502ff2..7664a48e9af 100644
--- a/cpp/src/IcePack/NodeI.cpp
+++ b/cpp/src/IcePack/NodeI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/NodeI.h>
diff --git a/cpp/src/IcePack/NodeI.h b/cpp/src/IcePack/NodeI.h
index 2f53cee988a..9dc2498cd96 100644
--- a/cpp/src/IcePack/NodeI.h
+++ b/cpp/src/IcePack/NodeI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_NODE_I_H
#define ICE_PACK_NODE_I_H
diff --git a/cpp/src/IcePack/NodeInfo.cpp b/cpp/src/IcePack/NodeInfo.cpp
index ebea1b14603..7a67f06ad32 100644
--- a/cpp/src/IcePack/NodeInfo.cpp
+++ b/cpp/src/IcePack/NodeInfo.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/NodeInfo.h>
#include <IcePack/ServerFactory.h>
diff --git a/cpp/src/IcePack/NodeInfo.h b/cpp/src/IcePack/NodeInfo.h
index a40c47168d5..b2ca080d148 100644
--- a/cpp/src/IcePack/NodeInfo.h
+++ b/cpp/src/IcePack/NodeInfo.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_NODE_INFO_H
#define ICE_PACK_NODE_INFO_H
diff --git a/cpp/src/IcePack/NodeRegistryI.cpp b/cpp/src/IcePack/NodeRegistryI.cpp
index 20e6278f478..c77905b61d1 100644
--- a/cpp/src/IcePack/NodeRegistryI.cpp
+++ b/cpp/src/IcePack/NodeRegistryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePack/NodeRegistryI.h>
#include <IcePack/AdapterFactory.h>
#include <IcePack/TraceLevels.h>
diff --git a/cpp/src/IcePack/NodeRegistryI.h b/cpp/src/IcePack/NodeRegistryI.h
index d2b4a74767f..851a37b4d66 100644
--- a/cpp/src/IcePack/NodeRegistryI.h
+++ b/cpp/src/IcePack/NodeRegistryI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_NODE_REGISTRY_I_H
#define ICE_PACK_NODE_REGISTRY_I_H
diff --git a/cpp/src/IcePack/ObjectRegistryI.cpp b/cpp/src/IcePack/ObjectRegistryI.cpp
index 1ce436c30a5..071cff8542d 100644
--- a/cpp/src/IcePack/ObjectRegistryI.cpp
+++ b/cpp/src/IcePack/ObjectRegistryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePack/ObjectRegistryI.h>
#include <IcePack/TraceLevels.h>
#include <Freeze/Initialize.h>
diff --git a/cpp/src/IcePack/ObjectRegistryI.h b/cpp/src/IcePack/ObjectRegistryI.h
index 02e4d4a3b1b..3fe40dbf00d 100644
--- a/cpp/src/IcePack/ObjectRegistryI.h
+++ b/cpp/src/IcePack/ObjectRegistryI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_OBJECT_REGISTRY_I_H
#define ICE_PACK_OBJECT_REGISTRY_I_H
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp
index 901c42ae955..133db768f47 100644
--- a/cpp/src/IcePack/Parser.cpp
+++ b/cpp/src/IcePack/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Parser.h>
diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h
index 7157b6f0d35..879c153a817 100644
--- a/cpp/src/IcePack/Parser.h
+++ b/cpp/src/IcePack/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_PARSER_H
#define ICE_PACK_PARSER_H
diff --git a/cpp/src/IcePack/QueryI.cpp b/cpp/src/IcePack/QueryI.cpp
index 603cc175028..1354c99cb1b 100644
--- a/cpp/src/IcePack/QueryI.cpp
+++ b/cpp/src/IcePack/QueryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePack/Internal.h>
#include <IcePack/QueryI.h>
diff --git a/cpp/src/IcePack/QueryI.h b/cpp/src/IcePack/QueryI.h
index 58e59755750..708c6f5586e 100644
--- a/cpp/src/IcePack/QueryI.h
+++ b/cpp/src/IcePack/QueryI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_QUERY_I_H
#define ICE_PACK_QUERY_I_H
diff --git a/cpp/src/IcePack/Registry.cpp b/cpp/src/IcePack/Registry.cpp
index a849ecd5d76..04a08c46a43 100644
--- a/cpp/src/IcePack/Registry.cpp
+++ b/cpp/src/IcePack/Registry.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/UUID.h>
#include <Ice/Ice.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/src/IcePack/Registry.h b/cpp/src/IcePack/Registry.h
index a49ea3535b9..b5ec5e64a01 100644
--- a/cpp/src/IcePack/Registry.h
+++ b/cpp/src/IcePack/Registry.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_REGISTRY_H
#define ICE_PACK_REGISTRY_H
diff --git a/cpp/src/IcePack/Scanner.l b/cpp/src/IcePack/Scanner.l
index c1b6211cf23..6653519fd6d 100644
--- a/cpp/src/IcePack/Scanner.l
+++ b/cpp/src/IcePack/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Parser.h>
#include <IcePack/Grammar.h>
diff --git a/cpp/src/IcePack/ServerAdapterI.cpp b/cpp/src/IcePack/ServerAdapterI.cpp
index 957b8442b89..3b14c7a25a8 100644
--- a/cpp/src/IcePack/ServerAdapterI.cpp
+++ b/cpp/src/IcePack/ServerAdapterI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/ServerAdapterI.h>
#include <IcePack/ServerFactory.h>
diff --git a/cpp/src/IcePack/ServerAdapterI.h b/cpp/src/IcePack/ServerAdapterI.h
index 739bf66251b..1fe23aef220 100644
--- a/cpp/src/IcePack/ServerAdapterI.h
+++ b/cpp/src/IcePack/ServerAdapterI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVER_ADAPTER_I_H
#define ICE_PACK_SERVER_ADAPTER_I_H
diff --git a/cpp/src/IcePack/ServerBuilder.cpp b/cpp/src/IcePack/ServerBuilder.cpp
index c267e7189d2..9b6df71184b 100644
--- a/cpp/src/IcePack/ServerBuilder.cpp
+++ b/cpp/src/IcePack/ServerBuilder.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/UUID.h>
#include <Ice/Ice.h>
#include <IcePack/ServerBuilder.h>
diff --git a/cpp/src/IcePack/ServerBuilder.h b/cpp/src/IcePack/ServerBuilder.h
index d065a64bab4..e2249cdf481 100644
--- a/cpp/src/IcePack/ServerBuilder.h
+++ b/cpp/src/IcePack/ServerBuilder.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVER_BUILDER_H
#define ICE_PACK_SERVER_BUILDER_H
diff --git a/cpp/src/IcePack/ServerDeployerI.cpp b/cpp/src/IcePack/ServerDeployerI.cpp
index d43335c47b8..fd4613f23a5 100644
--- a/cpp/src/IcePack/ServerDeployerI.cpp
+++ b/cpp/src/IcePack/ServerDeployerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/ServerDeployerI.h>
#include <IcePack/ServerFactory.h>
diff --git a/cpp/src/IcePack/ServerDeployerI.h b/cpp/src/IcePack/ServerDeployerI.h
index 6d1c5cc09df..d48c8c3d5fa 100644
--- a/cpp/src/IcePack/ServerDeployerI.h
+++ b/cpp/src/IcePack/ServerDeployerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVER_DEPLOYER_I_H
#define ICE_PACK_SERVER_DEPLOYER_I_H
diff --git a/cpp/src/IcePack/ServerFactory.cpp b/cpp/src/IcePack/ServerFactory.cpp
index da856362df2..7e3ef512550 100644
--- a/cpp/src/IcePack/ServerFactory.cpp
+++ b/cpp/src/IcePack/ServerFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
#include <Freeze/Evictor.h>
diff --git a/cpp/src/IcePack/ServerFactory.h b/cpp/src/IcePack/ServerFactory.h
index b5c8ebdafa3..87ad9a22508 100644
--- a/cpp/src/IcePack/ServerFactory.h
+++ b/cpp/src/IcePack/ServerFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVER_FACTORY_H
#define ICE_PACK_SERVER_FACTORY_H
diff --git a/cpp/src/IcePack/ServerI.cpp b/cpp/src/IcePack/ServerI.cpp
index 2ca63d59532..2ebca00f4a2 100644
--- a/cpp/src/IcePack/ServerI.cpp
+++ b/cpp/src/IcePack/ServerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/ServerI.h>
#include <IcePack/ServerFactory.h>
diff --git a/cpp/src/IcePack/ServerI.h b/cpp/src/IcePack/ServerI.h
index 16309215ecc..ad40d139ad1 100644
--- a/cpp/src/IcePack/ServerI.h
+++ b/cpp/src/IcePack/ServerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVER_I_H
#define ICE_PACK_SERVER_I_H
diff --git a/cpp/src/IcePack/ServerRegistryI.cpp b/cpp/src/IcePack/ServerRegistryI.cpp
index a279de7665d..b6e1dc7cab9 100644
--- a/cpp/src/IcePack/ServerRegistryI.cpp
+++ b/cpp/src/IcePack/ServerRegistryI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePack/ServerRegistryI.h>
#include <IcePack/TraceLevels.h>
#include <Freeze/Initialize.h>
diff --git a/cpp/src/IcePack/ServerRegistryI.h b/cpp/src/IcePack/ServerRegistryI.h
index 232d9d0d6e2..858fecb4ccc 100644
--- a/cpp/src/IcePack/ServerRegistryI.h
+++ b/cpp/src/IcePack/ServerRegistryI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVER_REGISTRY_I_H
#define ICE_PACK_SERVER_REGISTRY_I_H
diff --git a/cpp/src/IcePack/ServiceBuilder.cpp b/cpp/src/IcePack/ServiceBuilder.cpp
index 51004f14b37..91a78ab816a 100644
--- a/cpp/src/IcePack/ServiceBuilder.cpp
+++ b/cpp/src/IcePack/ServiceBuilder.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/ServiceBuilder.h>
#include <IcePack/ServerBuilder.h>
diff --git a/cpp/src/IcePack/ServiceBuilder.h b/cpp/src/IcePack/ServiceBuilder.h
index e753993152b..df2b3be082c 100644
--- a/cpp/src/IcePack/ServiceBuilder.h
+++ b/cpp/src/IcePack/ServiceBuilder.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_SERVICE_BUILDER_H
#define ICE_PACK_SERVICE_BUILDER_H
diff --git a/cpp/src/IcePack/TraceLevels.cpp b/cpp/src/IcePack/TraceLevels.cpp
index 421c3d3e29d..887d10c4978 100644
--- a/cpp/src/IcePack/TraceLevels.cpp
+++ b/cpp/src/IcePack/TraceLevels.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Properties.h>
#include <IcePack/TraceLevels.h>
diff --git a/cpp/src/IcePack/TraceLevels.h b/cpp/src/IcePack/TraceLevels.h
index 8b45b11580b..0baf4eb9540 100644
--- a/cpp/src/IcePack/TraceLevels.h
+++ b/cpp/src/IcePack/TraceLevels.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_TRACE_LEVELS_H
#define ICE_PACK_TRACE_LEVELS_H
diff --git a/cpp/src/IcePack/WaitQueue.cpp b/cpp/src/IcePack/WaitQueue.cpp
index 843e277051b..f68577bc4fa 100644
--- a/cpp/src/IcePack/WaitQueue.cpp
+++ b/cpp/src/IcePack/WaitQueue.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/WaitQueue.h>
diff --git a/cpp/src/IcePack/WaitQueue.h b/cpp/src/IcePack/WaitQueue.h
index db3b54d69db..1fbc90316fc 100644
--- a/cpp/src/IcePack/WaitQueue.h
+++ b/cpp/src/IcePack/WaitQueue.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PACK_WAIT_QUEUE_H
#define ICE_PACK_WAIT_QUEUE_H
diff --git a/cpp/src/IcePatch/Calc.cpp b/cpp/src/IcePatch/Calc.cpp
index c6a89036780..eadab101543 100644
--- a/cpp/src/IcePatch/Calc.cpp
+++ b/cpp/src/IcePatch/Calc.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePatch/Util.h>
#include <set>
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp
index 07d72f61544..57e10b420a5 100644
--- a/cpp/src/IcePatch/Client.cpp
+++ b/cpp/src/IcePatch/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IcePatch/FileDescFactory.h>
#include <IcePatch/Util.h>
diff --git a/cpp/src/IcePatch/ClientUtil.cpp b/cpp/src/IcePatch/ClientUtil.cpp
index e6fefd967da..866ab16d874 100644
--- a/cpp/src/IcePatch/ClientUtil.cpp
+++ b/cpp/src/IcePatch/ClientUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePatch/Util.h>
#include <IcePatch/ClientUtil.h>
#include <fstream>
diff --git a/cpp/src/IcePatch/FileDescFactory.cpp b/cpp/src/IcePatch/FileDescFactory.cpp
index 2439bdcacd6..94dae8bac0a 100644
--- a/cpp/src/IcePatch/FileDescFactory.cpp
+++ b/cpp/src/IcePatch/FileDescFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePatch/FileDescFactory.h>
using namespace std;
diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp
index 93e5e1f6972..b95bd44b8f9 100644
--- a/cpp/src/IcePatch/FileLocator.cpp
+++ b/cpp/src/IcePatch/FileLocator.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePatch/FileLocator.h>
#include <IcePatch/Util.h>
#include <IcePatch/IcePatchI.h>
diff --git a/cpp/src/IcePatch/FileLocator.h b/cpp/src/IcePatch/FileLocator.h
index 46cb5efaec4..d83bc2e18c0 100644
--- a/cpp/src/IcePatch/FileLocator.h
+++ b/cpp/src/IcePatch/FileLocator.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PATCH_FILE_LOCATOR_H
#define ICE_PATCH_FILE_LOCATOR_H
diff --git a/cpp/src/IcePatch/IcePatchI.cpp b/cpp/src/IcePatch/IcePatchI.cpp
index 0cda4d57ea3..130a5ff3e7f 100644
--- a/cpp/src/IcePatch/IcePatchI.cpp
+++ b/cpp/src/IcePatch/IcePatchI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePatch/IcePatchI.h>
#include <IcePatch/Util.h>
#include <fstream>
diff --git a/cpp/src/IcePatch/IcePatchI.h b/cpp/src/IcePatch/IcePatchI.h
index e2243b98dfc..059d7d5b77e 100644
--- a/cpp/src/IcePatch/IcePatchI.h
+++ b/cpp/src/IcePatch/IcePatchI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_PATCH_ICE_PATCH_I_H
#define ICE_PATCH_ICE_PATCH_I_H
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index 4cbb3c7a15b..357c75cee38 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -1,17 +1,17 @@
-#**********************************************************************
+# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IcePatch,$(VERSION))
diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp
index 3e6d7cb559c..3dfc306ae05 100644
--- a/cpp/src/IcePatch/Server.cpp
+++ b/cpp/src/IcePatch/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <Ice/Service.h>
#include <IcePatch/FileLocator.h>
diff --git a/cpp/src/IcePatch/Util.cpp b/cpp/src/IcePatch/Util.cpp
index a867e9ad8aa..45ce0d65748 100644
--- a/cpp/src/IcePatch/Util.cpp
+++ b/cpp/src/IcePatch/Util.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IcePatch/Util.h>
#include <IceUtil/InputUtil.h>
#include <fstream>
diff --git a/cpp/src/IceSSL/BaseCerts.cpp b/cpp/src/IceSSL/BaseCerts.cpp
index 200d530c411..cd0c7b15f05 100644
--- a/cpp/src/IceSSL/BaseCerts.cpp
+++ b/cpp/src/IceSSL/BaseCerts.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/BaseCerts.h>
using namespace IceSSL;
diff --git a/cpp/src/IceSSL/BaseCerts.h b/cpp/src/IceSSL/BaseCerts.h
index 32fd21032d0..5f39ffc49f8 100644
--- a/cpp/src/IceSSL/BaseCerts.h
+++ b/cpp/src/IceSSL/BaseCerts.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_BASE_CERTS_H
#define ICE_SSL_BASE_CERTS_H
diff --git a/cpp/src/IceSSL/CertificateAuthority.cpp b/cpp/src/IceSSL/CertificateAuthority.cpp
index 4b9eff75823..1e9829287d1 100644
--- a/cpp/src/IceSSL/CertificateAuthority.cpp
+++ b/cpp/src/IceSSL/CertificateAuthority.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/CertificateAuthority.h>
using namespace std;
diff --git a/cpp/src/IceSSL/CertificateAuthority.h b/cpp/src/IceSSL/CertificateAuthority.h
index 02024e015f7..1b93824d6b0 100644
--- a/cpp/src/IceSSL/CertificateAuthority.h
+++ b/cpp/src/IceSSL/CertificateAuthority.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_AUTHORITY_H
#define ICE_SSL_CERTIFICATE_AUTHORITY_H
diff --git a/cpp/src/IceSSL/CertificateDesc.cpp b/cpp/src/IceSSL/CertificateDesc.cpp
index 9ef6312d5f9..5fbb869d03e 100644
--- a/cpp/src/IceSSL/CertificateDesc.cpp
+++ b/cpp/src/IceSSL/CertificateDesc.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/CertificateDesc.h>
using namespace std;
diff --git a/cpp/src/IceSSL/CertificateDesc.h b/cpp/src/IceSSL/CertificateDesc.h
index 4236044f54b..33feb112def 100644
--- a/cpp/src/IceSSL/CertificateDesc.h
+++ b/cpp/src/IceSSL/CertificateDesc.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CERTIFICATE_DESC_H
#define ICE_SSL_CERTIFICATE_DESC_H
diff --git a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp
index 9af66e69394..c9122eba122 100644
--- a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp
+++ b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/CertificateVerifierOpenSSL.h>
IceSSL::CertificateVerifierOpenSSL::~CertificateVerifierOpenSSL()
diff --git a/cpp/src/IceSSL/ClientContext.cpp b/cpp/src/IceSSL/ClientContext.cpp
index 81ba2394be6..18cd38fd36a 100644
--- a/cpp/src/IceSSL/ClientContext.cpp
+++ b/cpp/src/IceSSL/ClientContext.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Communicator.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceSSL/ClientContext.h b/cpp/src/IceSSL/ClientContext.h
index 06f6e8adcc2..95097f18822 100644
--- a/cpp/src/IceSSL/ClientContext.h
+++ b/cpp/src/IceSSL/ClientContext.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICESSL_CLIENT_CONTEXT_H
#define ICESSL_CLIENT_CONTEXT_H
diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp
index 9d35e5d810c..f71f49411b1 100644
--- a/cpp/src/IceSSL/ConfigParser.cpp
+++ b/cpp/src/IceSSL/ConfigParser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/ConfigParser.h>
#include <IceSSL/OpenSSL.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/src/IceSSL/ConfigParser.h b/cpp/src/IceSSL/ConfigParser.h
index 9f07f6c30ac..bec062aebcd 100644
--- a/cpp/src/IceSSL/ConfigParser.h
+++ b/cpp/src/IceSSL/ConfigParser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CONFIG_PARSER_H
#define ICE_SSL_CONFIG_PARSER_H
diff --git a/cpp/src/IceSSL/Context.cpp b/cpp/src/IceSSL/Context.cpp
index c2f4d5058b8..f046f2c9b56 100644
--- a/cpp/src/IceSSL/Context.cpp
+++ b/cpp/src/IceSSL/Context.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Communicator.h>
#include <Ice/LoggerUtil.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/IceSSL/Context.h b/cpp/src/IceSSL/Context.h
index a6945eedb15..35e9ec59ea0 100644
--- a/cpp/src/IceSSL/Context.h
+++ b/cpp/src/IceSSL/Context.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICESSL_CONTEXT_H
#define ICESSL_CONTEXT_H
diff --git a/cpp/src/IceSSL/ContextF.h b/cpp/src/IceSSL/ContextF.h
index 1aeff55e60a..2e27e07d93d 100644
--- a/cpp/src/IceSSL/ContextF.h
+++ b/cpp/src/IceSSL/ContextF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CONTEXT_OPENSSL_F_H
#define ICE_SSL_CONTEXT_OPENSSL_F_H
diff --git a/cpp/src/IceSSL/Convert.cpp b/cpp/src/IceSSL/Convert.cpp
index 6162b772c1c..86af68cc5c4 100644
--- a/cpp/src/IceSSL/Convert.cpp
+++ b/cpp/src/IceSSL/Convert.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Config.h>
#include <IceSSL/Convert.h>
#include <iterator>
diff --git a/cpp/src/IceSSL/Convert.h b/cpp/src/IceSSL/Convert.h
index 33b79a88523..12c0afe6133 100644
--- a/cpp/src/IceSSL/Convert.h
+++ b/cpp/src/IceSSL/Convert.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CONVERT_H
#define ICE_SSL_CONVERT_H
diff --git a/cpp/src/IceSSL/DHParams.cpp b/cpp/src/IceSSL/DHParams.cpp
index 60e1ed75a50..aa2f5e74ead 100644
--- a/cpp/src/IceSSL/DHParams.cpp
+++ b/cpp/src/IceSSL/DHParams.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/DHParams.h>
void IceInternal::incRef(::IceSSL::DHParams* p) { p->__incRef(); }
diff --git a/cpp/src/IceSSL/DHParams.h b/cpp/src/IceSSL/DHParams.h
index b010210b03a..1d247a3fd24 100644
--- a/cpp/src/IceSSL/DHParams.h
+++ b/cpp/src/IceSSL/DHParams.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_DH_PARAMS_H
#define ICE_DH_PARAMS_H
diff --git a/cpp/src/IceSSL/DHParamsF.h b/cpp/src/IceSSL/DHParamsF.h
index 43661596b84..4ee09560ded 100644
--- a/cpp/src/IceSSL/DHParamsF.h
+++ b/cpp/src/IceSSL/DHParamsF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_DH_PARAMS_F_H
#define ICE_DH_PARAMS_F_H
diff --git a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp
index 633a16b50cf..288a99ca009 100644
--- a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp
+++ b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Communicator.h>
#include <Ice/Properties.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceSSL/DefaultCertificateVerifier.h b/cpp/src/IceSSL/DefaultCertificateVerifier.h
index 93f173fda89..a435dfcb06d 100644
--- a/cpp/src/IceSSL/DefaultCertificateVerifier.h
+++ b/cpp/src/IceSSL/DefaultCertificateVerifier.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_DEFAULT_CERTIFICATE_VERIFIER_H
#define ICE_SSL_DEFAULT_CERTIFICATE_VERIFIER_H
diff --git a/cpp/src/IceSSL/GeneralConfig.cpp b/cpp/src/IceSSL/GeneralConfig.cpp
index 84ef421254e..a631eaee43d 100644
--- a/cpp/src/IceSSL/GeneralConfig.cpp
+++ b/cpp/src/IceSSL/GeneralConfig.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/GeneralConfig.h>
#include <string>
diff --git a/cpp/src/IceSSL/GeneralConfig.h b/cpp/src/IceSSL/GeneralConfig.h
index 6bb2e40ddbc..9a6601b7d80 100644
--- a/cpp/src/IceSSL/GeneralConfig.h
+++ b/cpp/src/IceSSL/GeneralConfig.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_GENERAL_CONFIG_H
#define ICE_SSL_GENERAL_CONFIG_H
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index a58e932ece5..0d49613f08f 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -1,17 +1,17 @@
-#**********************************************************************
+# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION))
diff --git a/cpp/src/IceSSL/OpenSSL.h b/cpp/src/IceSSL/OpenSSL.h
index 2dcbb7d53ff..576c66784e5 100644
--- a/cpp/src/IceSSL/OpenSSL.h
+++ b/cpp/src/IceSSL/OpenSSL.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_OPENSSL_H
#define ICE_OPENSSL_H
diff --git a/cpp/src/IceSSL/OpenSSLJanitors.cpp b/cpp/src/IceSSL/OpenSSLJanitors.cpp
index 3d3f173a77e..3431a9bf10b 100644
--- a/cpp/src/IceSSL/OpenSSLJanitors.cpp
+++ b/cpp/src/IceSSL/OpenSSLJanitors.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/OpenSSLJanitors.h>
IceSSL::RSAJanitor::RSAJanitor(RSA* rsa) :
diff --git a/cpp/src/IceSSL/OpenSSLJanitors.h b/cpp/src/IceSSL/OpenSSLJanitors.h
index 9fdd19fe6e1..dc405f2f7a7 100644
--- a/cpp/src/IceSSL/OpenSSLJanitors.h
+++ b/cpp/src/IceSSL/OpenSSLJanitors.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_JANITORS_H
#define ICE_SSL_JANITORS_H
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 6d020a45d39..0fbe9b1701b 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Mutex.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.h b/cpp/src/IceSSL/OpenSSLPluginI.h
index 1d79de37189..e4f96d4a294 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.h
+++ b/cpp/src/IceSSL/OpenSSLPluginI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_OPENSSL_PLUGIN_I_H
#define ICE_SSL_OPENSSL_PLUGIN_I_H
diff --git a/cpp/src/IceSSL/OpenSSLPluginIF.h b/cpp/src/IceSSL/OpenSSLPluginIF.h
index cff351f2bbe..f0e42a69144 100644
--- a/cpp/src/IceSSL/OpenSSLPluginIF.h
+++ b/cpp/src/IceSSL/OpenSSLPluginIF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_OPENSSL_PLUGIN_I_F_H
#define ICE_SSL_OPENSSL_PLUGIN_I_F_H
diff --git a/cpp/src/IceSSL/OpenSSLUtils.cpp b/cpp/src/IceSSL/OpenSSLUtils.cpp
index 04b7ae941a8..14261af4593 100644
--- a/cpp/src/IceSSL/OpenSSLUtils.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtils.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Mutex.h>
#include <IceSSL/OpenSSLPluginI.h>
diff --git a/cpp/src/IceSSL/OpenSSLUtils.h b/cpp/src/IceSSL/OpenSSLUtils.h
index 9551fd29193..4b7851e720e 100644
--- a/cpp/src/IceSSL/OpenSSLUtils.h
+++ b/cpp/src/IceSSL/OpenSSLUtils.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Config.h>
#include <openssl/ssl.h>
diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp
index 1564b262583..160fc8e21bd 100644
--- a/cpp/src/IceSSL/RSACertificateGen.cpp
+++ b/cpp/src/IceSSL/RSACertificateGen.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Config.h>
#include <IceSSL/RSACertificateGen.h>
#include <IceSSL/OpenSSLJanitors.h>
diff --git a/cpp/src/IceSSL/RSAKeyPair.cpp b/cpp/src/IceSSL/RSAKeyPair.cpp
index e68ee15b388..91de5336d37 100644
--- a/cpp/src/IceSSL/RSAKeyPair.cpp
+++ b/cpp/src/IceSSL/RSAKeyPair.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Config.h>
#include <IceUtil/Base64.h>
#include <IceSSL/RSAKeyPair.h>
diff --git a/cpp/src/IceSSL/RSAPrivateKey.cpp b/cpp/src/IceSSL/RSAPrivateKey.cpp
index 99e1372247d..731b3809fef 100644
--- a/cpp/src/IceSSL/RSAPrivateKey.cpp
+++ b/cpp/src/IceSSL/RSAPrivateKey.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Config.h>
#include <IceUtil/Base64.h>
#include <IceSSL/RSAPrivateKey.h>
diff --git a/cpp/src/IceSSL/RSAPublicKey.cpp b/cpp/src/IceSSL/RSAPublicKey.cpp
index 5e978deb394..a70af2c24e8 100644
--- a/cpp/src/IceSSL/RSAPublicKey.cpp
+++ b/cpp/src/IceSSL/RSAPublicKey.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Config.h>
#include <IceUtil/Base64.h>
#include <IceSSL/RSAPublicKey.h>
diff --git a/cpp/src/IceSSL/ServerContext.cpp b/cpp/src/IceSSL/ServerContext.cpp
index 1ceb4d77255..fd629b3d67e 100644
--- a/cpp/src/IceSSL/ServerContext.cpp
+++ b/cpp/src/IceSSL/ServerContext.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Communicator.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceSSL/ServerContext.h b/cpp/src/IceSSL/ServerContext.h
index f7c7c22424d..aa3a658b5b1 100644
--- a/cpp/src/IceSSL/ServerContext.h
+++ b/cpp/src/IceSSL/ServerContext.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICESSL_SERVER_CONTEXT_H
#define ICESSL_SERVER_CONTEXT_H
diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.cpp b/cpp/src/IceSSL/SingleCertificateVerifier.cpp
index d9950ba68ad..dcf72eddacd 100644
--- a/cpp/src/IceSSL/SingleCertificateVerifier.cpp
+++ b/cpp/src/IceSSL/SingleCertificateVerifier.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/SingleCertificateVerifier.h>
#include <IceSSL/Convert.h>
#include <openssl/err.h>
diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.h b/cpp/src/IceSSL/SingleCertificateVerifier.h
index b17a0dcce85..c79c6bd64fc 100644
--- a/cpp/src/IceSSL/SingleCertificateVerifier.h
+++ b/cpp/src/IceSSL/SingleCertificateVerifier.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_SINGLE_CERTIFICATE_VERIFIER_H
#define ICE_SSL_SINGLE_CERTIFICATE_VERIFIER_H
diff --git a/cpp/src/IceSSL/SslAcceptor.cpp b/cpp/src/IceSSL/SslAcceptor.cpp
index e2a6ca27779..27deb5c759c 100644
--- a/cpp/src/IceSSL/SslAcceptor.cpp
+++ b/cpp/src/IceSSL/SslAcceptor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LoggerUtil.h>
#include <Ice/Network.h>
diff --git a/cpp/src/IceSSL/SslAcceptor.h b/cpp/src/IceSSL/SslAcceptor.h
index 3ffd72560d8..ee49edd1cc2 100644
--- a/cpp/src/IceSSL/SslAcceptor.h
+++ b/cpp/src/IceSSL/SslAcceptor.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_ACCEPTOR_H
#define ICE_SSL_ACCEPTOR_H
diff --git a/cpp/src/IceSSL/SslClientTransceiver.cpp b/cpp/src/IceSSL/SslClientTransceiver.cpp
index ea90e1c54ef..e72250250fc 100644
--- a/cpp/src/IceSSL/SslClientTransceiver.cpp
+++ b/cpp/src/IceSSL/SslClientTransceiver.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LoggerUtil.h>
#include <Ice/Stats.h>
#include <Ice/Network.h>
diff --git a/cpp/src/IceSSL/SslClientTransceiver.h b/cpp/src/IceSSL/SslClientTransceiver.h
index 80ee633e0cf..3ab69101d32 100644
--- a/cpp/src/IceSSL/SslClientTransceiver.h
+++ b/cpp/src/IceSSL/SslClientTransceiver.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CLIENT_TRANSCEIVER_H
#define ICE_SSL_CLIENT_TRANSCEIVER_H
diff --git a/cpp/src/IceSSL/SslConnector.cpp b/cpp/src/IceSSL/SslConnector.cpp
index 06973f8682c..88336f7aeab 100644
--- a/cpp/src/IceSSL/SslConnector.cpp
+++ b/cpp/src/IceSSL/SslConnector.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Logger.h>
#include <Ice/Network.h>
diff --git a/cpp/src/IceSSL/SslConnector.h b/cpp/src/IceSSL/SslConnector.h
index fc6fd35171e..4ba4522e16b 100644
--- a/cpp/src/IceSSL/SslConnector.h
+++ b/cpp/src/IceSSL/SslConnector.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_CONNECTOR_H
#define ICE_SSL_CONNECTOR_H
diff --git a/cpp/src/IceSSL/SslEndpoint.cpp b/cpp/src/IceSSL/SslEndpoint.cpp
index 13c0049aa23..cb23b0f9fa9 100644
--- a/cpp/src/IceSSL/SslEndpoint.cpp
+++ b/cpp/src/IceSSL/SslEndpoint.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Network.h>
#include <Ice/BasicStream.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/IceSSL/SslEndpoint.h b/cpp/src/IceSSL/SslEndpoint.h
index f6aea6a7203..10b8769b908 100644
--- a/cpp/src/IceSSL/SslEndpoint.h
+++ b/cpp/src/IceSSL/SslEndpoint.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_ENDPOINT_H
#define ICE_SSL_ENDPOINT_H
diff --git a/cpp/src/IceSSL/SslException.cpp b/cpp/src/IceSSL/SslException.cpp
index 1fb0951ce48..95ed960d7b6 100644
--- a/cpp/src/IceSSL/SslException.cpp
+++ b/cpp/src/IceSSL/SslException.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LocalException.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp
index bf05422c09d..ee3d4e5e320 100644
--- a/cpp/src/IceSSL/SslServerTransceiver.cpp
+++ b/cpp/src/IceSSL/SslServerTransceiver.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LoggerUtil.h>
#include <Ice/Stats.h>
#include <Ice/Network.h>
diff --git a/cpp/src/IceSSL/SslServerTransceiver.h b/cpp/src/IceSSL/SslServerTransceiver.h
index 9ecf4b21ca8..1abae4d42df 100644
--- a/cpp/src/IceSSL/SslServerTransceiver.h
+++ b/cpp/src/IceSSL/SslServerTransceiver.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_SERVER_TRANSCEIVER_H
#define ICE_SSL_SERVER_TRANSCEIVER_H
diff --git a/cpp/src/IceSSL/SslTransceiver.cpp b/cpp/src/IceSSL/SslTransceiver.cpp
index d9595a4a37f..b457d46e1ff 100644
--- a/cpp/src/IceSSL/SslTransceiver.cpp
+++ b/cpp/src/IceSSL/SslTransceiver.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/LoggerUtil.h>
#include <Ice/Stats.h>
#include <Ice/Buffer.h>
diff --git a/cpp/src/IceSSL/SslTransceiver.h b/cpp/src/IceSSL/SslTransceiver.h
index 582d648587e..cccf650f016 100644
--- a/cpp/src/IceSSL/SslTransceiver.h
+++ b/cpp/src/IceSSL/SslTransceiver.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_TRANSCEIVER_H
#define ICE_SSL_TRANSCEIVER_H
diff --git a/cpp/src/IceSSL/SslTransceiverF.h b/cpp/src/IceSSL/SslTransceiverF.h
index 0d9fd555110..80cfbc29a87 100644
--- a/cpp/src/IceSSL/SslTransceiverF.h
+++ b/cpp/src/IceSSL/SslTransceiverF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_TRANSEIVER_OPENSSL_F_H
#define ICE_SSL_TRANSEIVER_OPENSSL_F_H
diff --git a/cpp/src/IceSSL/TempCerts.cpp b/cpp/src/IceSSL/TempCerts.cpp
index 26cdbd63427..11a2b54e919 100644
--- a/cpp/src/IceSSL/TempCerts.cpp
+++ b/cpp/src/IceSSL/TempCerts.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/TempCerts.h>
IceSSL::TempCertificates::TempCertificates()
diff --git a/cpp/src/IceSSL/TempCerts.h b/cpp/src/IceSSL/TempCerts.h
index b4f12b7df9c..bb9ceb14f91 100644
--- a/cpp/src/IceSSL/TempCerts.h
+++ b/cpp/src/IceSSL/TempCerts.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_TEMP_CERTS_H
#define ICE_SSL_TEMP_CERTS_H
diff --git a/cpp/src/IceSSL/TraceLevels.cpp b/cpp/src/IceSSL/TraceLevels.cpp
index 04cf4521593..ca9622f85d6 100644
--- a/cpp/src/IceSSL/TraceLevels.cpp
+++ b/cpp/src/IceSSL/TraceLevels.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceSSL/TraceLevels.h>
#include <Ice/Communicator.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/IceSSL/TraceLevels.h b/cpp/src/IceSSL/TraceLevels.h
index 414d4594be6..8ef1407e361 100644
--- a/cpp/src/IceSSL/TraceLevels.h
+++ b/cpp/src/IceSSL/TraceLevels.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_TRACE_LEVELS_H
#define ICE_SSL_TRACE_LEVELS_H
diff --git a/cpp/src/IceSSL/TraceLevelsF.h b/cpp/src/IceSSL/TraceLevelsF.h
index 9826e179aa9..a25e5a05bbe 100644
--- a/cpp/src/IceSSL/TraceLevelsF.h
+++ b/cpp/src/IceSSL/TraceLevelsF.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_SSL_TRACE_LEVELS_F_H
#define ICE_SSL_TRACE_LEVELS_F_H
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index a6ca6864436..6a7cf426b8c 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Event.h b/cpp/src/IceStorm/Event.h
index 545966ef642..e464a7f061c 100644
--- a/cpp/src/IceStorm/Event.h
+++ b/cpp/src/IceStorm/Event.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef EVENT_H
#define EVENT_H
diff --git a/cpp/src/IceStorm/Flushable.h b/cpp/src/IceStorm/Flushable.h
index 966ba89aba2..81e0a1e9293 100644
--- a/cpp/src/IceStorm/Flushable.h
+++ b/cpp/src/IceStorm/Flushable.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FLUSHABLE_H
#define FLUSHABLE_H
diff --git a/cpp/src/IceStorm/Flusher.cpp b/cpp/src/IceStorm/Flusher.cpp
index 302d9160b2f..a9697698781 100644
--- a/cpp/src/IceStorm/Flusher.cpp
+++ b/cpp/src/IceStorm/Flusher.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Thread.h>
#include <IceUtil/Monitor.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Flusher.h b/cpp/src/IceStorm/Flusher.h
index 7ba40ecf9b8..222f534363a 100644
--- a/cpp/src/IceStorm/Flusher.h
+++ b/cpp/src/IceStorm/Flusher.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FLUSHER_H
#define FLUSHER_H
diff --git a/cpp/src/IceStorm/GPL.h b/cpp/src/IceStorm/GPL.h
index 9c735707855..8e2e2472af8 100644
--- a/cpp/src/IceStorm/GPL.h
+++ b/cpp/src/IceStorm/GPL.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_GPL_H
#define ICE_GPL_H
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index b209335daa3..b8dc5afc8e7 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice
index 0336310cf34..02959a6d9c9 100644
--- a/cpp/src/IceStorm/IceStormInternal.ice
+++ b/cpp/src/IceStorm/IceStormInternal.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STORM_INTERNAL_ICE
#define ICE_STORM_INTERNAL_ICE
diff --git a/cpp/src/IceStorm/LinkProxy.cpp b/cpp/src/IceStorm/LinkProxy.cpp
index 1dd6ac49a14..342d5ffdeb0 100644
--- a/cpp/src/IceStorm/LinkProxy.cpp
+++ b/cpp/src/IceStorm/LinkProxy.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceStorm/LinkProxy.h>
using namespace std;
diff --git a/cpp/src/IceStorm/LinkProxy.h b/cpp/src/IceStorm/LinkProxy.h
index 836a93e4dc1..567a22270f9 100644
--- a/cpp/src/IceStorm/LinkProxy.h
+++ b/cpp/src/IceStorm/LinkProxy.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LINK_PROXY_H
#define LINK_PROXY_H
diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice
index cf5408765a0..faa43018fd3 100644
--- a/cpp/src/IceStorm/LinkRecord.ice
+++ b/cpp/src/IceStorm/LinkRecord.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LINK_RECORD_ICE
#define LINK_RECORD_ICE
diff --git a/cpp/src/IceStorm/LinkSubscriber.cpp b/cpp/src/IceStorm/LinkSubscriber.cpp
index 8eb19e3476f..e25a94b2418 100644
--- a/cpp/src/IceStorm/LinkSubscriber.cpp
+++ b/cpp/src/IceStorm/LinkSubscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/LinkSubscriber.h>
#include <IceStorm/SubscriberFactory.h>
diff --git a/cpp/src/IceStorm/LinkSubscriber.h b/cpp/src/IceStorm/LinkSubscriber.h
index f5eacff632e..0d4d7a651ec 100644
--- a/cpp/src/IceStorm/LinkSubscriber.h
+++ b/cpp/src/IceStorm/LinkSubscriber.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LINK_SUBSCRIBER_H
#define LINK_SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index c1b01198cd6..0e2cea470ea 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -1,17 +1,17 @@
-#**********************************************************************
+# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IceStorm,$(VERSION))
diff --git a/cpp/src/IceStorm/OnewayBatchSubscriber.cpp b/cpp/src/IceStorm/OnewayBatchSubscriber.cpp
index e8869cd8e13..9ae49bbf575 100644
--- a/cpp/src/IceStorm/OnewayBatchSubscriber.cpp
+++ b/cpp/src/IceStorm/OnewayBatchSubscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/OnewayBatchSubscriber.h>
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/OnewayBatchSubscriber.h b/cpp/src/IceStorm/OnewayBatchSubscriber.h
index 4aef9f36a35..fb57a042b3c 100644
--- a/cpp/src/IceStorm/OnewayBatchSubscriber.h
+++ b/cpp/src/IceStorm/OnewayBatchSubscriber.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ONEWAY_BATCH_SUBSCRIBER_H
#define ONEWAY_BATCH_SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/OnewayProxy.cpp b/cpp/src/IceStorm/OnewayProxy.cpp
index 9b89dd93588..22415a62f91 100644
--- a/cpp/src/IceStorm/OnewayProxy.cpp
+++ b/cpp/src/IceStorm/OnewayProxy.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceStorm/OnewayProxy.h>
using namespace std;
diff --git a/cpp/src/IceStorm/OnewayProxy.h b/cpp/src/IceStorm/OnewayProxy.h
index cdbdebc605b..c70e9c2a102 100644
--- a/cpp/src/IceStorm/OnewayProxy.h
+++ b/cpp/src/IceStorm/OnewayProxy.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ONEWAY_PROXY_H
#define ONEWAY_PROXY_H
diff --git a/cpp/src/IceStorm/OnewaySubscriber.cpp b/cpp/src/IceStorm/OnewaySubscriber.cpp
index 5b6ba0d47fa..c64219f79e0 100644
--- a/cpp/src/IceStorm/OnewaySubscriber.cpp
+++ b/cpp/src/IceStorm/OnewaySubscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/OnewaySubscriber.h>
#include <IceStorm/SubscriberFactory.h>
diff --git a/cpp/src/IceStorm/OnewaySubscriber.h b/cpp/src/IceStorm/OnewaySubscriber.h
index a6d5946f7aa..f7645af7032 100644
--- a/cpp/src/IceStorm/OnewaySubscriber.h
+++ b/cpp/src/IceStorm/OnewaySubscriber.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ONEWAY_SUBSCRIBER_H
#define ONEWAY_SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 2175b72d94f..bfcb87777ba 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
#include <IceStorm/WeightedGraph.h>
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index 1ef75b11d6c..ce75ce86ba8 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STORM_PARSER_H
#define ICE_STORM_PARSER_H
diff --git a/cpp/src/IceStorm/QueuedProxy.cpp b/cpp/src/IceStorm/QueuedProxy.cpp
index dbdeb23b212..c353d347569 100644
--- a/cpp/src/IceStorm/QueuedProxy.cpp
+++ b/cpp/src/IceStorm/QueuedProxy.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceStorm/QueuedProxy.h>
using namespace std;
diff --git a/cpp/src/IceStorm/QueuedProxy.h b/cpp/src/IceStorm/QueuedProxy.h
index 4338a4d1640..51bb7776029 100644
--- a/cpp/src/IceStorm/QueuedProxy.h
+++ b/cpp/src/IceStorm/QueuedProxy.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef QUEUED_PROXY_H
#define QUEUED_PROXY_H
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index e4b76a109dd..c14bc0c4b50 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
#include <IceStorm/Grammar.h>
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index cdb038fe449..bb481b1c8b0 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceStorm/TopicManagerI.h>
#include <IceStorm/TraceLevels.h>
#include <IceBox/IceBox.h>
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 9207e0c53d6..3d2435b33a1 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceStorm/Subscriber.h>
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index 53d3e64cfd9..acb83d65a03 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SUBSCRIBER_H
#define SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/SubscriberFactory.cpp b/cpp/src/IceStorm/SubscriberFactory.cpp
index 4aabd860592..5278159e656 100644
--- a/cpp/src/IceStorm/SubscriberFactory.cpp
+++ b/cpp/src/IceStorm/SubscriberFactory.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/SubscriberFactory.h>
#include <IceStorm/LinkSubscriber.h>
diff --git a/cpp/src/IceStorm/SubscriberFactory.h b/cpp/src/IceStorm/SubscriberFactory.h
index eeabc8d29a2..b1df3af5406 100644
--- a/cpp/src/IceStorm/SubscriberFactory.h
+++ b/cpp/src/IceStorm/SubscriberFactory.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SUBSCRIBER_FACTORY_H
#define SUBSCRIBER_FACTORY_H
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 9fbaf13fe3e..44876490676 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/Functional.h>
#include <IceStorm/TopicI.h>
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index 5e75fd03e20..74e86b052ac 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TOPIC_I_H
#define TOPIC_I_H
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index d883c9fc9d0..952af4da3d4 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/TopicManagerI.h>
#include <IceStorm/TopicI.h>
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index 07c568eaa51..6c8547c6187 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TOPIC_MANAGER_I_H
#define TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index 649bd5915f1..c163c64d0bc 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Properties.h>
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 8aed1a237c0..8512826970e 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ICE_STORM_TRACE_LEVELS_H
#define ICE_STORM_TRACE_LEVELS_H
diff --git a/cpp/src/IceStorm/WeightedGraph.cpp b/cpp/src/IceStorm/WeightedGraph.cpp
index e9e69abd8cd..2afa7be5fb9 100644
--- a/cpp/src/IceStorm/WeightedGraph.cpp
+++ b/cpp/src/IceStorm/WeightedGraph.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceStorm/WeightedGraph.h>
#include <IceXML/Parser.h>
diff --git a/cpp/src/IceStorm/WeightedGraph.h b/cpp/src/IceStorm/WeightedGraph.h
index 14ef043ac84..46b9da0b6e7 100644
--- a/cpp/src/IceStorm/WeightedGraph.h
+++ b/cpp/src/IceStorm/WeightedGraph.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef WEIGHTED_GRAPH_H
#define WEIGHTED_GRAPH_H
diff --git a/cpp/src/IceUtil/Base64.cpp b/cpp/src/IceUtil/Base64.cpp
index 3989e23533a..a432110278e 100644
--- a/cpp/src/IceUtil/Base64.cpp
+++ b/cpp/src/IceUtil/Base64.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Base64.h>
#include <iostream>
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index a6b6a84da25..312b3514aff 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Cond.h>
#ifndef _WIN32
diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/IceUtil/CountDownLatch.cpp
index 41a9d60abe6..178b3ca2b4e 100644
--- a/cpp/src/IceUtil/CountDownLatch.cpp
+++ b/cpp/src/IceUtil/CountDownLatch.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/CountDownLatch.h>
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index 887483df5dc..0b11af63987 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/StaticMutex.h>
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 795b9217b12..e93b578949a 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Exception.h>
using namespace std;
diff --git a/cpp/src/IceUtil/GC.cpp b/cpp/src/IceUtil/GC.cpp
index e9fe8052c92..8e1e9e33f3a 100644
--- a/cpp/src/IceUtil/GC.cpp
+++ b/cpp/src/IceUtil/GC.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/GC.h>
#include <IceUtil/Time.h>
#include <IceUtil/GCRecMutex.h>
diff --git a/cpp/src/IceUtil/GCRecMutex.cpp b/cpp/src/IceUtil/GCRecMutex.cpp
index d474573b3d8..1b2eb54449a 100644
--- a/cpp/src/IceUtil/GCRecMutex.cpp
+++ b/cpp/src/IceUtil/GCRecMutex.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/GCRecMutex.h>
namespace IceUtil
diff --git a/cpp/src/IceUtil/GCShared.cpp b/cpp/src/IceUtil/GCShared.cpp
index 53fb9ce128f..783d52448fc 100644
--- a/cpp/src/IceUtil/GCShared.cpp
+++ b/cpp/src/IceUtil/GCShared.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/GCShared.h>
namespace IceUtil
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index 128b5d93507..9d71e3b2ced 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/InputUtil.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile
index 6059d14187e..20e3bca3734 100644
--- a/cpp/src/IceUtil/Makefile
+++ b/cpp/src/IceUtil/Makefile
@@ -1,16 +1,17 @@
-# ********************************************************************** #
-# Copyright (c) 2003
+# **********************************************************************
+#
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION))
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 00fc1897f33..870040959aa 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/OutputUtil.h>
using namespace std;
diff --git a/cpp/src/IceUtil/RWRecMutex.cpp b/cpp/src/IceUtil/RWRecMutex.cpp
index ee04c2f4ed6..6bf075df086 100644
--- a/cpp/src/IceUtil/RWRecMutex.cpp
+++ b/cpp/src/IceUtil/RWRecMutex.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/RWRecMutex.h>
#include <IceUtil/Exception.h>
#include <IceUtil/Time.h>
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 2221a227480..1054779998d 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/RecMutex.h>
#include <IceUtil/Exception.h>
diff --git a/cpp/src/IceUtil/StaticMutex.cpp b/cpp/src/IceUtil/StaticMutex.cpp
index 8fef1f9e3b5..00af53e7498 100644
--- a/cpp/src/IceUtil/StaticMutex.cpp
+++ b/cpp/src/IceUtil/StaticMutex.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/StaticMutex.h>
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 389da0c6f6c..220baf69595 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/StringUtil.h>
using namespace std;
diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp
index c9704378849..3bfd809c856 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/IceUtil/Thread.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Thread.h>
#include <IceUtil/Time.h>
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 0cafa6612bd..acc74c7fe71 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/ThreadException.h>
using namespace std;
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index a056d93bf12..7d365f820e1 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Time.h>
#ifdef _WIN32
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index acdd3af223f..82a341f82d6 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/UUID.h>
// On Windows, we use Windows's RPC UUID generator.
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index 2f553cd099a..31cf54cc56d 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Unicode.h>
#include <algorithm>
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
index 2913bb662e2..a37a7ec8891 100644
--- a/cpp/src/IceXML/Makefile
+++ b/cpp/src/IceXML/Makefile
@@ -1,17 +1,17 @@
-#**********************************************************************
+# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IceXML,$(VERSION))
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 7231005b74f..647d73af588 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceXML/Parser.h>
#include <expat.h>
#include <list>
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 9bce3dc9361..8f348a8b758 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 7fa579e051b..58ae8503265 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/CPlusPlusUtil.h>
using namespace std;
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index 88a9fb2fd9c..64f8037e634 100755
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/CsUtil.h>
#include <IceUtil/Functional.h>
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 44119fede24..05ace116581 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/GrammarUtil.h>
#include <IceUtil/UUID.h>
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 685475b74aa..bb3324f0861 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SLICE_GRAMMAR_UTIL_H
#define SLICE_GRAMMAR_UTIL_H
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 883a4f1b736..7e213e49fb7 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/JavaUtil.h>
#include <IceUtil/Functional.h>
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index 68a5b9dc6f0..d0b3f029d7c 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,Slice,$(VERSION))
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 0e7106bacda..71be398148f 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Functional.h>
#include <Slice/Parser.h>
#include <Slice/GrammarUtil.h>
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 15cc61c62bd..15cb5e19e8e 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <algorithm>
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 7bf294dd4c2..13e3983d715 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
#include <Slice/Grammar.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/icecpp/Makefile b/cpp/src/icecpp/Makefile
index a86643804ed..a6b4a82e0f9 100644
--- a/cpp/src/icecpp/Makefile
+++ b/cpp/src/icecpp/Makefile
@@ -1,13 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Huntsville, AL, USA
+# North Palm Beach, FL, USA
#
-# All Rights Reserved
+# All Rights Reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/icecpp
diff --git a/cpp/src/icecpp/config.h b/cpp/src/icecpp/config.h
index b5be9b4dbdb..dabec0f95f4 100644
--- a/cpp/src/icecpp/config.h
+++ b/cpp/src/icecpp/config.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2001
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
//
// This configuration file is based on the one generated by the
// configure script from the gcc-2.8.1 distribution.
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 8cde5d01580..6ae7c222962 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// copyright (c) 2003
-// zeroc, inc.
-// Billerica, MA, USA
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Gen.h>
#include <Slice/CPlusPlusUtil.h>
#include <IceUtil/Functional.h>
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 8b6f8d878f7..24c2fbae9a5 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 28af6822a78..9a84a4d31c8 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <Gen.h>
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 701112ee642..129d6a6ae4d 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2cpp
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index ef1c115c797..41c3230ccb4 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Functional.h>
#include <Gen.h>
#include <limits>
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index 310c922bea0..96a83e5bd55 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index 4ed1ce800c8..036c4060de8 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <Gen.h>
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index fefd659a3e0..c2936899ebe 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2cs
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 01645da2ea1..8151fa2d008 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Functional.h>
#include <Gen.h>
diff --git a/cpp/src/slice2docbook/Gen.h b/cpp/src/slice2docbook/Gen.h
index ae68c9fb495..f49dc522b03 100644
--- a/cpp/src/slice2docbook/Gen.h
+++ b/cpp/src/slice2docbook/Gen.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index f04f01acedf..f9e79fdd48b 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <Gen.h>
diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile
index b4b7a3b1a69..25e5a71c665 100644
--- a/cpp/src/slice2docbook/Makefile
+++ b/cpp/src/slice2docbook/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2docbook
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 944b8d9b269..4a42d917f62 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <Slice/CPlusPlusUtil.h>
#include <IceUtil/OutputUtil.h>
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index 03a21458e43..d637eed2b5e 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2freeze
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index d4ac1a4c3fd..22e9c20befb 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <Slice/JavaUtil.h>
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index a3d5d4aed3c..1e1923bd314 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2freezej
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 77787c2a810..83d293377ab 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Gen.h>
#include <IceUtil/Functional.h>
#include <IceUtil/Algorithm.h>
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 24a7b713d24..b06e9ddbab0 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 0d36fa3dcec..9f159e8254a 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Slice/Preprocessor.h>
#include <Gen.h>
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 2dd5dcb295b..8efc35e0341 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
NAME = $(top_srcdir)/bin/slice2java
diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile
index 7f1162b3841..81096ebe07f 100644
--- a/cpp/test/Freeze/Makefile
+++ b/cpp/test/Freeze/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp
index 1d9942f26a9..c5d8c5e17bb 100644
--- a/cpp/test/Freeze/complex/Client.cpp
+++ b/cpp/test/Freeze/complex/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/Freeze.h>
#include <ComplexDict.h>
#include <TestCommon.h>
diff --git a/cpp/test/Freeze/complex/Complex.ice b/cpp/test/Freeze/complex/Complex.ice
index 171cf1d9372..859e89515a1 100644
--- a/cpp/test/Freeze/complex/Complex.ice
+++ b/cpp/test/Freeze/complex/Complex.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module Complex
{
diff --git a/cpp/test/Freeze/complex/Grammar.y b/cpp/test/Freeze/complex/Grammar.y
index 9039a3fdc88..b867867ef6d 100644
--- a/cpp/test/Freeze/complex/Grammar.y
+++ b/cpp/test/Freeze/complex/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <NodeI.h>
#include <Parser.h>
diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile
index e7497af09c3..abe21644f51 100644
--- a/cpp/test/Freeze/complex/Makefile
+++ b/cpp/test/Freeze/complex/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Freeze/complex/NodeI.h b/cpp/test/Freeze/complex/NodeI.h
index 583eec93e20..85aaccc7bcd 100644
--- a/cpp/test/Freeze/complex/NodeI.h
+++ b/cpp/test/Freeze/complex/NodeI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef NODE_I_H
#define NODE_I_H
diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp
index 3b54ba7cbe1..73717c203b0 100644
--- a/cpp/test/Freeze/complex/Parser.cpp
+++ b/cpp/test/Freeze/complex/Parser.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Parser.h>
using namespace std;
diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h
index 569f89a5513..24468b84831 100644
--- a/cpp/test/Freeze/complex/Parser.h
+++ b/cpp/test/Freeze/complex/Parser.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PARSER_H
#define PARSER_H
diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l
index d5ceadea166..fbc29ed7a83 100644
--- a/cpp/test/Freeze/complex/Scanner.l
+++ b/cpp/test/Freeze/complex/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Parser.h>
#include <Grammar.h>
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index d5689ed59c1..1a04fbfa95f 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp
index 7c24ed7abcb..b4a2f9917a7 100644
--- a/cpp/test/Freeze/dbmap/Client.cpp
+++ b/cpp/test/Freeze/dbmap/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <Freeze/Freeze.h>
#include <TestCommon.h>
diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile
index 7d4f4e1127e..06978ff021e 100644
--- a/cpp/test/Freeze/dbmap/Makefile
+++ b/cpp/test/Freeze/dbmap/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index fdfd3b8ffc9..acef03da659 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp
index 9c04e9556a5..0a60b3ae6ee 100644
--- a/cpp/test/Freeze/evictor/Client.cpp
+++ b/cpp/test/Freeze/evictor/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceUtil/Thread.h>
#include <IceUtil/Time.h>
diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile
index df37bfe509a..4a417b141aa 100644
--- a/cpp/test/Freeze/evictor/Makefile
+++ b/cpp/test/Freeze/evictor/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp
index 60f5a2d6e88..8188f5cfdd0 100644
--- a/cpp/test/Freeze/evictor/Server.cpp
+++ b/cpp/test/Freeze/evictor/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Freeze/evictor/Test.ice b/cpp/test/Freeze/evictor/Test.ice
index cdbe982f481..728d0a4bf19 100644
--- a/cpp/test/Freeze/evictor/Test.ice
+++ b/cpp/test/Freeze/evictor/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp
index 7e0c8b506c0..8676ffb9398 100644
--- a/cpp/test/Freeze/evictor/TestI.cpp
+++ b/cpp/test/Freeze/evictor/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <Freeze/Freeze.h>
#include <TestI.h>
diff --git a/cpp/test/Freeze/evictor/TestI.h b/cpp/test/Freeze/evictor/TestI.h
index 4ca6333248a..12e0bc75c77 100644
--- a/cpp/test/Freeze/evictor/TestI.h
+++ b/cpp/test/Freeze/evictor/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index 7d96ff8e315..4f55468b362 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/FreezeScript/Makefile b/cpp/test/FreezeScript/Makefile
index 32b78528e76..425c5f2f5ed 100644
--- a/cpp/test/FreezeScript/Makefile
+++ b/cpp/test/FreezeScript/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile
index 3cf269794de..03143bff480 100644
--- a/cpp/test/FreezeScript/dbmap/Makefile
+++ b/cpp/test/FreezeScript/dbmap/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = makedb
diff --git a/cpp/test/FreezeScript/dbmap/makedb.cpp b/cpp/test/FreezeScript/dbmap/makedb.cpp
index feba07a89a4..c5a17846942 100644
--- a/cpp/test/FreezeScript/dbmap/makedb.cpp
+++ b/cpp/test/FreezeScript/dbmap/makedb.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <Freeze/Freeze.h>
#include <IntSMap.h>
diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py
index 8a907ba609e..2e19c15c2ea 100755
--- a/cpp/test/FreezeScript/dbmap/run.py
+++ b/cpp/test/FreezeScript/dbmap/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys, re, shutil
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/FreezeScript/evictor/Makefile b/cpp/test/FreezeScript/evictor/Makefile
index ba1746fd4e9..aaee7bab525 100644
--- a/cpp/test/FreezeScript/evictor/Makefile
+++ b/cpp/test/FreezeScript/evictor/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = makedb
diff --git a/cpp/test/FreezeScript/evictor/makedb.cpp b/cpp/test/FreezeScript/evictor/makedb.cpp
index 5543b7ef657..664e266958d 100644
--- a/cpp/test/FreezeScript/evictor/makedb.cpp
+++ b/cpp/test/FreezeScript/evictor/makedb.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Freeze/Freeze.h>
#include <IceUtil/AbstractMutex.h>
#include <TestOld.h>
diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py
index 9a9545687bf..a67668b83d7 100755
--- a/cpp/test/FreezeScript/evictor/run.py
+++ b/cpp/test/FreezeScript/evictor/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys, re, shutil
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Glacier/Makefile b/cpp/test/Glacier/Makefile
index f63bdd75945..bc5f886511c 100644
--- a/cpp/test/Glacier/Makefile
+++ b/cpp/test/Glacier/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Glacier/starter/Callback.ice b/cpp/test/Glacier/starter/Callback.ice
index fd71399aee6..5df246bbb52 100644
--- a/cpp/test/Glacier/starter/Callback.ice
+++ b/cpp/test/Glacier/starter/Callback.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
diff --git a/cpp/test/Glacier/starter/CallbackI.cpp b/cpp/test/Glacier/starter/CallbackI.cpp
index f3669f98947..3942120033c 100644
--- a/cpp/test/Glacier/starter/CallbackI.cpp
+++ b/cpp/test/Glacier/starter/CallbackI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <CallbackI.h>
diff --git a/cpp/test/Glacier/starter/CallbackI.h b/cpp/test/Glacier/starter/CallbackI.h
index 743b9219eec..a8c37504bb1 100644
--- a/cpp/test/Glacier/starter/CallbackI.h
+++ b/cpp/test/Glacier/starter/CallbackI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp
index 427b8f6e57b..98a03c5bd3f 100644
--- a/cpp/test/Glacier/starter/Client.cpp
+++ b/cpp/test/Glacier/starter/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <Glacier/Glacier.h>
#include <TestCommon.h>
diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile
index 25f1609241f..556a13ea46f 100644
--- a/cpp/test/Glacier/starter/Makefile
+++ b/cpp/test/Glacier/starter/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Glacier/starter/Server.cpp b/cpp/test/Glacier/starter/Server.cpp
index 54f55889fb6..c6ea155677e 100644
--- a/cpp/test/Glacier/starter/Server.cpp
+++ b/cpp/test/Glacier/starter/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <CallbackI.h>
diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py
index a2659e77149..18581f6e93a 100755
--- a/cpp/test/Glacier/starter/run.py
+++ b/cpp/test/Glacier/starter/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile
index 59c44d43f98..c1d52ef40bb 100644
--- a/cpp/test/Ice/Makefile
+++ b/cpp/test/Ice/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index fffcfe737b2..98dbabbe984 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index 114fc7054e2..291c70c5853 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 61d5453c727..c3efca7f41f 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <ServantLocatorI.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile
index 61cfaa31996..62ad9806000 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile
+++ b/cpp/test/Ice/adapterDeactivation/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
index 71558de3741..0c159c02665 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <ServantLocatorI.h>
#include <TestCommon.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
index e6c23b650ea..ff851fd9d49 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVANT_LOCATOR_I_H
#define SERVANT_LOCATOR_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index 0b0cc079376..f06060417b8 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Application.h>
#include <ServantLocatorI.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice
index 7b23a4b05a7..a3b0d2a4cca 100644
--- a/cpp/test/Ice/adapterDeactivation/Test.ice
+++ b/cpp/test/Ice/adapterDeactivation/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index 7bf4a73595a..d111c693d94 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h
index 606eddad1a4..f2131b24255 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.h
+++ b/cpp/test/Ice/adapterDeactivation/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py
index 9e98d7f66bd..9c8cf6abcf6 100755
--- a/cpp/test/Ice/adapterDeactivation/run.py
+++ b/cpp/test/Ice/adapterDeactivation/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index cb11f45c493..19dccabad57 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index 3570f57f283..0100258e7ee 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index fd0579c9c89..cf1516e56b3 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile
index f80704e389d..332c563bf02 100644
--- a/cpp/test/Ice/exceptions/Makefile
+++ b/cpp/test/Ice/exceptions/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 1e84bc325f2..b3a8c39e607 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 783585613a5..9593e79f1bc 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice
index e2b7a0e5cf9..6fe30d34edc 100644
--- a/cpp/test/Ice/exceptions/Test.ice
+++ b/cpp/test/Ice/exceptions/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice
index b528aba6642..327b89df9e1 100644
--- a/cpp/test/Ice/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/exceptions/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp
index b0db069f61f..48e8475ead3 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/exceptions/TestAMDI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h
index ce3bd9eee17..36fb756e307 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/exceptions/TestAMDI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp
index e31f141104e..96d1a5b4369 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h
index 6345ba7e799..e0a5982bd6c 100644
--- a/cpp/test/Ice/exceptions/TestI.h
+++ b/cpp/test/Ice/exceptions/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index f92e853d990..76a4f6c77a3 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 4c2782eec47..bcfcbd34e22 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index 669737999b8..482a4634a2e 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index e1b9f5365b8..219bfb27d38 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/facets/Makefile b/cpp/test/Ice/facets/Makefile
index f3502da1d93..fe3a1a85a09 100644
--- a/cpp/test/Ice/facets/Makefile
+++ b/cpp/test/Ice/facets/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index 10f667da298..fad55a1fde3 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice
index 1b4af73e885..e8f202bff53 100644
--- a/cpp/test/Ice/facets/Test.ice
+++ b/cpp/test/Ice/facets/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp
index 2dcded20eae..cb3393552e2 100644
--- a/cpp/test/Ice/facets/TestI.cpp
+++ b/cpp/test/Ice/facets/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h
index 78e351e5350..a3e0d45d002 100644
--- a/cpp/test/Ice/facets/TestI.h
+++ b/cpp/test/Ice/facets/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py
index 9b7ab228a91..f850ddef920 100755
--- a/cpp/test/Ice/facets/run.py
+++ b/cpp/test/Ice/facets/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 4322d38c54f..547f62fd082 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp
index 10946ae5ad9..953a4125c26 100644
--- a/cpp/test/Ice/faultTolerance/Client.cpp
+++ b/cpp/test/Ice/faultTolerance/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile
index c70dea7da71..0b130f407e7 100644
--- a/cpp/test/Ice/faultTolerance/Makefile
+++ b/cpp/test/Ice/faultTolerance/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp
index 2e9ed221516..c1dd94e6e58 100644
--- a/cpp/test/Ice/faultTolerance/Server.cpp
+++ b/cpp/test/Ice/faultTolerance/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice
index 18ef9797ae9..15fa8e63042 100644
--- a/cpp/test/Ice/faultTolerance/Test.ice
+++ b/cpp/test/Ice/faultTolerance/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 7e2443d5199..b04baadbd52 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h
index 639699ffc1c..5f47ab2fc28 100644
--- a/cpp/test/Ice/faultTolerance/TestI.h
+++ b/cpp/test/Ice/faultTolerance/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index f49d02fc595..18077d5c05d 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index 821f0480c3f..f49cc219bb8 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Thread.h>
#include <Ice/Ice.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/gc/Makefile b/cpp/test/Ice/gc/Makefile
index 7856f96999a..0405b6155e8 100644
--- a/cpp/test/Ice/gc/Makefile
+++ b/cpp/test/Ice/gc/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice
index 62dc89f1033..fa01b865d5d 100644
--- a/cpp/test/Ice/gc/Test.ice
+++ b/cpp/test/Ice/gc/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py
index 2843d24574c..1a12fe870a5 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index fffc0b24243..26545cc6493 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index f55b43e48e2..83b6e270da4 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 27f8964a499..0631f6271bb 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile
index f3502da1d93..fe3a1a85a09 100644
--- a/cpp/test/Ice/inheritance/Makefile
+++ b/cpp/test/Ice/inheritance/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index d2558b8bc67..d7f269e9534 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice
index d9b093994bb..a5bcdd48d5c 100644
--- a/cpp/test/Ice/inheritance/Test.ice
+++ b/cpp/test/Ice/inheritance/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp
index d6e71b32602..052395c55a8 100644
--- a/cpp/test/Ice/inheritance/TestI.cpp
+++ b/cpp/test/Ice/inheritance/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index 2f01f2031f6..4f36b2ec572 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index 5ee7c7a1798..7e5c3fdb887 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 659f82efef8..6eeb9643c13 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index 8f35f4262e9..5e4cebfca84 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/location/Collocated.cpp b/cpp/test/Ice/location/Collocated.cpp
index 3fff869e5f5..7d35d7d6176 100644
--- a/cpp/test/Ice/location/Collocated.cpp
+++ b/cpp/test/Ice/location/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/location/Makefile b/cpp/test/Ice/location/Makefile
index 10704d1a378..48917843d10 100644
--- a/cpp/test/Ice/location/Makefile
+++ b/cpp/test/Ice/location/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index ed1ee724f48..95eaffbf142 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <ServerLocator.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp
index badb267c847..22932bfbec7 100644
--- a/cpp/test/Ice/location/ServerLocator.cpp
+++ b/cpp/test/Ice/location/ServerLocator.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/BuiltinSequences.h>
#include <ServerLocator.h>
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h
index dfdcc2285cc..9b69cc46167 100644
--- a/cpp/test/Ice/location/ServerLocator.h
+++ b/cpp/test/Ice/location/ServerLocator.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVER_LOCATOR_H
#define SERVER_LOCATOR_H
diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice
index ae2549eda42..df89980dfa3 100644
--- a/cpp/test/Ice/location/Test.ice
+++ b/cpp/test/Ice/location/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp
index e91444ae720..524f704d2d7 100644
--- a/cpp/test/Ice/location/TestI.cpp
+++ b/cpp/test/Ice/location/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/Locator.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h
index d8107c4f647..3fae64a6433 100644
--- a/cpp/test/Ice/location/TestI.h
+++ b/cpp/test/Ice/location/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index 15cd3827506..2b5e2a209ad 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index 0b2ce2e783a..69a8789105c 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 2eea6e63466..5e75d122ea7 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index fcb27cf92c6..53b4a28ae32 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile
index 9f7c5f346b7..14495be3060 100644
--- a/cpp/test/Ice/objects/Makefile
+++ b/cpp/test/Ice/objects/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index 03f725a52b7..5b6947a9055 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice
index 14051f2ab39..5e2c75bca60 100644
--- a/cpp/test/Ice/objects/Test.ice
+++ b/cpp/test/Ice/objects/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index 504f6f013c3..995cd3fc1be 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 4be8852ebad..b7f13159f95 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index c8c6e3d0bda..3bf88cb9c1b 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 6fca5c22398..2a434e12bf3 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/Locator.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 70851d9d94c..7e5aeb54de1 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index b20e1e1c359..466e9a4ff6b 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/operations/Makefile b/cpp/test/Ice/operations/Makefile
index 6ba74186ce5..2fd0648ba35 100644
--- a/cpp/test/Ice/operations/Makefile
+++ b/cpp/test/Ice/operations/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index 116c1a82acf..e97a29dee25 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 059ddc69bca..48982e820db 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index ad1940d4577..0910350a530 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice
index b157f9613b0..31593f263a8 100644
--- a/cpp/test/Ice/operations/TestAMD.ice
+++ b/cpp/test/Ice/operations/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index 699b5a05aac..c80e8cd19be 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestAMDI.h>
#include <functional>
diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h
index 6388b366152..5a0c1942199 100644
--- a/cpp/test/Ice/operations/TestAMDI.h
+++ b/cpp/test/Ice/operations/TestAMDI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_I_H
#define TEST_AMD_I_H
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index 3d8e931ee7b..ad4c3e5aa94 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
#include <functional>
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index 5c9ebfbc354..9d499a48803 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 0dc881dbf6b..fd3fd03bd19 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 79e67418598..33132f5f18f 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py
index af9bf2be5dc..027ba88fe66 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/slicing/Makefile b/cpp/test/Ice/slicing/Makefile
index 59eec6ea7eb..6ee713c95e1 100644
--- a/cpp/test/Ice/slicing/Makefile
+++ b/cpp/test/Ice/slicing/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
index 60f2921afda..9bd4738616f 100644
--- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp
index bdeb1c7809a..150ddf0836e 100644
--- a/cpp/test/Ice/slicing/exceptions/Client.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/slicing/exceptions/Makefile b/cpp/test/Ice/slicing/exceptions/Makefile
index 1c327b6d6a9..9b2e3ae4be7 100644
--- a/cpp/test/Ice/slicing/exceptions/Makefile
+++ b/cpp/test/Ice/slicing/exceptions/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../../..
CLIENT = client
diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp
index a2e87117f35..3ddc2258a72 100644
--- a/cpp/test/Ice/slicing/exceptions/Server.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
index 86bc662a2d8..e9306d1b91f 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
index ea486910461..343dbce5f88 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_ICE
#define SERVERPRIVATE_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index 37580eaff70..08e45b35f37 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATEAMD_ICE
#define SERVERPRIVATEAMD_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice
index cb42aa4d87c..d2543d47aac 100644
--- a/cpp/test/Ice/slicing/exceptions/Test.ice
+++ b/cpp/test/Ice/slicing/exceptions/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
index f8dec1fd04e..4cce716566c 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
index 3c79c4b317a..75e009cb52d 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <TestAMDI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
index 4e8c3ad10a0..6da5fee592b 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TESTAMDI_H
#define TESTAMDI_H
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.cpp b/cpp/test/Ice/slicing/exceptions/TestI.cpp
index 3499713edd3..76d71390cd4 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.h b/cpp/test/Ice/slicing/exceptions/TestI.h
index 57b165798c6..aa807b7d349 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/slicing/exceptions/run.py b/cpp/test/Ice/slicing/exceptions/run.py
index 688bf10710b..c716e9bea5b 100755
--- a/cpp/test/Ice/slicing/exceptions/run.py
+++ b/cpp/test/Ice/slicing/exceptions/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index c61240f2ae9..e2c0c190691 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <ClientPrivate.h>
diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp
index 8bbb43ea720..c22dea27a7f 100644
--- a/cpp/test/Ice/slicing/objects/Client.cpp
+++ b/cpp/test/Ice/slicing/objects/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <ClientPrivate.h>
diff --git a/cpp/test/Ice/slicing/objects/ClientPrivate.ice b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
index 75c0f12c9a5..7e583dfe238 100644
--- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CLIENTPRIVATE_ICE
#define CLIENTPRIVATE_ICE
diff --git a/cpp/test/Ice/slicing/objects/Forward.ice b/cpp/test/Ice/slicing/objects/Forward.ice
index bcf3c459f62..4db43058410 100644
--- a/cpp/test/Ice/slicing/objects/Forward.ice
+++ b/cpp/test/Ice/slicing/objects/Forward.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FORWARD_ICE
#define FORWARD_ICE
diff --git a/cpp/test/Ice/slicing/objects/Makefile b/cpp/test/Ice/slicing/objects/Makefile
index fed671b853d..c4b19a9a337 100644
--- a/cpp/test/Ice/slicing/objects/Makefile
+++ b/cpp/test/Ice/slicing/objects/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../../..
CLIENT = client
diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp
index a2e87117f35..3ddc2258a72 100644
--- a/cpp/test/Ice/slicing/objects/Server.cpp
+++ b/cpp/test/Ice/slicing/objects/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
index 86bc662a2d8..e9306d1b91f 100644
--- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivate.ice b/cpp/test/Ice/slicing/objects/ServerPrivate.ice
index 80b6447e5c4..d0ebdefbe16 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivate.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_ICE
#define SERVERPRIVATE_ICE
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
index b59df25fa0e..d385e2849f0 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_AMD_ICE
#define SERVERPRIVATE_AMD_ICE
diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice
index a3344a46474..a20f048ad34 100644
--- a/cpp/test/Ice/slicing/objects/Test.ice
+++ b/cpp/test/Ice/slicing/objects/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/Ice/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice
index 999b3cf7d04..c4815a7cdaf 100644
--- a/cpp/test/Ice/slicing/objects/TestAMD.ice
+++ b/cpp/test/Ice/slicing/objects/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
index 5cbbd7eba0e..6beed12016a 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <TestAMDI.h>
#include <Ice/Ice.h>
#include <sstream>
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h
index 80edaa224a5..556866d7ea2 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.h
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp
index bd3b752a303..739b0b083e6 100644
--- a/cpp/test/Ice/slicing/objects/TestI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <TestI.h>
#include <Ice/Ice.h>
#include <sstream>
diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h
index cb042d8532b..ff53ae76ec3 100644
--- a/cpp/test/Ice/slicing/objects/TestI.h
+++ b/cpp/test/Ice/slicing/objects/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TESTI_H
#define TESTI_H
diff --git a/cpp/test/Ice/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py
index e6adb9932c4..9ee46724944 100755
--- a/cpp/test/Ice/slicing/objects/run.py
+++ b/cpp/test/Ice/slicing/objects/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IcePack/Makefile b/cpp/test/IcePack/Makefile
index f60887e8e78..4451caffc0b 100644
--- a/cpp/test/IcePack/Makefile
+++ b/cpp/test/IcePack/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp
index 05b26f58528..023f271280a 100644
--- a/cpp/test/IcePack/deployer/AllTests.cpp
+++ b/cpp/test/IcePack/deployer/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <Ice/BuiltinSequences.h>
#include <Ice/IdentityUtil.h>
diff --git a/cpp/test/IcePack/deployer/Client.cpp b/cpp/test/IcePack/deployer/Client.cpp
index bc99559ec2e..63247e4db6f 100644
--- a/cpp/test/IcePack/deployer/Client.cpp
+++ b/cpp/test/IcePack/deployer/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile
index 9d90dbf44e8..2b55615a783 100644
--- a/cpp/test/IcePack/deployer/Makefile
+++ b/cpp/test/IcePack/deployer/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IcePack/deployer/Server.cpp b/cpp/test/IcePack/deployer/Server.cpp
index d7194fcc181..6a306710fd7 100644
--- a/cpp/test/IcePack/deployer/Server.cpp
+++ b/cpp/test/IcePack/deployer/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
#include <TestCommon.h>
diff --git a/cpp/test/IcePack/deployer/Service.cpp b/cpp/test/IcePack/deployer/Service.cpp
index 8cb518b199f..3c4e35f2ae8 100644
--- a/cpp/test/IcePack/deployer/Service.cpp
+++ b/cpp/test/IcePack/deployer/Service.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/test/IcePack/deployer/Test.ice b/cpp/test/IcePack/deployer/Test.ice
index 3e5dc716f94..19578e1c328 100644
--- a/cpp/test/IcePack/deployer/Test.ice
+++ b/cpp/test/IcePack/deployer/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/IcePack/deployer/TestI.cpp b/cpp/test/IcePack/deployer/TestI.cpp
index fffb9e8feb2..7620b9f8d84 100644
--- a/cpp/test/IcePack/deployer/TestI.cpp
+++ b/cpp/test/IcePack/deployer/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IcePack/deployer/TestI.h b/cpp/test/IcePack/deployer/TestI.h
index abb1aaff2fc..0e041f2e2ed 100644
--- a/cpp/test/IcePack/deployer/TestI.h
+++ b/cpp/test/IcePack/deployer/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index 64c46ada2eb..8173de5ecde 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IcePack/simple/AllTests.cpp b/cpp/test/IcePack/simple/AllTests.cpp
index e857fdfbb32..7e9ce0e56e7 100644
--- a/cpp/test/IcePack/simple/AllTests.cpp
+++ b/cpp/test/IcePack/simple/AllTests.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IcePack/Admin.h>
#include <TestCommon.h>
diff --git a/cpp/test/IcePack/simple/Client.cpp b/cpp/test/IcePack/simple/Client.cpp
index 4a96d80576f..fef908b4497 100644
--- a/cpp/test/IcePack/simple/Client.cpp
+++ b/cpp/test/IcePack/simple/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile
index 024f0d6e47b..eff57c7affc 100644
--- a/cpp/test/IcePack/simple/Makefile
+++ b/cpp/test/IcePack/simple/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IcePack/simple/Server.cpp b/cpp/test/IcePack/simple/Server.cpp
index 46af74683ed..92c9e780ffa 100644
--- a/cpp/test/IcePack/simple/Server.cpp
+++ b/cpp/test/IcePack/simple/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IcePack/simple/Test.ice b/cpp/test/IcePack/simple/Test.ice
index b2485b59317..65fe5377ad3 100644
--- a/cpp/test/IcePack/simple/Test.ice
+++ b/cpp/test/IcePack/simple/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/cpp/test/IcePack/simple/TestI.cpp b/cpp/test/IcePack/simple/TestI.cpp
index c1a36f4000f..b109574486f 100644
--- a/cpp/test/IcePack/simple/TestI.cpp
+++ b/cpp/test/IcePack/simple/TestI.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/IcePack/simple/TestI.h b/cpp/test/IcePack/simple/TestI.h
index 2933f01eb6a..3b0e03dbc91 100644
--- a/cpp/test/IcePack/simple/TestI.h
+++ b/cpp/test/IcePack/simple/TestI.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index 119d32359a2..30083d573b9 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile
index 0669d93b9a1..1bc382f1f22 100644
--- a/cpp/test/IceSSL/Makefile
+++ b/cpp/test/IceSSL/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
index 5261e92b781..4da8f9d9489 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
index 9e731ff0d33..94eef934be3 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = certificateAndKeyParsing
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index 8360dcc5000..bb23ad244d9 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp
index 5cfc538380f..5107fc72104 100644
--- a/cpp/test/IceSSL/certificateVerification/Client.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceSSL/Plugin.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile
index cde778df1a3..5393adfaf2a 100644
--- a/cpp/test/IceSSL/certificateVerification/Makefile
+++ b/cpp/test/IceSSL/certificateVerification/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IceSSL/certificateVerification/Pinger.ice b/cpp/test/IceSSL/certificateVerification/Pinger.ice
index e777b6decdc..401ef8198e6 100644
--- a/cpp/test/IceSSL/certificateVerification/Pinger.ice
+++ b/cpp/test/IceSSL/certificateVerification/Pinger.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PINGER_ICE
#define PINGER_ICE
diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp
index 10e193594e8..6134df1960d 100644
--- a/cpp/test/IceSSL/certificateVerification/Server.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Server.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceSSL/RSACertificateGen.h>
#include <IceSSL/RSAKeyPair.h>
diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py
index 105d19c4b73..035efe4b9dd 100755
--- a/cpp/test/IceSSL/certificateVerification/run.py
+++ b/cpp/test/IceSSL/certificateVerification/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
index 586a9a8ccc7..9a53978453d 100644
--- a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
+++ b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <IceSSL/CertificateVerifier.h>
diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile
index 37d86c632f3..01f627730f5 100644
--- a/cpp/test/IceSSL/certificateVerifier/Makefile
+++ b/cpp/test/IceSSL/certificateVerifier/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = certificateVerifier
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 44b6ed69667..0aa389acfaf 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/configuration/Configuration.cpp b/cpp/test/IceSSL/configuration/Configuration.cpp
index 1cd6f0a582b..eae0eee57cb 100644
--- a/cpp/test/IceSSL/configuration/Configuration.cpp
+++ b/cpp/test/IceSSL/configuration/Configuration.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index ebb92b5e5c7..2f720084158 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = configuration
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index 4b74edab0d4..291aa2fdf63 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
index bcfb649aba1..4290f5404c7 100644
--- a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
+++ b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile
index d10898705e4..37d24b4b91e 100644
--- a/cpp/test/IceSSL/loadPEM/Makefile
+++ b/cpp/test/IceSSL/loadPEM/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = loadPEM
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 18760b91ce8..3804058d88a 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile
index 0417c1bc735..411b7dc5666 100644
--- a/cpp/test/IceStorm/Makefile
+++ b/cpp/test/IceStorm/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice
index e8d5c8d3ea6..c581aa6c606 100644
--- a/cpp/test/IceStorm/federation/Event.ice
+++ b/cpp/test/IceStorm/federation/Event.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef EVENT_ICE
#define EVENT_ICE
diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile
index 38457b1ceb7..9883d812633 100644
--- a/cpp/test/IceStorm/federation/Makefile
+++ b/cpp/test/IceStorm/federation/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
PUBLISHER = publisher
diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp
index ab5b856135d..3f644a3c649 100644
--- a/cpp/test/IceStorm/federation/Publisher.cpp
+++ b/cpp/test/IceStorm/federation/Publisher.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <Event.h>
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index 5b82c669858..c5432280162 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <Event.h>
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 7ec9e6fb61a..50f46e33f48 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
import time
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 2e9e30f0c76..4b59e352778 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
import time
diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile
index 4a480d66ed6..4c632857ba2 100644
--- a/cpp/test/IceStorm/single/Makefile
+++ b/cpp/test/IceStorm/single/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
PUBLISHER = publisher
diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp
index 01ccb76ebb1..fa95ee6c44c 100644
--- a/cpp/test/IceStorm/single/Publisher.cpp
+++ b/cpp/test/IceStorm/single/Publisher.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <Single.h>
diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice
index 75d9aa5c32a..4febe657333 100644
--- a/cpp/test/IceStorm/single/Single.ice
+++ b/cpp/test/IceStorm/single/Single.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SINGLE_ICE
#define SINGLE_ICE
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index 1e0fe6474db..07a438bc913 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <Single.h>
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index f5d183ce87a..afbb19fee8f 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
import time
diff --git a/cpp/test/IceUtil/Makefile b/cpp/test/IceUtil/Makefile
index 46ad5ba2298..7990ed2c1f7 100644
--- a/cpp/test/IceUtil/Makefile
+++ b/cpp/test/IceUtil/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IceUtil/ctrlCHandler/Client.cpp b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
index ef2444a3ead..3d8e17e22f7 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Client.cpp
+++ b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <TestCommon.h>
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile b/cpp/test/IceUtil/ctrlCHandler/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Makefile
+++ b/cpp/test/IceUtil/ctrlCHandler/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 1662dcfe84e..d1c4e969f82 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Unicode.h>
#include <IceUtil/InputUtil.h>
#include <TestCommon.h>
diff --git a/cpp/test/IceUtil/inputUtil/Makefile b/cpp/test/IceUtil/inputUtil/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/inputUtil/Makefile
+++ b/cpp/test/IceUtil/inputUtil/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index 1476ce6470a..42b1afb4870 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceUtil/thread/AliveTest.cpp b/cpp/test/IceUtil/thread/AliveTest.cpp
index 4a7667dc496..69c70cb02f7 100644
--- a/cpp/test/IceUtil/thread/AliveTest.cpp
+++ b/cpp/test/IceUtil/thread/AliveTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <AliveTest.h>
#include <TestCommon.h>
diff --git a/cpp/test/IceUtil/thread/AliveTest.h b/cpp/test/IceUtil/thread/AliveTest.h
index 1239c917cfd..5dccc703664 100644
--- a/cpp/test/IceUtil/thread/AliveTest.h
+++ b/cpp/test/IceUtil/thread/AliveTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef ALIVE_TEST_H
#define ALIVE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp
index 50468fbcac4..44583d91650 100644
--- a/cpp/test/IceUtil/thread/Client.cpp
+++ b/cpp/test/IceUtil/thread/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <stdlib.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
index 4351f6140d7..c042a6fa05e 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <CountDownLatchTest.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.h b/cpp/test/IceUtil/thread/CountDownLatchTest.h
index 27f1f0a2f29..d035e593605 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.h
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef COUNT_DOWN_LATCH_TEST_H
#define COUNT_DOWN_LATCH_TEST_H
diff --git a/cpp/test/IceUtil/thread/CreateTest.cpp b/cpp/test/IceUtil/thread/CreateTest.cpp
index f7ac4f5c965..45b2ff2a827 100644
--- a/cpp/test/IceUtil/thread/CreateTest.cpp
+++ b/cpp/test/IceUtil/thread/CreateTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <stdio.h>
diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h
index ae7a08eeb66..c27c69ca430 100644
--- a/cpp/test/IceUtil/thread/CreateTest.h
+++ b/cpp/test/IceUtil/thread/CreateTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CREATE_TEST_H
#define CREATE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile
index e9d679a5a7e..ce2a7f2717a 100644
--- a/cpp/test/IceUtil/thread/Makefile
+++ b/cpp/test/IceUtil/thread/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
index 9e8c6a660ef..ba4b06fdefd 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <MonitorMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h
index c7d850dfcc7..763715c8425 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef MONITOR_MUTEX_TEST_H
#define MONITOR_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
index a437a568ba5..6eb404d548b 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <MonitorRecMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
index e5cc7d5ebda..1d86d92d476 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef MONITOR_REC_MUTEX_TEST_H
#define MONITOR_REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp
index fa3d1ecd36c..6ae2d136480 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <MutexTest.h>
diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h
index 19238b4607a..8d4447a1a3f 100644
--- a/cpp/test/IceUtil/thread/MutexTest.h
+++ b/cpp/test/IceUtil/thread/MutexTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef MUTEX_TEST_H
#define MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
index 48b1edb23a2..d225861eacb 100644
--- a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <RWRecMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.h b/cpp/test/IceUtil/thread/RWRecMutexTest.h
index a3a7b4a271d..40a81a9707d 100644
--- a/cpp/test/IceUtil/thread/RWRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RWRecMutexTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef RW_REC_MUTEX_TEST_H
#define RE_REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp
index 44673fab719..ea9a887fda0 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <RecMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h
index cd149949dda..353df8d40a6 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RecMutexTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef REC_MUTEX_TEST_H
#define REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/StartTest.cpp b/cpp/test/IceUtil/thread/StartTest.cpp
index 791ffba4b27..4774fdaffb3 100644
--- a/cpp/test/IceUtil/thread/StartTest.cpp
+++ b/cpp/test/IceUtil/thread/StartTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <stdio.h>
diff --git a/cpp/test/IceUtil/thread/StartTest.h b/cpp/test/IceUtil/thread/StartTest.h
index bf9f13602f5..5e91df42136 100644
--- a/cpp/test/IceUtil/thread/StartTest.h
+++ b/cpp/test/IceUtil/thread/StartTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef START_TEST_H
#define START_TEST_H
diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.cpp b/cpp/test/IceUtil/thread/StaticMutexTest.cpp
index 34635a35ead..0c37a7cefb5 100644
--- a/cpp/test/IceUtil/thread/StaticMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/StaticMutexTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <StaticMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.h b/cpp/test/IceUtil/thread/StaticMutexTest.h
index 19321512b16..2b0e54a1389 100644
--- a/cpp/test/IceUtil/thread/StaticMutexTest.h
+++ b/cpp/test/IceUtil/thread/StaticMutexTest.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef STATIC_MUTEX_TEST_H
#define STATIC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/TestBase.cpp b/cpp/test/IceUtil/thread/TestBase.cpp
index 83093580b3d..3e7da6a7e55 100644
--- a/cpp/test/IceUtil/thread/TestBase.cpp
+++ b/cpp/test/IceUtil/thread/TestBase.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/IceUtil.h>
#include <TestBase.h>
diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h
index e7b840eff3f..26c2d2dd924 100644
--- a/cpp/test/IceUtil/thread/TestBase.h
+++ b/cpp/test/IceUtil/thread/TestBase.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_BASE_H
#define TEST_BASE_H
diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp
index e261f6dccc0..c933840624a 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <TestSuite.h>
#include <CountDownLatchTest.h>
#include <MutexTest.h>
diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h
index b0ab3e1c229..429b02479d7 100644
--- a/cpp/test/IceUtil/thread/TestSuite.h
+++ b/cpp/test/IceUtil/thread/TestSuite.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_SUITE_H
#define TEST_SUITE_H
diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index 876a014b6a5..711fe3912fe 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index 522256c6af3..7b7432bef29 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/Unicode.h>
#include <TestCommon.h>
#include <fstream>
diff --git a/cpp/test/IceUtil/unicode/Makefile b/cpp/test/IceUtil/unicode/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/unicode/Makefile
+++ b/cpp/test/IceUtil/unicode/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py
index 2b6251ab237..d9385d3b429 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
index f01fefc1769..293aa8c3602 100644
--- a/cpp/test/IceUtil/uuid/Client.cpp
+++ b/cpp/test/IceUtil/uuid/Client.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <IceUtil/UUID.h>
#include <IceUtil/Time.h>
#include <TestCommon.h>
diff --git a/cpp/test/IceUtil/uuid/Makefile b/cpp/test/IceUtil/uuid/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/uuid/Makefile
+++ b/cpp/test/IceUtil/uuid/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py
index c409ff641c1..e52a1dde3d0 100755
--- a/cpp/test/IceUtil/uuid/run.py
+++ b/cpp/test/IceUtil/uuid/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Makefile b/cpp/test/Makefile
index d6c9d0a6f4c..933fc016466 100644
--- a/cpp/test/Makefile
+++ b/cpp/test/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
index 9e6eed087de..d246347b901 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface i1
{
void op();
diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.ice b/cpp/test/Slice/errorDetection/CaseSensitive.ice
index 851972cffde..2e50d5c073c 100644
--- a/cpp/test/Slice/errorDetection/CaseSensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseSensitive.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module M1
{
};
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index e7fc3ad6fdb..81e1b7669fd 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<long> ls;
struct s00
diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
index 7fe9a575034..9570ea69f23 100644
--- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Foo { long op(); };
class Class1 implements Foo { byte b; };
class Class1 implements Foo { long l; };
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index e82b9f9c0ea..b773e5c08a5 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
//
// Basic checks (all OK)
//
diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
index 74f035941d6..a3c69a17a0b 100644
--- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C
{
int member;
diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
index 7c0691ee393..c2c00fa758a 100644
--- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
+++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Foo
{
int bar(string, long l, out bool, out short s);
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
index ca9ecb93239..9615678b86d 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Base1
{
void op();
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
index 16e57aeb547..c461230a9f5 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
dictionary<int, long> Dictionary;
dictionary<int, long> Dictionary;
dictionary<int, long> foo;
diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
index 63ab01d5f2a..69a4870740f 100644
--- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Foo
{
long l;
diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
index 8c99d0b2d8c..81a1743245f 100644
--- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
exception e {};
exception e2 {};
interface i2 { void op() throws ::e, e; };
diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice
index 7f366ba5dae..34e452e6521 100644
--- a/cpp/test/Slice/errorDetection/EnumEmpty.ice
+++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice
@@ -1,15 +1,15 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
enum foo {};
diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
index cb803a2a9e2..d951aa3c8f8 100644
--- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
enum E1 { A, B, C };
enum E1 { D, E, F };
diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
index 7ba89e11f7f..682ceea93c8 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
enum Enum1 { A, B, C };
enum Enum2 { A, B, E };
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
index e809768abdf..84abdf65e62 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
INTERFACE i { void op(); };
exception Void {};
diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
index d2d6dbf9e63..7ad0bdec8c7 100644
--- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
exception E;
struct S;
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
index 9e8190c90ee..b83f48d088f 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
dictionary<bool, long> d1; // OK
dictionary<byte, long> d2; // OK
dictionary<short, long> d3; // OK
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice
index b20d9042ff4..dce7da03fb5 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.ice
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface i1 {};
local interface i2 extends i1 {}; // OK
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice
index 905d88fbda2..4376479b2ea 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.ice
+++ b/cpp/test/Slice/errorDetection/IllegalMI.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module M1
{
diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
index 3f8a2f8f2c7..c362ab85eb6 100644
--- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
exception module;
exception void
{
diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
index a4d318f842e..1543f0948a0 100644
--- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Foo1;
class Foo1;
class Foo1 { void op(); };
diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
index 079c2598fba..887ccb84e43 100644
--- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Intf1 { void op(); };
interface Intf1 { void op(); };
interface Intf1;
diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice
index 95cfb1af655..ed4e454593b 100644
--- a/cpp/test/Slice/errorDetection/LocalMismatch.ice
+++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Intf1;
local interface Intf1;
local interface Intf1 { void op(); };
diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
index 607f51df1b3..243e7f100ba 100644
--- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
+++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Foo
{
void Foo();
diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
index e45e68518fc..e64d1afaf11 100644
--- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
+++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<int> Seq;
sequence<int> Sequence1;
sequence<int> Sequence2;
diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice
index b9f071b05e3..00f09483bde 100644
--- a/cpp/test/Slice/errorDetection/NotException.ice
+++ b/cpp/test/Slice/errorDetection/NotException.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module M
{
diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice
index 887eae4da17..d39d49bb19c 100644
--- a/cpp/test/Slice/errorDetection/NotType.ice
+++ b/cpp/test/Slice/errorDetection/NotType.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module Module1 { };
module Module2 { };
module Module3 { };
diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
index 805aa79da0b..5f438d4b4cd 100644
--- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C
{
void operation();
diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
index 791a4abaa6f..ccbb63b2121 100644
--- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
+++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
interface Foo
{
void bar(long l1, out long l2, long l3);
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
index 1a73e7138b2..32e1531d99a 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<int> Sequence1;
class Sequence1;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
index a9c9358dae2..6130ae4644b 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C
{
void operation();
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
index b2c4a464b8f..37a6552babc 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C { long l; };
dictionary<string, int> C;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
index 82bc756cb0d..f310276a5c0 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C { long l; };
enum C { A, B, C };
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
index 29c5f0ca8c7..957b25982b1 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C { long l; };
sequence<int> Seq;
enum E { C, Seq, blah };
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
index e5b1ead69f6..908708f87a9 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<int> Sequence1;
interface Sequence1;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
index abf2f743e69..a33ba4626a3 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<int> Seq;
module Seq;
module Mod { };
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
index 831faab2a83..6c44335fd6e 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C
{
int member;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
index fb7e73cd7b5..8a537f11eed 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class C { long l; };
sequence<int> C;
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index 08fc1ceee5b..63ff7d7d4cc 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#include <include/IcePrefix.ice> // No error should be caused by this file
module OK
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice
index b2e81a94823..e9fd5ae5d31 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.ice
+++ b/cpp/test/Slice/errorDetection/SelfContainment.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
struct x
{
int i;
diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
index 224db53bacd..7d4370d43b2 100644
--- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<int> Seq;
sequence<int> Seq;
diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice
index 601aa8bb267..705778c1b4c 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.ice
+++ b/cpp/test/Slice/errorDetection/StructMembers.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
struct s1 // Illegal empty struct
{
};
diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice
index d87eb0d8a1e..067f68ec365 100644
--- a/cpp/test/Slice/errorDetection/Undefined.ice
+++ b/cpp/test/Slice/errorDetection/Undefined.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<Foo> FooSequence;
dictionary<Foo, Bar> FooBarDictionary;
interface BarIntf extends Foo { void op(); };
diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice
index 8d23164a507..e3033579b8d 100644
--- a/cpp/test/Slice/errorDetection/WrongProxyType.ice
+++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
sequence<int> Seq;
dictionary<Seq, int> Dict;
diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
index 2181fe53c97..bc86c2bcf08 100644
--- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice
+++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
@@ -1,15 +1,15 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module IceSomething {};
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py
index 32faa3cb45f..a676b64246d 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys, re
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index edefac9ba98..f62214209c1 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_COMMON_H
#define TEST_COMMON_H
diff --git a/java/Makefile b/java/Makefile
index dd4b0cd2f03..21bad43d52d 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
all:
ant -emacs
diff --git a/java/allTests.py b/java/allTests.py
index b777528a528..fe7cf475e7a 100755
--- a/java/allTests.py
+++ b/java/allTests.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
import getopt
diff --git a/java/ant/Slice2FreezeJTask.java b/java/ant/Slice2FreezeJTask.java
index a868cd28c0f..4b6964efadf 100644
--- a/java/ant/Slice2FreezeJTask.java
+++ b/java/ant/Slice2FreezeJTask.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
//package Ice.Ant;
import org.apache.tools.ant.Task;
diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java
index f456b3473e0..f98f12942c9 100644
--- a/java/ant/Slice2JavaTask.java
+++ b/java/ant/Slice2JavaTask.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
//package Ice.Ant;
import org.apache.tools.ant.Task;
diff --git a/java/ant/SliceDefine.java b/java/ant/SliceDefine.java
index 13a912edc80..cf72fba7142 100644
--- a/java/ant/SliceDefine.java
+++ b/java/ant/SliceDefine.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
//package Ice.Ant;
public class SliceDefine
diff --git a/java/ant/SliceTask.java b/java/ant/SliceTask.java
index e0041783254..3c6dc94d518 100644
--- a/java/ant/SliceTask.java
+++ b/java/ant/SliceTask.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
//package Ice.Ant;
import org.apache.tools.ant.Task;
diff --git a/java/build.xml b/java/build.xml
index 6f3e89a4873..368df5e6a7c 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="main" default="all" basedir=".">
<!-- get access to env variables globally -->
diff --git a/java/config/IcePackAdmin.py b/java/config/IcePackAdmin.py
index a0650dd653c..c144c48bd5e 100644
--- a/java/config/IcePackAdmin.py
+++ b/java/config/IcePackAdmin.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import sys, os, TestUtil
from threading import Thread
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py
index a030156d369..76514e0c886 100644
--- a/java/config/TestUtil.py
+++ b/java/config/TestUtil.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# Set the host to the host name the test servers are running on. If
# not set, Ice will try to find out the IP address for the
diff --git a/java/config/build.properties b/java/config/build.properties
index d6a5919deb2..e857cf49696 100644
--- a/java/config/build.properties
+++ b/java/config/build.properties
@@ -1,17 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
#
# Define optimize as on if you want to build with optimization.
#
diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java
index 1937b2b6627..a0cae7e60c2 100644
--- a/java/demo/Freeze/bench/Client.java
+++ b/java/demo/Freeze/bench/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class TestApp extends Ice.Application
{
TestApp(String envName)
diff --git a/java/demo/Freeze/bench/StopWatch.java b/java/demo/Freeze/bench/StopWatch.java
index 484b2aa7550..c5b8689f362 100644
--- a/java/demo/Freeze/bench/StopWatch.java
+++ b/java/demo/Freeze/bench/StopWatch.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class StopWatch
{
StopWatch()
diff --git a/java/demo/Freeze/bench/Test.ice b/java/demo/Freeze/bench/Test.ice
index ce2087e1eae..d32b95cb2f9 100644
--- a/java/demo/Freeze/bench/Test.ice
+++ b/java/demo/Freeze/bench/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
struct Struct1
{
long l;
diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml
index 790a604109c..b11bd0910c9 100644
--- a/java/demo/Freeze/bench/build.xml
+++ b/java/demo/Freeze/bench/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Freeze_bench" default="all" basedir=".">
<!-- get access to env variables globally -->
diff --git a/java/demo/Freeze/build.xml b/java/demo/Freeze/build.xml
index 719cc30ac0a..73cbc60e3df 100644
--- a/java/demo/Freeze/build.xml
+++ b/java/demo/Freeze/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice" default="all" basedir=".">
<target name="all">
diff --git a/java/demo/Freeze/library/BookFactory.java b/java/demo/Freeze/library/BookFactory.java
index a06e27f112d..af620cb255b 100644
--- a/java/demo/Freeze/library/BookFactory.java
+++ b/java/demo/Freeze/library/BookFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class BookFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
{
public Ice.Object
diff --git a/java/demo/Freeze/library/BookI.java b/java/demo/Freeze/library/BookI.java
index 5c8f895ab26..e6fc4b06065 100644
--- a/java/demo/Freeze/library/BookI.java
+++ b/java/demo/Freeze/library/BookI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class BookI extends Book
{
//
diff --git a/java/demo/Freeze/library/Client.java b/java/demo/Freeze/library/Client.java
index e27d262d6b3..2cdeb366f81 100644
--- a/java/demo/Freeze/library/Client.java
+++ b/java/demo/Freeze/library/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client extends Ice.Application
{
public int
diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java
index eab0c2901a3..50ee2d70553 100644
--- a/java/demo/Freeze/library/Collocated.java
+++ b/java/demo/Freeze/library/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class LibraryCollocated extends Ice.Application
{
public int
diff --git a/java/demo/Freeze/library/Grammar.java b/java/demo/Freeze/library/Grammar.java
index 8e1d2f8b1b9..d28fbfca613 100644
--- a/java/demo/Freeze/library/Grammar.java
+++ b/java/demo/Freeze/library/Grammar.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Grammar
{
Grammar(Parser p)
diff --git a/java/demo/Freeze/library/Library.ice b/java/demo/Freeze/library/Library.ice
index d25784bc1c5..e437c235493 100644
--- a/java/demo/Freeze/library/Library.ice
+++ b/java/demo/Freeze/library/Library.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LIBRARY_ICE
#define LIBRARY_ICE
diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java
index 295fcbbffd8..f58e21f02d2 100644
--- a/java/demo/Freeze/library/LibraryI.java
+++ b/java/demo/Freeze/library/LibraryI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class LibraryI extends _LibraryDisp
{
public synchronized BookPrx
diff --git a/java/demo/Freeze/library/Parser.java b/java/demo/Freeze/library/Parser.java
index f5b073fa387..ae35dd7da5f 100644
--- a/java/demo/Freeze/library/Parser.java
+++ b/java/demo/Freeze/library/Parser.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Parser
{
Parser(Ice.Communicator communicator, LibraryPrx library)
diff --git a/java/demo/Freeze/library/RunParser.java b/java/demo/Freeze/library/RunParser.java
index fd4bc824df2..1572eea56e7 100644
--- a/java/demo/Freeze/library/RunParser.java
+++ b/java/demo/Freeze/library/RunParser.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class RunParser
{
static void
diff --git a/java/demo/Freeze/library/Scanner.java b/java/demo/Freeze/library/Scanner.java
index 6ead88bb27a..b481bb672cc 100644
--- a/java/demo/Freeze/library/Scanner.java
+++ b/java/demo/Freeze/library/Scanner.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Scanner
{
Scanner(Parser p)
diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index 54e14d0b241..0508a85516d 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class LibraryServer extends Ice.Application
{
public int
diff --git a/java/demo/Freeze/library/Token.java b/java/demo/Freeze/library/Token.java
index 8e08a3e5a06..ad4ea892805 100644
--- a/java/demo/Freeze/library/Token.java
+++ b/java/demo/Freeze/library/Token.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Token
{
public static final int TOK_HELP = 0;
diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml
index 07c9360c9d7..8dcb8276307 100644
--- a/java/demo/Freeze/library/build.xml
+++ b/java/demo/Freeze/library/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Freeze_library" default="all" basedir=".">
<!-- get access to env variables globally -->
diff --git a/java/demo/Freeze/phonebook/Client.java b/java/demo/Freeze/phonebook/Client.java
index f03db7090e3..dff82bff1a2 100644
--- a/java/demo/Freeze/phonebook/Client.java
+++ b/java/demo/Freeze/phonebook/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client extends Ice.Application
{
public int
diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java
index 3f6cf4057d8..3eb0a8ae763 100644
--- a/java/demo/Freeze/phonebook/Collocated.java
+++ b/java/demo/Freeze/phonebook/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class PhoneBookCollocated extends Ice.Application
{
public int
diff --git a/java/demo/Freeze/phonebook/ContactFactory.java b/java/demo/Freeze/phonebook/ContactFactory.java
index e00b0427ce9..d62f52f5056 100644
--- a/java/demo/Freeze/phonebook/ContactFactory.java
+++ b/java/demo/Freeze/phonebook/ContactFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class ContactFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
{
public Ice.Object
diff --git a/java/demo/Freeze/phonebook/ContactI.java b/java/demo/Freeze/phonebook/ContactI.java
index 41702dfd305..6d5c66dc570 100644
--- a/java/demo/Freeze/phonebook/ContactI.java
+++ b/java/demo/Freeze/phonebook/ContactI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class ContactI extends Contact
{
//
diff --git a/java/demo/Freeze/phonebook/Grammar.java b/java/demo/Freeze/phonebook/Grammar.java
index ba32ac4635b..fe01ed29a90 100644
--- a/java/demo/Freeze/phonebook/Grammar.java
+++ b/java/demo/Freeze/phonebook/Grammar.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Grammar
{
Grammar(Parser p)
diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java
index b9b1e800964..8d709140792 100644
--- a/java/demo/Freeze/phonebook/Parser.java
+++ b/java/demo/Freeze/phonebook/Parser.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Parser
{
Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook)
diff --git a/java/demo/Freeze/phonebook/PhoneBook.ice b/java/demo/Freeze/phonebook/PhoneBook.ice
index 85403b13ebd..5b357258cbd 100644
--- a/java/demo/Freeze/phonebook/PhoneBook.ice
+++ b/java/demo/Freeze/phonebook/PhoneBook.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef PHONE_BOOK_ICE
#define PHONE_BOOK_ICE
diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java
index 43c6d666cf1..374a05f8df2 100644
--- a/java/demo/Freeze/phonebook/PhoneBookI.java
+++ b/java/demo/Freeze/phonebook/PhoneBookI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class PhoneBookI extends _PhoneBookDisp
{
public ContactPrx
diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java
index b71f48c0255..9c5465335ef 100644
--- a/java/demo/Freeze/phonebook/RunParser.java
+++ b/java/demo/Freeze/phonebook/RunParser.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class RunParser
{
static void
diff --git a/java/demo/Freeze/phonebook/Scanner.java b/java/demo/Freeze/phonebook/Scanner.java
index 5badc0cfe83..a30ab8d8ec1 100644
--- a/java/demo/Freeze/phonebook/Scanner.java
+++ b/java/demo/Freeze/phonebook/Scanner.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Scanner
{
Scanner(Parser p)
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index 51d45d70b5f..9c99272f42e 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class PhoneBookServer extends Ice.Application
{
public int
diff --git a/java/demo/Freeze/phonebook/Token.java b/java/demo/Freeze/phonebook/Token.java
index cf983b9ebc0..10c9d75756b 100644
--- a/java/demo/Freeze/phonebook/Token.java
+++ b/java/demo/Freeze/phonebook/Token.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Token
{
public static final int TOK_HELP = 0;
diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml
index 8b07bf4939d..d0ec6247327 100644
--- a/java/demo/Freeze/phonebook/build.xml
+++ b/java/demo/Freeze/phonebook/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Freeze_phonebook" default="all" basedir=".">
<!-- get access to env variables globally -->
diff --git a/java/demo/Glacier/build.xml b/java/demo/Glacier/build.xml
index 4ee1535ac26..cde310bbdf2 100644
--- a/java/demo/Glacier/build.xml
+++ b/java/demo/Glacier/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Glacier" default="all" basedir=".">
<target name="all">
diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java
index b9c58b00073..109c647b0de 100644
--- a/java/demo/Glacier/session/Client.java
+++ b/java/demo/Glacier/session/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/Glacier/session/HelloSession.ice b/java/demo/Glacier/session/HelloSession.ice
index 2542290ef8f..32f111b0783 100644
--- a/java/demo/Glacier/session/HelloSession.ice
+++ b/java/demo/Glacier/session/HelloSession.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/java/demo/Glacier/session/HelloSessionI.java b/java/demo/Glacier/session/HelloSessionI.java
index d331c9f9cac..d9451643334 100644
--- a/java/demo/Glacier/session/HelloSessionI.java
+++ b/java/demo/Glacier/session/HelloSessionI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
final class HelloSessionI extends HelloSession
{
public
diff --git a/java/demo/Glacier/session/HelloSessionManagerI.java b/java/demo/Glacier/session/HelloSessionManagerI.java
index f202b51224a..553c61e0c83 100644
--- a/java/demo/Glacier/session/HelloSessionManagerI.java
+++ b/java/demo/Glacier/session/HelloSessionManagerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
final class HelloSessionManagerI extends Glacier._SessionManagerDisp
{
HelloSessionManagerI(Ice.ObjectAdapter adapter)
diff --git a/java/demo/Glacier/session/Server.java b/java/demo/Glacier/session/Server.java
index 8846109c216..55e8275c3de 100644
--- a/java/demo/Glacier/session/Server.java
+++ b/java/demo/Glacier/session/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
static class PermissionsVerifierI extends Glacier._PermissionsVerifierDisp
diff --git a/java/demo/Glacier/session/build.xml b/java/demo/Glacier/session/build.xml
index 23348c63bc9..ee8b1270012 100644
--- a/java/demo/Glacier/session/build.xml
+++ b/java/demo/Glacier/session/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Glacier_session" default="all" basedir=".">
<!-- get access to env variables globally -->
diff --git a/java/demo/Ice/build.xml b/java/demo/Ice/build.xml
index e66c9fc971e..3d5e1d76494 100644
--- a/java/demo/Ice/build.xml
+++ b/java/demo/Ice/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice" default="all" basedir=".">
<target name="all">
diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice
index 2686a46dc84..da64c2948e3 100644
--- a/java/demo/Ice/callback/Callback.ice
+++ b/java/demo/Ice/callback/Callback.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java
index d0a5289fbc0..038d8e109c9 100644
--- a/java/demo/Ice/callback/CallbackClient.java
+++ b/java/demo/Ice/callback/CallbackClient.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class CallbackClient extends Ice.Application
{
private static void
diff --git a/java/demo/Ice/callback/CallbackI.java b/java/demo/Ice/callback/CallbackI.java
index 11c28e084c7..c46d189d143 100644
--- a/java/demo/Ice/callback/CallbackI.java
+++ b/java/demo/Ice/callback/CallbackI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CallbackI extends Callback
{
public void
diff --git a/java/demo/Ice/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java
index 97738dcaeb6..3850e55cdf7 100644
--- a/java/demo/Ice/callback/CallbackReceiverI.java
+++ b/java/demo/Ice/callback/CallbackReceiverI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CallbackReceiverI extends CallbackReceiver
{
public void
diff --git a/java/demo/Ice/callback/CallbackServer.java b/java/demo/Ice/callback/CallbackServer.java
index 591d586d602..bbff1e815aa 100644
--- a/java/demo/Ice/callback/CallbackServer.java
+++ b/java/demo/Ice/callback/CallbackServer.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class CallbackServer extends Ice.Application
{
public int
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index 13554c4a218..dd3a234e570 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
public static void
diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java
index a4d67c96504..e676c6d302f 100644
--- a/java/demo/Ice/callback/Server.java
+++ b/java/demo/Ice/callback/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
public static void
diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml
index 16c9b64e1ee..b760dbb1bbe 100644
--- a/java/demo/Ice/callback/build.xml
+++ b/java/demo/Ice/callback/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice_callback" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index f68fd0c1013..653dce189dc 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/Ice/hello/Hello.ice b/java/demo/Ice/hello/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/java/demo/Ice/hello/Hello.ice
+++ b/java/demo/Ice/hello/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java
index 4d76a078748..e9ac52c046d 100644
--- a/java/demo/Ice/hello/HelloI.java
+++ b/java/demo/Ice/hello/HelloI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloI extends Hello
{
public void
diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java
index 42b62fdc16b..3dd477891be 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/demo/Ice/hello/build.xml b/java/demo/Ice/hello/build.xml
index 758732f449f..33c1d527a3f 100644
--- a/java/demo/Ice/hello/build.xml
+++ b/java/demo/Ice/hello/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice_hello" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index 3fe8e4bce9e..f26f4168477 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/demo/Ice/latency/Latency.ice b/java/demo/Ice/latency/Latency.ice
index 3bd70571733..b11e6cf4e94 100644
--- a/java/demo/Ice/latency/Latency.ice
+++ b/java/demo/Ice/latency/Latency.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef LATENCY_ICE
#define LATENCY_ICE
diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java
index 5ff640e21f7..d77f0986042 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/demo/Ice/latency/build.xml b/java/demo/Ice/latency/build.xml
index 8a8508b84b6..079ad40dbdb 100644
--- a/java/demo/Ice/latency/build.xml
+++ b/java/demo/Ice/latency/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice_latency" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java
index ad28e2a1a86..670c3455ac9 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
public static void
diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice
index ba810a21d41..e629bbe88d2 100644
--- a/java/demo/Ice/nested/Nested.ice
+++ b/java/demo/Ice/nested/Nested.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef NESTED_ICE
#define NESTED_ICE
diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java
index 6e0d664516c..592d41a34d9 100644
--- a/java/demo/Ice/nested/NestedClient.java
+++ b/java/demo/Ice/nested/NestedClient.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class NestedClient extends Ice.Application
{
public int
diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java
index 37cdcdd58cd..53f4de87b2b 100644
--- a/java/demo/Ice/nested/NestedI.java
+++ b/java/demo/Ice/nested/NestedI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class NestedI extends Nested
{
NestedI(NestedPrx self)
diff --git a/java/demo/Ice/nested/NestedServer.java b/java/demo/Ice/nested/NestedServer.java
index 5da657cdb82..1bf3b44e1de 100644
--- a/java/demo/Ice/nested/NestedServer.java
+++ b/java/demo/Ice/nested/NestedServer.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class NestedServer extends Ice.Application
{
public int
diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java
index 7026b70391c..a8723ba8760 100644
--- a/java/demo/Ice/nested/Server.java
+++ b/java/demo/Ice/nested/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
public static void
diff --git a/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml
index 634e8cb4b4a..64eff32aa03 100644
--- a/java/demo/Ice/nested/build.xml
+++ b/java/demo/Ice/nested/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice_value" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 4c58e7f303c..b351851057e 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java
index 3ac18796c4b..9208c55e19e 100644
--- a/java/demo/Ice/throughput/Server.java
+++ b/java/demo/Ice/throughput/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/demo/Ice/throughput/Throughput.ice b/java/demo/Ice/throughput/Throughput.ice
index e28cef29cf4..3b02a3861d9 100644
--- a/java/demo/Ice/throughput/Throughput.ice
+++ b/java/demo/Ice/throughput/Throughput.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef THROUGHPUT_ICE
#define THROUGHPUT_ICE
diff --git a/java/demo/Ice/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java
index c2f26cf4830..51b1fe843c1 100644
--- a/java/demo/Ice/throughput/ThroughputI.java
+++ b/java/demo/Ice/throughput/ThroughputI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ThroughputI extends _ThroughputDisp
{
public
diff --git a/java/demo/Ice/throughput/build.xml b/java/demo/Ice/throughput/build.xml
index 9f53a555d14..81b50a74b89 100644
--- a/java/demo/Ice/throughput/build.xml
+++ b/java/demo/Ice/throughput/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice_throughput" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index 8c76796f7f9..acd54eee8da 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java
index 2b388c2d4a2..acb67aa8661 100644
--- a/java/demo/Ice/value/DerivedPrinterI.java
+++ b/java/demo/Ice/value/DerivedPrinterI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class DerivedPrinterI extends DerivedPrinter
{
public void
diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java
index c9577a26489..5aa50a2571d 100644
--- a/java/demo/Ice/value/InitialI.java
+++ b/java/demo/Ice/value/InitialI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class InitialI extends Initial
{
InitialI(Ice.ObjectAdapter adapter)
diff --git a/java/demo/Ice/value/ObjectFactory.java b/java/demo/Ice/value/ObjectFactory.java
index 42ff2545333..bd8e81a17a8 100644
--- a/java/demo/Ice/value/ObjectFactory.java
+++ b/java/demo/Ice/value/ObjectFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class ObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
{
public Ice.Object
diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java
index a7cebbeadaf..3ceff35cbf7 100644
--- a/java/demo/Ice/value/PrinterI.java
+++ b/java/demo/Ice/value/PrinterI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class PrinterI extends Printer
{
public void
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index e841207b1d8..572ae6c369e 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice
index 4a69d6b6a7d..b4196a7bee3 100644
--- a/java/demo/Ice/value/Value.ice
+++ b/java/demo/Ice/value/Value.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef VALUE_ICE
#define VALUE_ICE
diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml
index abdf491655b..0129d1c1844 100644
--- a/java/demo/Ice/value/build.xml
+++ b/java/demo/Ice/value/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_Ice_value" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/IceBox/build.xml b/java/demo/IceBox/build.xml
index 403b3b46fc0..e9b524ad9bb 100644
--- a/java/demo/IceBox/build.xml
+++ b/java/demo/IceBox/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_IceBox" default="all" basedir=".">
<target name="all">
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index 4c19fe4ad54..9e9ee6f0938 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice
index c9ccce18906..7fc2c380953 100644
--- a/java/demo/IceBox/hello/Hello.ice
+++ b/java/demo/IceBox/hello/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java
index 4d76a078748..e9ac52c046d 100644
--- a/java/demo/IceBox/hello/HelloI.java
+++ b/java/demo/IceBox/hello/HelloI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloI extends Hello
{
public void
diff --git a/java/demo/IceBox/hello/HelloServiceI.java b/java/demo/IceBox/hello/HelloServiceI.java
index 3ef298c781e..3cc2f24d26c 100644
--- a/java/demo/IceBox/hello/HelloServiceI.java
+++ b/java/demo/IceBox/hello/HelloServiceI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service
{
public void
diff --git a/java/demo/IceBox/hello/build.xml b/java/demo/IceBox/hello/build.xml
index f0749610403..a0860dae79d 100644
--- a/java/demo/IceBox/hello/build.xml
+++ b/java/demo/IceBox/hello/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_IceBox_hello" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/IcePack/build.xml b/java/demo/IcePack/build.xml
index 5882303e868..66b8896ecfb 100644
--- a/java/demo/IcePack/build.xml
+++ b/java/demo/IcePack/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_IcePack" default="all" basedir=".">
<target name="all">
diff --git a/java/demo/IcePack/hello/Client.java b/java/demo/IcePack/hello/Client.java
index 56ef6c40939..1b06bd619c4 100644
--- a/java/demo/IcePack/hello/Client.java
+++ b/java/demo/IcePack/hello/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/IcePack/hello/Hello.ice b/java/demo/IcePack/hello/Hello.ice
index c071142f40d..97af57216f4 100644
--- a/java/demo/IcePack/hello/Hello.ice
+++ b/java/demo/IcePack/hello/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/java/demo/IcePack/hello/HelloFactoryI.java b/java/demo/IcePack/hello/HelloFactoryI.java
index d06dadea9b7..26483ed7913 100644
--- a/java/demo/IcePack/hello/HelloFactoryI.java
+++ b/java/demo/IcePack/hello/HelloFactoryI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloFactoryI extends _HelloFactoryDisp
{
public HelloPrx
diff --git a/java/demo/IcePack/hello/HelloI.java b/java/demo/IcePack/hello/HelloI.java
index 6ce648706f3..77f32062eb3 100644
--- a/java/demo/IcePack/hello/HelloI.java
+++ b/java/demo/IcePack/hello/HelloI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloI extends Hello
{
HelloI(String n)
diff --git a/java/demo/IcePack/hello/HelloServiceI.java b/java/demo/IcePack/hello/HelloServiceI.java
index d3691c1344b..416ab087cf5 100644
--- a/java/demo/IcePack/hello/HelloServiceI.java
+++ b/java/demo/IcePack/hello/HelloServiceI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service
{
public void
diff --git a/java/demo/IcePack/hello/Server.java b/java/demo/IcePack/hello/Server.java
index 06bc5df24b9..5d6816b8456 100644
--- a/java/demo/IcePack/hello/Server.java
+++ b/java/demo/IcePack/hello/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server extends Ice.Application
{
public int
diff --git a/java/demo/IcePack/hello/build.xml b/java/demo/IcePack/hello/build.xml
index 34a4b12850f..eadb9cc5171 100644
--- a/java/demo/IcePack/hello/build.xml
+++ b/java/demo/IcePack/hello/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_IcePack_hello" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/IcePack/simple/Client.java b/java/demo/IcePack/simple/Client.java
index 6ae53c0c3bf..112cfa802cc 100644
--- a/java/demo/IcePack/simple/Client.java
+++ b/java/demo/IcePack/simple/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/demo/IcePack/simple/Hello.ice b/java/demo/IcePack/simple/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/java/demo/IcePack/simple/Hello.ice
+++ b/java/demo/IcePack/simple/Hello.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef HELLO_ICE
#define HELLO_ICE
diff --git a/java/demo/IcePack/simple/HelloI.java b/java/demo/IcePack/simple/HelloI.java
index 4d76a078748..e9ac52c046d 100644
--- a/java/demo/IcePack/simple/HelloI.java
+++ b/java/demo/IcePack/simple/HelloI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloI extends Hello
{
public void
diff --git a/java/demo/IcePack/simple/HelloServiceI.java b/java/demo/IcePack/simple/HelloServiceI.java
index 6e34dea054c..1cbfa69fb5a 100644
--- a/java/demo/IcePack/simple/HelloServiceI.java
+++ b/java/demo/IcePack/simple/HelloServiceI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service
{
public void
diff --git a/java/demo/IcePack/simple/Server.java b/java/demo/IcePack/simple/Server.java
index cefcfe48b92..34a96a12f7b 100644
--- a/java/demo/IcePack/simple/Server.java
+++ b/java/demo/IcePack/simple/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server extends Ice.Application
{
public int
diff --git a/java/demo/IcePack/simple/build.xml b/java/demo/IcePack/simple/build.xml
index b875274bb66..61ade4ff85c 100644
--- a/java/demo/IcePack/simple/build.xml
+++ b/java/demo/IcePack/simple/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo_IcePack_simple" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/demo/book/evictor/EvictorBase.java b/java/demo/book/evictor/EvictorBase.java
index 128692d8247..b33bf21d00e 100644
--- a/java/demo/book/evictor/EvictorBase.java
+++ b/java/demo/book/evictor/EvictorBase.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Evictor;
public abstract class EvictorBase extends Ice.LocalObjectImpl implements Ice.ServantLocator
diff --git a/java/demo/book/evictor/LinkedList.java b/java/demo/book/evictor/LinkedList.java
index 92eae09e634..2361b33337c 100644
--- a/java/demo/book/evictor/LinkedList.java
+++ b/java/demo/book/evictor/LinkedList.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Evictor;
//
diff --git a/java/demo/build.xml b/java/demo/build.xml
index c0b0ee150ad..9e2d9954138 100644
--- a/java/demo/build.xml
+++ b/java/demo/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="demo" default="all" basedir=".">
<target name="all">
diff --git a/java/makebindist.py b/java/makebindist.py
index 97ba07b1216..a88364687b7 100755
--- a/java/makebindist.py
+++ b/java/makebindist.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys, shutil, fnmatch, re, string
#
diff --git a/java/makedist.py b/java/makedist.py
index 5175279e052..5e50a7a1153 100755
--- a/java/makedist.py
+++ b/java/makedist.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys, shutil, fnmatch, re
#
diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java
index 7237e7f4c69..fdd5a13ae2e 100755
--- a/java/src/Freeze/ConnectionI.java
+++ b/java/src/Freeze/ConnectionI.java
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
package Freeze;
diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/EvictorElement.java
index a687c271917..bfaa9717074 100644
--- a/java/src/Freeze/EvictorElement.java
+++ b/java/src/Freeze/EvictorElement.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
class EvictorElement extends Ice.LocalObjectImpl
diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index d5f07297371..71b330e50b0 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003-2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java
index 32a64cc1d1f..f0e4f0a362f 100644
--- a/java/src/Freeze/EvictorIteratorI.java
+++ b/java/src/Freeze/EvictorIteratorI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
class EvictorIteratorI extends Ice.LocalObjectImpl implements EvictorIterator
diff --git a/java/src/Freeze/FatalErrorCallback.java b/java/src/Freeze/FatalErrorCallback.java
index f1f0c2dcba0..a5621e10600 100644
--- a/java/src/Freeze/FatalErrorCallback.java
+++ b/java/src/Freeze/FatalErrorCallback.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
public interface FatalErrorCallback
diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/Index.java
index 121715efa69..a47104f5f26 100644
--- a/java/src/Freeze/Index.java
+++ b/java/src/Freeze/Index.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
public abstract class Index implements com.sleepycat.db.DbSecondaryKeyCreate
diff --git a/java/src/Freeze/LinkedList.java b/java/src/Freeze/LinkedList.java
index 4832d7b31e6..c40e63cc68e 100644
--- a/java/src/Freeze/LinkedList.java
+++ b/java/src/Freeze/LinkedList.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
//
diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/Map.java
index 6c06f009a0b..91ee586325e 100644
--- a/java/src/Freeze/Map.java
+++ b/java/src/Freeze/Map.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
public abstract class Map extends java.util.AbstractMap
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java
index 541e2503874..12a97a09fe7 100644
--- a/java/src/Freeze/ObjectStore.java
+++ b/java/src/Freeze/ObjectStore.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
class ObjectStore implements IceUtil.Store
diff --git a/java/src/Freeze/SharedDb.java b/java/src/Freeze/SharedDb.java
index 350a38a35f6..c74778464fe 100755
--- a/java/src/Freeze/SharedDb.java
+++ b/java/src/Freeze/SharedDb.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
class SharedDb extends com.sleepycat.db.Db
diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/SharedDbEnv.java
index dfc0fc02387..53a521ca80f 100644
--- a/java/src/Freeze/SharedDbEnv.java
+++ b/java/src/Freeze/SharedDbEnv.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
class SharedDbEnv extends com.sleepycat.db.DbEnv implements com.sleepycat.db.DbErrcall, Runnable
diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/TransactionI.java
index e496cf73d0c..d5a199e7359 100755
--- a/java/src/Freeze/TransactionI.java
+++ b/java/src/Freeze/TransactionI.java
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
package Freeze;
diff --git a/java/src/Freeze/Util.java b/java/src/Freeze/Util.java
index 555b5f6ac5c..c97ae3f125a 100644
--- a/java/src/Freeze/Util.java
+++ b/java/src/Freeze/Util.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Freeze;
public class Util
diff --git a/java/src/Ice/AMD_Object_ice_invoke.java b/java/src/Ice/AMD_Object_ice_invoke.java
index 51884ef652b..28cff522627 100644
--- a/java/src/Ice/AMD_Object_ice_invoke.java
+++ b/java/src/Ice/AMD_Object_ice_invoke.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public interface AMD_Object_ice_invoke
diff --git a/java/src/Ice/AMI_Object_ice_invoke.java b/java/src/Ice/AMI_Object_ice_invoke.java
index 298167565cc..0a9a20d72a6 100644
--- a/java/src/Ice/AMI_Object_ice_invoke.java
+++ b/java/src/Ice/AMI_Object_ice_invoke.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class AMI_Object_ice_invoke extends IceInternal.OutgoingAsync
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 158a5a63174..692dc40bb5a 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class Application
diff --git a/java/src/Ice/Blobject.java b/java/src/Ice/Blobject.java
index 77a06142a6e..9719786a76a 100644
--- a/java/src/Ice/Blobject.java
+++ b/java/src/Ice/Blobject.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class Blobject extends Ice.ObjectImpl
diff --git a/java/src/Ice/BlobjectAsync.java b/java/src/Ice/BlobjectAsync.java
index 0e12f6306b8..533a78d8470 100644
--- a/java/src/Ice/BlobjectAsync.java
+++ b/java/src/Ice/BlobjectAsync.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class BlobjectAsync extends Ice.ObjectImpl
diff --git a/java/src/Ice/BooleanHolder.java b/java/src/Ice/BooleanHolder.java
index 5bb251d6e23..985f5868bb7 100644
--- a/java/src/Ice/BooleanHolder.java
+++ b/java/src/Ice/BooleanHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class BooleanHolder
diff --git a/java/src/Ice/ByteHolder.java b/java/src/Ice/ByteHolder.java
index 353b719482c..04889dd0d90 100644
--- a/java/src/Ice/ByteHolder.java
+++ b/java/src/Ice/ByteHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class ByteHolder
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index ddba3466287..f4bf63466a0 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
final class CommunicatorI extends LocalObjectImpl implements Communicator
diff --git a/java/src/Ice/DoubleHolder.java b/java/src/Ice/DoubleHolder.java
index 52831b6fac5..1c40c12e3d5 100644
--- a/java/src/Ice/DoubleHolder.java
+++ b/java/src/Ice/DoubleHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class DoubleHolder
diff --git a/java/src/Ice/FloatHolder.java b/java/src/Ice/FloatHolder.java
index 8797a2bea05..33984e6f10b 100644
--- a/java/src/Ice/FloatHolder.java
+++ b/java/src/Ice/FloatHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class FloatHolder
diff --git a/java/src/Ice/IntHolder.java b/java/src/Ice/IntHolder.java
index b2a52ad167c..96f75482881 100644
--- a/java/src/Ice/IntHolder.java
+++ b/java/src/Ice/IntHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class IntHolder
diff --git a/java/src/Ice/LocalException.java b/java/src/Ice/LocalException.java
index 64ea520d5b7..974aea74706 100644
--- a/java/src/Ice/LocalException.java
+++ b/java/src/Ice/LocalException.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class LocalException extends RuntimeException
diff --git a/java/src/Ice/LocalObject.java b/java/src/Ice/LocalObject.java
index 93779b274c7..aca135b60b7 100644
--- a/java/src/Ice/LocalObject.java
+++ b/java/src/Ice/LocalObject.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public interface LocalObject
diff --git a/java/src/Ice/LocalObjectHolder.java b/java/src/Ice/LocalObjectHolder.java
index b97dd3f46cb..479f7072135 100644
--- a/java/src/Ice/LocalObjectHolder.java
+++ b/java/src/Ice/LocalObjectHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class LocalObjectHolder
diff --git a/java/src/Ice/LocalObjectImpl.java b/java/src/Ice/LocalObjectImpl.java
index 7434c7e7e0d..d0981b022ee 100644
--- a/java/src/Ice/LocalObjectImpl.java
+++ b/java/src/Ice/LocalObjectImpl.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class LocalObjectImpl implements LocalObject, java.lang.Cloneable
diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java
index 0cc56752e0c..f883f92f50f 100644
--- a/java/src/Ice/LoggerI.java
+++ b/java/src/Ice/LoggerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class LoggerI extends LocalObjectImpl implements Logger
diff --git a/java/src/Ice/LongHolder.java b/java/src/Ice/LongHolder.java
index d760f32c4db..ce143667ff9 100644
--- a/java/src/Ice/LongHolder.java
+++ b/java/src/Ice/LongHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class LongHolder
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java
index b5f42abd384..53652f11672 100644
--- a/java/src/Ice/Object.java
+++ b/java/src/Ice/Object.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public interface Object
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 994282140e8..563ab0c3ed1 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter
diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/ObjectHolder.java
index 5d88becf0b9..08246e5b403 100644
--- a/java/src/Ice/ObjectHolder.java
+++ b/java/src/Ice/ObjectHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class ObjectHolder
diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java
index 9624606156a..9446bd1447b 100644
--- a/java/src/Ice/ObjectImpl.java
+++ b/java/src/Ice/ObjectImpl.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public class ObjectImpl implements Object, java.lang.Cloneable
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 02ee1ce4792..3ac00e76ce0 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public interface ObjectPrx
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index acc0594f104..2cf7ac5fae4 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public class ObjectPrxHelper extends ObjectPrxHelperBase
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index ab14530e715..c54124090e9 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public class ObjectPrxHelperBase implements ObjectPrx
diff --git a/java/src/Ice/ObjectPrxHolder.java b/java/src/Ice/ObjectPrxHolder.java
index d61776e8e6c..a0b474330ce 100644
--- a/java/src/Ice/ObjectPrxHolder.java
+++ b/java/src/Ice/ObjectPrxHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class ObjectPrxHolder
diff --git a/java/src/Ice/PluginFactory.java b/java/src/Ice/PluginFactory.java
index cc2b29d5f5d..f340cb1af3f 100644
--- a/java/src/Ice/PluginFactory.java
+++ b/java/src/Ice/PluginFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public interface PluginFactory
diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java
index b6d2823e716..bca98922c8e 100644
--- a/java/src/Ice/PluginManagerI.java
+++ b/java/src/Ice/PluginManagerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class PluginManagerI extends LocalObjectImpl implements PluginManager
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 205deab6155..7c4414c1d7c 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
final class PropertiesI extends LocalObjectImpl implements Properties
diff --git a/java/src/Ice/ProxyIdentityFacetKey.java b/java/src/Ice/ProxyIdentityFacetKey.java
index ddea1ed5a0e..bd9ba5beb4b 100644
--- a/java/src/Ice/ProxyIdentityFacetKey.java
+++ b/java/src/Ice/ProxyIdentityFacetKey.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
//
diff --git a/java/src/Ice/ProxyIdentityKey.java b/java/src/Ice/ProxyIdentityKey.java
index 873180a30f9..654746d059b 100644
--- a/java/src/Ice/ProxyIdentityKey.java
+++ b/java/src/Ice/ProxyIdentityKey.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
//
diff --git a/java/src/Ice/RoutingTable.java b/java/src/Ice/RoutingTable.java
index 363266e6dfe..23dd95f5462 100644
--- a/java/src/Ice/RoutingTable.java
+++ b/java/src/Ice/RoutingTable.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class RoutingTable
diff --git a/java/src/Ice/ShortHolder.java b/java/src/Ice/ShortHolder.java
index 88eb22fcc4e..597c0ba296c 100644
--- a/java/src/Ice/ShortHolder.java
+++ b/java/src/Ice/ShortHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class ShortHolder
diff --git a/java/src/Ice/StringHolder.java b/java/src/Ice/StringHolder.java
index 3b44fe50fb4..4daa6fd1fcd 100644
--- a/java/src/Ice/StringHolder.java
+++ b/java/src/Ice/StringHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class StringHolder
diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java
index 37364790b15..c00303b7879 100644
--- a/java/src/Ice/SysLoggerI.java
+++ b/java/src/Ice/SysLoggerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2001
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
import java.net.DatagramPacket;
diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java
index b338d13113a..7e6672d45ec 100644
--- a/java/src/Ice/UserException.java
+++ b/java/src/Ice/UserException.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public abstract class UserException extends Exception
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index dc3e347d303..73fc679b775 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public final class Util
diff --git a/java/src/Ice/_AMD_Object_ice_invoke.java b/java/src/Ice/_AMD_Object_ice_invoke.java
index d8b04c34355..e82dbe87eac 100644
--- a/java/src/Ice/_AMD_Object_ice_invoke.java
+++ b/java/src/Ice/_AMD_Object_ice_invoke.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
final class _AMD_Object_ice_invoke extends IceInternal.IncomingAsync implements AMD_Object_ice_invoke
diff --git a/java/src/Ice/_ObjectDel.java b/java/src/Ice/_ObjectDel.java
index 3244bc9d2b3..649d476af8e 100644
--- a/java/src/Ice/_ObjectDel.java
+++ b/java/src/Ice/_ObjectDel.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public interface _ObjectDel
diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index 6498f1b2b32..a079cc41522 100644
--- a/java/src/Ice/_ObjectDelD.java
+++ b/java/src/Ice/_ObjectDelD.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public class _ObjectDelD implements _ObjectDel
diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java
index 9079cc4b292..8b195a9ab1a 100644
--- a/java/src/Ice/_ObjectDelM.java
+++ b/java/src/Ice/_ObjectDelM.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Ice;
public class _ObjectDelM implements _ObjectDel
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index c2960d32ece..93318a09a85 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceBox;
public final class Admin
diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java
index 6b2d223be31..5414b128753 100644
--- a/java/src/IceBox/Server.java
+++ b/java/src/IceBox/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceBox;
public final class Server extends Ice.Application
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 55fee45ec32..50b55b9c0c0 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceBox;
public final class ServiceManagerI extends _ServiceManagerDisp
diff --git a/java/src/IceInternal/Acceptor.java b/java/src/IceInternal/Acceptor.java
index ec7b28f2c5d..1029d296ae8 100644
--- a/java/src/IceInternal/Acceptor.java
+++ b/java/src/IceInternal/Acceptor.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface Acceptor
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 126be6eeba6..037779bc559 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class BasicStream
diff --git a/java/src/IceInternal/BufferManager.java b/java/src/IceInternal/BufferManager.java
index 57beb7e9060..453744807af 100644
--- a/java/src/IceInternal/BufferManager.java
+++ b/java/src/IceInternal/BufferManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class BufferManager
diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index 4feb0b6b966..f5cac639c81 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class Connection extends EventHandler
diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java
index cebc787b9e8..60565e3ddbd 100644
--- a/java/src/IceInternal/ConnectionMonitor.java
+++ b/java/src/IceInternal/ConnectionMonitor.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ConnectionMonitor extends Thread
diff --git a/java/src/IceInternal/Connector.java b/java/src/IceInternal/Connector.java
index cedb27cc7a1..85dbd9e5b56 100644
--- a/java/src/IceInternal/Connector.java
+++ b/java/src/IceInternal/Connector.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface Connector
diff --git a/java/src/IceInternal/DefaultsAndOverrides.java b/java/src/IceInternal/DefaultsAndOverrides.java
index 92d50374543..437064e8b89 100644
--- a/java/src/IceInternal/DefaultsAndOverrides.java
+++ b/java/src/IceInternal/DefaultsAndOverrides.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class DefaultsAndOverrides
diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java
index e78be1b9c5b..42b0bddedcd 100644
--- a/java/src/IceInternal/Direct.java
+++ b/java/src/IceInternal/Direct.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class Direct
diff --git a/java/src/IceInternal/DispatchStatus.java b/java/src/IceInternal/DispatchStatus.java
index a2a554b9797..151da6a9056 100644
--- a/java/src/IceInternal/DispatchStatus.java
+++ b/java/src/IceInternal/DispatchStatus.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class DispatchStatus
diff --git a/java/src/IceInternal/Endpoint.java b/java/src/IceInternal/Endpoint.java
index 0bf9d63362f..6b9ba67f338 100644
--- a/java/src/IceInternal/Endpoint.java
+++ b/java/src/IceInternal/Endpoint.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface Endpoint extends java.lang.Comparable
diff --git a/java/src/IceInternal/EndpointFactory.java b/java/src/IceInternal/EndpointFactory.java
index 89048d2a570..b6779752292 100644
--- a/java/src/IceInternal/EndpointFactory.java
+++ b/java/src/IceInternal/EndpointFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface EndpointFactory
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java
index 6051c6e79c8..0103b04a76f 100644
--- a/java/src/IceInternal/EndpointFactoryManager.java
+++ b/java/src/IceInternal/EndpointFactoryManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class EndpointFactoryManager
diff --git a/java/src/IceInternal/EndpointHolder.java b/java/src/IceInternal/EndpointHolder.java
index fa34531a362..fe212c23fb5 100644
--- a/java/src/IceInternal/EndpointHolder.java
+++ b/java/src/IceInternal/EndpointHolder.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class EndpointHolder
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index 756e21d9e87..05003aac745 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
abstract class EventHandler
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 77460ab6f68..68d0d8a1f69 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final public class Incoming extends IncomingBase
diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java
index 4c4a23f3194..9fdd2850930 100644
--- a/java/src/IceInternal/IncomingAsync.java
+++ b/java/src/IceInternal/IncomingAsync.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class IncomingAsync extends IncomingBase
diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java
index f930de80376..47c0b513c6f 100644
--- a/java/src/IceInternal/IncomingBase.java
+++ b/java/src/IceInternal/IncomingBase.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class IncomingBase
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 7dc80c954cb..1765c6c9e0d 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class IncomingConnectionFactory extends EventHandler
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index e60d40518a6..bdc9dc3c368 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class Instance
diff --git a/java/src/IceInternal/IntMap.java b/java/src/IceInternal/IntMap.java
index 85293209c2e..4918a552b62 100755
--- a/java/src/IceInternal/IntMap.java
+++ b/java/src/IceInternal/IntMap.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class IntMap
diff --git a/java/src/IceInternal/ListPatcher.java b/java/src/IceInternal/ListPatcher.java
index aeb5f9637b3..6b917538e22 100644
--- a/java/src/IceInternal/ListPatcher.java
+++ b/java/src/IceInternal/ListPatcher.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class ListPatcher implements Patcher
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index 79c35039393..33b6a69bef5 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class LocatorInfo
diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/IceInternal/LocatorManager.java
index 7f4357f95b4..c35843690bf 100644
--- a/java/src/IceInternal/LocatorManager.java
+++ b/java/src/IceInternal/LocatorManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class LocatorManager
diff --git a/java/src/IceInternal/LocatorTable.java b/java/src/IceInternal/LocatorTable.java
index b5b2197cb26..94040ebdf89 100644
--- a/java/src/IceInternal/LocatorTable.java
+++ b/java/src/IceInternal/LocatorTable.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class LocatorTable
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 3ea49d0e511..c033fe8d5e3 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class Network
diff --git a/java/src/IceInternal/NonRepeatable.java b/java/src/IceInternal/NonRepeatable.java
index 2effe98978d..541729e542f 100644
--- a/java/src/IceInternal/NonRepeatable.java
+++ b/java/src/IceInternal/NonRepeatable.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class NonRepeatable extends Exception
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index edab241f2cc..635d2d57df6 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ObjectAdapterFactory
diff --git a/java/src/IceInternal/ObjectFactoryManager.java b/java/src/IceInternal/ObjectFactoryManager.java
index d7af9549b32..008fa05f085 100644
--- a/java/src/IceInternal/ObjectFactoryManager.java
+++ b/java/src/IceInternal/ObjectFactoryManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ObjectFactoryManager
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 49b527cb348..9dbd228c71c 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class Outgoing
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index d1d1b1fce61..3323f8cd53a 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public abstract class OutgoingAsync
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 3e0a5b49457..bd8826e6dc9 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class OutgoingConnectionFactory
diff --git a/java/src/IceInternal/Patcher.java b/java/src/IceInternal/Patcher.java
index b5e30377bd0..ec4ba5e932e 100644
--- a/java/src/IceInternal/Patcher.java
+++ b/java/src/IceInternal/Patcher.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface Patcher
diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java
index b39ca8d48f9..6fdd5207c71 100644
--- a/java/src/IceInternal/Protocol.java
+++ b/java/src/IceInternal/Protocol.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class Protocol
diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java
index d07d3114075..c10489eec6f 100644
--- a/java/src/IceInternal/ProxyFactory.java
+++ b/java/src/IceInternal/ProxyFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ProxyFactory
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 6f6cbdedf9d..3758d987613 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class Reference
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index ba7823b8878..988c4d3b84d 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ReferenceFactory
diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java
index f85140401f0..2c120f7a76f 100644
--- a/java/src/IceInternal/RouterInfo.java
+++ b/java/src/IceInternal/RouterInfo.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class RouterInfo
diff --git a/java/src/IceInternal/RouterManager.java b/java/src/IceInternal/RouterManager.java
index 10ebdd6bae3..4a0ce4e3a80 100644
--- a/java/src/IceInternal/RouterManager.java
+++ b/java/src/IceInternal/RouterManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class RouterManager
diff --git a/java/src/IceInternal/SequencePatcher.java b/java/src/IceInternal/SequencePatcher.java
index 5fc5b9300d2..5318f12fcd9 100644
--- a/java/src/IceInternal/SequencePatcher.java
+++ b/java/src/IceInternal/SequencePatcher.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public class SequencePatcher implements Patcher
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index c08908c5400..43265bcb96e 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ServantManager extends Thread
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index cf0f1799859..121fa487151 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
class TcpAcceptor implements Acceptor
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index f0162cb3314..bea30075b53 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class TcpConnector implements Connector
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index 64fc04a2fae..f3caef8e921 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class TcpEndpoint implements Endpoint
diff --git a/java/src/IceInternal/TcpEndpointFactory.java b/java/src/IceInternal/TcpEndpointFactory.java
index 4249dfc4100..e9e01abdd98 100644
--- a/java/src/IceInternal/TcpEndpointFactory.java
+++ b/java/src/IceInternal/TcpEndpointFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class TcpEndpointFactory implements EndpointFactory
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index f5b49c6f1df..62d7c228588 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class TcpTransceiver implements Transceiver
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index 33ee57f19bd..815d9173a04 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ThreadPool
diff --git a/java/src/IceInternal/TraceLevels.java b/java/src/IceInternal/TraceLevels.java
index af6c4339379..1a309b661c3 100644
--- a/java/src/IceInternal/TraceLevels.java
+++ b/java/src/IceInternal/TraceLevels.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class TraceLevels
diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java
index c4ce56e00dd..f728c8bd08f 100644
--- a/java/src/IceInternal/TraceUtil.java
+++ b/java/src/IceInternal/TraceUtil.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class TraceUtil
diff --git a/java/src/IceInternal/Transceiver.java b/java/src/IceInternal/Transceiver.java
index ff24d0900ed..5fb6290ae26 100644
--- a/java/src/IceInternal/Transceiver.java
+++ b/java/src/IceInternal/Transceiver.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface Transceiver
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index c124a96dee1..7cc1df5e978 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class UdpEndpoint implements Endpoint
diff --git a/java/src/IceInternal/UdpEndpointFactory.java b/java/src/IceInternal/UdpEndpointFactory.java
index 124cf6c9492..ea1478aba19 100644
--- a/java/src/IceInternal/UdpEndpointFactory.java
+++ b/java/src/IceInternal/UdpEndpointFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class UdpEndpointFactory implements EndpointFactory
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index e7634d41467..7831a2b1fd6 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class UdpTransceiver implements Transceiver
diff --git a/java/src/IceInternal/UnknownEndpoint.java b/java/src/IceInternal/UnknownEndpoint.java
index 9d203075805..c45baae349e 100644
--- a/java/src/IceInternal/UnknownEndpoint.java
+++ b/java/src/IceInternal/UnknownEndpoint.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
final class UnknownEndpoint implements Endpoint
diff --git a/java/src/IceInternal/UserExceptionFactory.java b/java/src/IceInternal/UserExceptionFactory.java
index b66574b1084..0d4c13d4731 100644
--- a/java/src/IceInternal/UserExceptionFactory.java
+++ b/java/src/IceInternal/UserExceptionFactory.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public interface UserExceptionFactory
diff --git a/java/src/IceInternal/UserExceptionFactoryManager.java b/java/src/IceInternal/UserExceptionFactoryManager.java
index ab5f51304cc..006b9fae940 100644
--- a/java/src/IceInternal/UserExceptionFactoryManager.java
+++ b/java/src/IceInternal/UserExceptionFactoryManager.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class UserExceptionFactoryManager
diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java
index 1a4fccd0b44..3be569d1397 100644
--- a/java/src/IceInternal/ValueWriter.java
+++ b/java/src/IceInternal/ValueWriter.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceInternal;
public final class ValueWriter
diff --git a/java/src/IceUtil/Cache.java b/java/src/IceUtil/Cache.java
index 11b75c8989c..3a1a2e44823 100644
--- a/java/src/IceUtil/Cache.java
+++ b/java/src/IceUtil/Cache.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
//
diff --git a/java/src/IceUtil/CountDownLatch.java b/java/src/IceUtil/CountDownLatch.java
index 53dcec79442..885d686afc5 100644
--- a/java/src/IceUtil/CountDownLatch.java
+++ b/java/src/IceUtil/CountDownLatch.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
//
diff --git a/java/src/IceUtil/OutputBase.java b/java/src/IceUtil/OutputBase.java
index c4af4235d60..6da37d1c036 100644
--- a/java/src/IceUtil/OutputBase.java
+++ b/java/src/IceUtil/OutputBase.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
public class OutputBase
diff --git a/java/src/IceUtil/Store.java b/java/src/IceUtil/Store.java
index 6e5e46c3555..9536e47459a 100644
--- a/java/src/IceUtil/Store.java
+++ b/java/src/IceUtil/Store.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
public interface Store
diff --git a/java/src/IceUtil/StringUtil.java b/java/src/IceUtil/StringUtil.java
index 8cd68d17ca4..7dbc39e6b52 100644
--- a/java/src/IceUtil/StringUtil.java
+++ b/java/src/IceUtil/StringUtil.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
public final class StringUtil
diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java
index 00fb1110dfe..6e13c0ff25c 100644
--- a/java/src/IceUtil/Version.java
+++ b/java/src/IceUtil/Version.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
public final class Version
diff --git a/java/src/IceUtil/XMLOutput.java b/java/src/IceUtil/XMLOutput.java
index 60f7e04ea1b..f78f3193ae3 100644
--- a/java/src/IceUtil/XMLOutput.java
+++ b/java/src/IceUtil/XMLOutput.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package IceUtil;
public class XMLOutput extends OutputBase
diff --git a/java/test/Freeze/build.xml b/java/test/Freeze/build.xml
index 524327c9bc0..0af368865c5 100644
--- a/java/test/Freeze/build.xml
+++ b/java/test/Freeze/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Freeze" default="all" basedir=".">
<target name="all">
diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java
index 24daa5d68a6..d6d8c69d48a 100644
--- a/java/test/Freeze/complex/Client.java
+++ b/java/test/Freeze/complex/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
import Freeze.*;
public class Client
diff --git a/java/test/Freeze/complex/Complex.ice b/java/test/Freeze/complex/Complex.ice
index 4e72fb7857d..dd8448595ac 100644
--- a/java/test/Freeze/complex/Complex.ice
+++ b/java/test/Freeze/complex/Complex.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
module Complex
{
diff --git a/java/test/Freeze/complex/Complex/AddNodeI.java b/java/test/Freeze/complex/Complex/AddNodeI.java
index 6ca48445879..240d4d3937e 100644
--- a/java/test/Freeze/complex/Complex/AddNodeI.java
+++ b/java/test/Freeze/complex/Complex/AddNodeI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Complex;
public class AddNodeI extends AddNode
diff --git a/java/test/Freeze/complex/Complex/MultiplyNodeI.java b/java/test/Freeze/complex/Complex/MultiplyNodeI.java
index ea93217c53b..ec68013ee1a 100644
--- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java
+++ b/java/test/Freeze/complex/Complex/MultiplyNodeI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Complex;
public class MultiplyNodeI extends MultiplyNode
diff --git a/java/test/Freeze/complex/Complex/NumberNodeI.java b/java/test/Freeze/complex/Complex/NumberNodeI.java
index 7699b74a914..0b41c072061 100644
--- a/java/test/Freeze/complex/Complex/NumberNodeI.java
+++ b/java/test/Freeze/complex/Complex/NumberNodeI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Complex;
public class NumberNodeI extends NumberNode
diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
index 9989b102881..a0a46947972 100644
--- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java
+++ b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
package Complex;
public class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory
diff --git a/java/test/Freeze/complex/ParseError.java b/java/test/Freeze/complex/ParseError.java
index aae37142a27..cc4f159c474 100644
--- a/java/test/Freeze/complex/ParseError.java
+++ b/java/test/Freeze/complex/ParseError.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class ParseError extends Exception
{
public ParseError(String msg)
diff --git a/java/test/Freeze/complex/Parser.java b/java/test/Freeze/complex/Parser.java
index 1ec1ff5803b..e4b1d79c87a 100644
--- a/java/test/Freeze/complex/Parser.java
+++ b/java/test/Freeze/complex/Parser.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Parser
{
public Complex.Node
diff --git a/java/test/Freeze/complex/build.xml b/java/test/Freeze/complex/build.xml
index 9b12eb59f1e..013f1e87480 100644
--- a/java/test/Freeze/complex/build.xml
+++ b/java/test/Freeze/complex/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Freeze_cursor" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py
index 576233b6e40..1fe52202148 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/test/Freeze/complex/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/Freeze/dbmap/Client.java
index 877e255c52c..1751dd09826 100644
--- a/java/test/Freeze/dbmap/Client.java
+++ b/java/test/Freeze/dbmap/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
import Freeze.*;
public class Client
diff --git a/java/test/Freeze/dbmap/build.xml b/java/test/Freeze/dbmap/build.xml
index ea8cbe19c49..afae706f8de 100644
--- a/java/test/Freeze/dbmap/build.xml
+++ b/java/test/Freeze/dbmap/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Freeze_cursor" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py
index 71d611c0a00..aa332c34106 100755
--- a/java/test/Freeze/dbmap/run.py
+++ b/java/test/Freeze/dbmap/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index b2ccaba5da8..5fc34074e51 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/test/Freeze/evictor/FacetI.java b/java/test/Freeze/evictor/FacetI.java
index 983fadaaa67..d9740868219 100644
--- a/java/test/Freeze/evictor/FacetI.java
+++ b/java/test/Freeze/evictor/FacetI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class FacetI extends ServantI implements Test._FacetOperations
{
FacetI(Test.Facet tie)
diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
index a70e769f91d..36addc0a105 100644
--- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class RemoteEvictorFactoryI extends Test._RemoteEvictorFactoryDisp
{
RemoteEvictorFactoryI(Ice.ObjectAdapter adapter, String envName)
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index a09b64c0be1..7568e5b1d00 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class RemoteEvictorI extends Test._RemoteEvictorDisp
{
static class Initializer extends Ice.LocalObjectImpl implements Freeze.ServantInitializer
diff --git a/java/test/Freeze/evictor/ServantI.java b/java/test/Freeze/evictor/ServantI.java
index 84fdb485b34..4bf93565ddf 100644
--- a/java/test/Freeze/evictor/ServantI.java
+++ b/java/test/Freeze/evictor/ServantI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class ServantI implements Test._ServantOperations
{
static class DelayedResponse extends Thread
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java
index a68959357cb..82ad6615155 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/Freeze/evictor/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
static class ServantFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
diff --git a/java/test/Freeze/evictor/Test.ice b/java/test/Freeze/evictor/Test.ice
index cdbe982f481..728d0a4bf19 100644
--- a/java/test/Freeze/evictor/Test.ice
+++ b/java/test/Freeze/evictor/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Freeze/evictor/build.xml b/java/test/Freeze/evictor/build.xml
index e6d5ffc90d0..c63d2711954 100644
--- a/java/test/Freeze/evictor/build.xml
+++ b/java/test/Freeze/evictor/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Freeze_evictor" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py
index 3c030c8fee0..3374339646c 100755
--- a/java/test/Freeze/evictor/run.py
+++ b/java/test/Freeze/evictor/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Glacier/build.xml b/java/test/Glacier/build.xml
index b3eb3581399..97da3cd79bd 100644
--- a/java/test/Glacier/build.xml
+++ b/java/test/Glacier/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice" default="all" basedir=".">
<target name="all">
diff --git a/java/test/Glacier/starter/Callback.ice b/java/test/Glacier/starter/Callback.ice
index fd71399aee6..5df246bbb52 100644
--- a/java/test/Glacier/starter/Callback.ice
+++ b/java/test/Glacier/starter/Callback.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java
index 8a9a23ffc7d..bacebe2e783 100644
--- a/java/test/Glacier/starter/CallbackClient.java
+++ b/java/test/Glacier/starter/CallbackClient.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class CallbackClient extends Ice.Application
{
public int
diff --git a/java/test/Glacier/starter/CallbackI.java b/java/test/Glacier/starter/CallbackI.java
index e6216678c3b..e8def7f6aa2 100644
--- a/java/test/Glacier/starter/CallbackI.java
+++ b/java/test/Glacier/starter/CallbackI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
final class CallbackI extends Callback
{
CallbackI(Ice.Communicator communicator)
diff --git a/java/test/Glacier/starter/CallbackReceiverI.java b/java/test/Glacier/starter/CallbackReceiverI.java
index d6f2d92f338..9192a5d0242 100644
--- a/java/test/Glacier/starter/CallbackReceiverI.java
+++ b/java/test/Glacier/starter/CallbackReceiverI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
final class CallbackReceiverI extends CallbackReceiver
{
CallbackReceiverI()
diff --git a/java/test/Glacier/starter/CallbackServer.java b/java/test/Glacier/starter/CallbackServer.java
index 4d0444c508a..abf3236ef8e 100644
--- a/java/test/Glacier/starter/CallbackServer.java
+++ b/java/test/Glacier/starter/CallbackServer.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class CallbackServer extends Ice.Application
{
public int
diff --git a/java/test/Glacier/starter/Client.java b/java/test/Glacier/starter/Client.java
index 44fbe7e8ab6..f1be3c1c68e 100644
--- a/java/test/Glacier/starter/Client.java
+++ b/java/test/Glacier/starter/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
public static void
diff --git a/java/test/Glacier/starter/Server.java b/java/test/Glacier/starter/Server.java
index 0dc0520b897..7690c89702a 100644
--- a/java/test/Glacier/starter/Server.java
+++ b/java/test/Glacier/starter/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
public static void
diff --git a/java/test/Glacier/starter/build.xml b/java/test/Glacier/starter/build.xml
index 73fc0930b63..d1042de23c0 100644
--- a/java/test/Glacier/starter/build.xml
+++ b/java/test/Glacier/starter/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Glacier_starter" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Glacier/starter/run.py b/java/test/Glacier/starter/run.py
index a5a28dfcb61..67a3c21c2de 100755
--- a/java/test/Glacier/starter/run.py
+++ b/java/test/Glacier/starter/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java
index 2e66164cdc7..165ec90507f 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/Ice/adapterDeactivation/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/Ice/adapterDeactivation/Client.java
index f30cc1c4802..5cebeb641a6 100644
--- a/java/test/Ice/adapterDeactivation/Client.java
+++ b/java/test/Ice/adapterDeactivation/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
static class TestClient extends Ice.Application
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java
index da29cb136df..2bf8d5efe22 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/Ice/adapterDeactivation/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
static class TestServer extends Ice.Application
diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/Ice/adapterDeactivation/CookieI.java
index ae13d25558b..47b14a9389e 100644
--- a/java/test/Ice/adapterDeactivation/CookieI.java
+++ b/java/test/Ice/adapterDeactivation/CookieI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CookieI extends Cookie
{
public String
diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
index 92bed236535..827c7bb4e3e 100644
--- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java
+++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
{
public
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 013534fea0c..41ff804ab95 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
static class TestServer extends Ice.Application
diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/Ice/adapterDeactivation/Test.ice
index 7b23a4b05a7..a3b0d2a4cca 100644
--- a/java/test/Ice/adapterDeactivation/Test.ice
+++ b/java/test/Ice/adapterDeactivation/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/Ice/adapterDeactivation/TestI.java
index 894de98f345..1328cb78884 100644
--- a/java/test/Ice/adapterDeactivation/TestI.java
+++ b/java/test/Ice/adapterDeactivation/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends _TestDisp
{
public void
diff --git a/java/test/Ice/adapterDeactivation/build.xml b/java/test/Ice/adapterDeactivation/build.xml
index 84bb0cf9d82..b2475b65c39 100644
--- a/java/test/Ice/adapterDeactivation/build.xml
+++ b/java/test/Ice/adapterDeactivation/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_operations" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py
index 25b00830142..9e3e3d96485 100755
--- a/java/test/Ice/adapterDeactivation/run.py
+++ b/java/test/Ice/adapterDeactivation/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/build.xml b/java/test/Ice/build.xml
index 7692825525e..31a6422e7a3 100644
--- a/java/test/Ice/build.xml
+++ b/java/test/Ice/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice" default="all" basedir=".">
<target name="all">
diff --git a/java/test/Ice/custom/AllTests.java b/java/test/Ice/custom/AllTests.java
index f5252a2e25f..bd3dac47bf0 100644
--- a/java/test/Ice/custom/AllTests.java
+++ b/java/test/Ice/custom/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java
index dce720c149a..954b44d349e 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/Ice/custom/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java
index f61d9684c09..27686802cdb 100644
--- a/java/test/Ice/custom/Collocated.java
+++ b/java/test/Ice/custom/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
private static int
diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java
index 5968d2c855e..e68903a54df 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/Ice/custom/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/custom/Test.ice b/java/test/Ice/custom/Test.ice
index 098f7f81b11..803ff2ef3b0 100644
--- a/java/test/Ice/custom/Test.ice
+++ b/java/test/Ice/custom/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java
index 7143da41520..9154f69f102 100644
--- a/java/test/Ice/custom/TestI.java
+++ b/java/test/Ice/custom/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends Test
{
public
diff --git a/java/test/Ice/custom/build.xml b/java/test/Ice/custom/build.xml
index fe89f653d47..cb609fc07f9 100644
--- a/java/test/Ice/custom/build.xml
+++ b/java/test/Ice/custom/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_custom" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/custom/run.py b/java/test/Ice/custom/run.py
index 773a538a06a..cda47681e9e 100755
--- a/java/test/Ice/custom/run.py
+++ b/java/test/Ice/custom/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index c13fd3e90ca..e7bb8997b23 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index ef1b8f97326..b50ca5e3314 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 4344d094c80..d9b0916e3af 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
private static int
diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/Ice/exceptions/DummyLogger.java
index c5a0887d5dd..293ae10e0c5 100644
--- a/java/test/Ice/exceptions/DummyLogger.java
+++ b/java/test/Ice/exceptions/DummyLogger.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger
{
public void
diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/Ice/exceptions/EmptyI.java
index e112dfc84b5..f12fd40e649 100644
--- a/java/test/Ice/exceptions/EmptyI.java
+++ b/java/test/Ice/exceptions/EmptyI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class EmptyI extends _EmptyDisp
{
}
diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/Ice/exceptions/ObjectFactoryI.java
index fac56c97975..d0cb99f9aa3 100644
--- a/java/test/Ice/exceptions/ObjectFactoryI.java
+++ b/java/test/Ice/exceptions/ObjectFactoryI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory
{
public Ice.Object create(String s)
diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/Ice/exceptions/ServantLocatorI.java
index acd0d50cbbf..5a9a6c695de 100644
--- a/java/test/Ice/exceptions/ServantLocatorI.java
+++ b/java/test/Ice/exceptions/ServantLocatorI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator
{
public Ice.Object locate(Ice.Current curr, Ice.LocalObjectHolder cookie)
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index ec835514335..64d4385cbce 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index 2ac6482d3e7..8b0392f68fc 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/Ice/exceptions/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index 227df0d45ce..c28594690c2 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ThrowerI extends _ThrowerDisp
{
public
diff --git a/java/test/Ice/exceptions/build.xml b/java/test/Ice/exceptions/build.xml
index 78b8c0d07f1..212f29f55d8 100644
--- a/java/test/Ice/exceptions/build.xml
+++ b/java/test/Ice/exceptions/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_exceptions" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py
index 1245d90af96..12502f0922e 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/Ice/exceptions/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/exceptionsAMD/DummyLogger.java b/java/test/Ice/exceptionsAMD/DummyLogger.java
index c5a0887d5dd..293ae10e0c5 100644
--- a/java/test/Ice/exceptionsAMD/DummyLogger.java
+++ b/java/test/Ice/exceptionsAMD/DummyLogger.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger
{
public void
diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java
index ec835514335..64d4385cbce 100644
--- a/java/test/Ice/exceptionsAMD/Server.java
+++ b/java/test/Ice/exceptionsAMD/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/exceptionsAMD/TestAMD.ice b/java/test/Ice/exceptionsAMD/TestAMD.ice
index a6e0c26ddd3..498e7bb82c9 100644
--- a/java/test/Ice/exceptionsAMD/TestAMD.ice
+++ b/java/test/Ice/exceptionsAMD/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/java/test/Ice/exceptionsAMD/ThrowerI.java b/java/test/Ice/exceptionsAMD/ThrowerI.java
index d6dafa507ec..445a50ce062 100644
--- a/java/test/Ice/exceptionsAMD/ThrowerI.java
+++ b/java/test/Ice/exceptionsAMD/ThrowerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ThrowerI extends _ThrowerDisp
{
public
diff --git a/java/test/Ice/exceptionsAMD/build.xml b/java/test/Ice/exceptionsAMD/build.xml
index 7566f82bc19..3d6aab25fec 100644
--- a/java/test/Ice/exceptionsAMD/build.xml
+++ b/java/test/Ice/exceptionsAMD/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_exceptions" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java
index 02db9b975c5..64cd54dbce3 100644
--- a/java/test/Ice/facets/AI.java
+++ b/java/test/Ice/facets/AI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class AI extends _ADisp
{
public
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index db3e5949141..0162c73ed01 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/facets/BI.java b/java/test/Ice/facets/BI.java
index c0a52238e63..c2d619dca26 100644
--- a/java/test/Ice/facets/BI.java
+++ b/java/test/Ice/facets/BI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class BI extends _BDisp
{
public
diff --git a/java/test/Ice/facets/CI.java b/java/test/Ice/facets/CI.java
index 4399af48451..c3dba382a7b 100644
--- a/java/test/Ice/facets/CI.java
+++ b/java/test/Ice/facets/CI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CI extends _CDisp
{
public
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index f35e67c6565..055f84451af 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 590b2ded81d..4e801b031ab 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
private static int
diff --git a/java/test/Ice/facets/DI.java b/java/test/Ice/facets/DI.java
index 366f7f0d153..3054a753463 100644
--- a/java/test/Ice/facets/DI.java
+++ b/java/test/Ice/facets/DI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class DI extends _DDisp
{
public
diff --git a/java/test/Ice/facets/EI.java b/java/test/Ice/facets/EI.java
index 0c77d2e8cac..ec7c451e2bb 100644
--- a/java/test/Ice/facets/EI.java
+++ b/java/test/Ice/facets/EI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class EI extends _EDisp
{
public
diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/Ice/facets/EmptyI.java
index e112dfc84b5..f12fd40e649 100644
--- a/java/test/Ice/facets/EmptyI.java
+++ b/java/test/Ice/facets/EmptyI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class EmptyI extends _EmptyDisp
{
}
diff --git a/java/test/Ice/facets/FI.java b/java/test/Ice/facets/FI.java
index c6fd8f2ad63..ade5826322b 100644
--- a/java/test/Ice/facets/FI.java
+++ b/java/test/Ice/facets/FI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class FI extends _FDisp
{
public
diff --git a/java/test/Ice/facets/GI.java b/java/test/Ice/facets/GI.java
index 2f1022936e7..084a164a54b 100644
--- a/java/test/Ice/facets/GI.java
+++ b/java/test/Ice/facets/GI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class GI extends _GDisp
{
public
diff --git a/java/test/Ice/facets/HI.java b/java/test/Ice/facets/HI.java
index 951f83e53f9..4f7529fa5a1 100644
--- a/java/test/Ice/facets/HI.java
+++ b/java/test/Ice/facets/HI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class HI extends _HDisp
{
public
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index f5eecf6a77d..48b7f306dd3 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/facets/Test.ice b/java/test/Ice/facets/Test.ice
index 1b4af73e885..e8f202bff53 100644
--- a/java/test/Ice/facets/Test.ice
+++ b/java/test/Ice/facets/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/facets/build.xml b/java/test/Ice/facets/build.xml
index babc76614be..61ab067fce1 100644
--- a/java/test/Ice/facets/build.xml
+++ b/java/test/Ice/facets/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_facets" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py
index fc4cb9de4ea..dad67e968b6 100755
--- a/java/test/Ice/facets/run.py
+++ b/java/test/Ice/facets/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index 239f4d91dba..b5475160824 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
public static void
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index a090106dbd3..1326a9f1bbc 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static void
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index f985a52564d..c88b84e57b1 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static void
diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/Ice/faultTolerance/Test.ice
index 18ef9797ae9..15fa8e63042 100644
--- a/java/test/Ice/faultTolerance/Test.ice
+++ b/java/test/Ice/faultTolerance/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java
index 61873e62c40..43cbb1d22ea 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/Ice/faultTolerance/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends _TestDisp
{
public
diff --git a/java/test/Ice/faultTolerance/build.xml b/java/test/Ice/faultTolerance/build.xml
index 93a2b7bf54b..3b01898fcec 100644
--- a/java/test/Ice/faultTolerance/build.xml
+++ b/java/test/Ice/faultTolerance/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_faultTolerance" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index d016cf9b9ff..43a50481417 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java
index e35f23d6d99..ee24445b535 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/Ice/inheritance/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java
index 74478a18570..12de0c6621e 100644
--- a/java/test/Ice/inheritance/CAI.java
+++ b/java/test/Ice/inheritance/CAI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CAI extends MA.CA
{
public
diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java
index f2069d56b6b..ccd742c9264 100644
--- a/java/test/Ice/inheritance/CBI.java
+++ b/java/test/Ice/inheritance/CBI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CBI extends MB.CB
{
public
diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java
index d909312061e..abf657f811c 100644
--- a/java/test/Ice/inheritance/CCI.java
+++ b/java/test/Ice/inheritance/CCI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CCI extends MA.CC
{
public
diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java
index d075a497684..4b9c987a28b 100644
--- a/java/test/Ice/inheritance/CDI.java
+++ b/java/test/Ice/inheritance/CDI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CDI extends MA.CD
{
public
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index 87bb5c84674..99d52f996d1 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index 328e9909e98..05caab99648 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
private static int
diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java
index d0d2c04c495..09231bb72c9 100644
--- a/java/test/Ice/inheritance/IAI.java
+++ b/java/test/Ice/inheritance/IAI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class IAI extends MA._IADisp
{
public
diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java
index e72aa06c77b..833e0a9ea57 100644
--- a/java/test/Ice/inheritance/IB1I.java
+++ b/java/test/Ice/inheritance/IB1I.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class IB1I extends MB._IB1Disp
{
public
diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java
index 4f9882fde08..9f319bd82fa 100644
--- a/java/test/Ice/inheritance/IB2I.java
+++ b/java/test/Ice/inheritance/IB2I.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class IB2I extends MB._IB2Disp
{
public
diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java
index 547517a2ba5..839c3da2ca8 100644
--- a/java/test/Ice/inheritance/ICI.java
+++ b/java/test/Ice/inheritance/ICI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class ICI extends MA._ICDisp
{
public
diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java
index f57c21fe8ec..6f426b2dc8f 100644
--- a/java/test/Ice/inheritance/InitialI.java
+++ b/java/test/Ice/inheritance/InitialI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class InitialI extends _InitialDisp
{
public
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 5a9492c6fa0..5434755389f 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice
index 10d0800ef95..7829bc57b83 100644
--- a/java/test/Ice/inheritance/Test.ice
+++ b/java/test/Ice/inheritance/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TESTICE
#define TESTICE
diff --git a/java/test/Ice/inheritance/build.xml b/java/test/Ice/inheritance/build.xml
index 07dad8c7298..c5034b363f5 100644
--- a/java/test/Ice/inheritance/build.xml
+++ b/java/test/Ice/inheritance/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_inheritance" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py
index c1d8220bd31..aeb05771824 100755
--- a/java/test/Ice/inheritance/run.py
+++ b/java/test/Ice/inheritance/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 2107f3a3771..20919bf717e 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index 6965bfa0f79..332e5ee5b0e 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/location/HelloI.java b/java/test/Ice/location/HelloI.java
index 890e9a22a40..4a71c751481 100644
--- a/java/test/Ice/location/HelloI.java
+++ b/java/test/Ice/location/HelloI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class HelloI extends _HelloDisp
{
public void
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index 4d81ef38d56..bfd370aeb84 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/Ice/location/ServerLocator.java
index f43f1401dfb..a9c8b5920a8 100644
--- a/java/test/Ice/location/ServerLocator.java
+++ b/java/test/Ice/location/ServerLocator.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class ServerLocator extends Ice._LocatorDisp
{
public
diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/Ice/location/ServerLocatorRegistry.java
index 170bfb3df84..016c8e88854 100644
--- a/java/test/Ice/location/ServerLocatorRegistry.java
+++ b/java/test/Ice/location/ServerLocatorRegistry.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class ServerLocatorRegistry extends Ice._LocatorRegistryDisp
{
public void
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java
index 0398e62d1e0..0cc460c8c7d 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/Ice/location/ServerManagerI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class ServerManagerI extends _ServerManagerDisp
{
ServerManagerI(Ice.ObjectAdapter adapter)
diff --git a/java/test/Ice/location/Test.ice b/java/test/Ice/location/Test.ice
index ae2549eda42..df89980dfa3 100644
--- a/java/test/Ice/location/Test.ice
+++ b/java/test/Ice/location/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java
index 97a6ff15e3d..0154bd33c84 100644
--- a/java/test/Ice/location/TestI.java
+++ b/java/test/Ice/location/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class TestI extends _TestDisp
{
TestI(Ice.ObjectAdapter adapter)
diff --git a/java/test/Ice/location/build.xml b/java/test/Ice/location/build.xml
index 058a1dbf335..c8f3bd9c15f 100644
--- a/java/test/Ice/location/build.xml
+++ b/java/test/Ice/location/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_location" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py
index d8dbb928fa3..9199a748598 100755
--- a/java/test/Ice/location/run.py
+++ b/java/test/Ice/location/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java
index 261274df596..f76e15e27cf 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/Ice/objects/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/objects/BI.java b/java/test/Ice/objects/BI.java
index 96b9ec7bccd..a48bcb95686 100644
--- a/java/test/Ice/objects/BI.java
+++ b/java/test/Ice/objects/BI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class BI extends B
{
public
diff --git a/java/test/Ice/objects/CI.java b/java/test/Ice/objects/CI.java
index 6b9133a6a54..434b1e0841a 100644
--- a/java/test/Ice/objects/CI.java
+++ b/java/test/Ice/objects/CI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class CI extends C
{
public
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index b44c3ffe7ea..da98b117697 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static class MyObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index 60420128eb5..81683746af1 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
private static int
diff --git a/java/test/Ice/objects/DI.java b/java/test/Ice/objects/DI.java
index 6fd27eded4d..a1607e9d3f2 100644
--- a/java/test/Ice/objects/DI.java
+++ b/java/test/Ice/objects/DI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class DI extends D
{
public
diff --git a/java/test/Ice/objects/InitialI.java b/java/test/Ice/objects/InitialI.java
index cb1f23e64e3..886df7ee8ec 100644
--- a/java/test/Ice/objects/InitialI.java
+++ b/java/test/Ice/objects/InitialI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class InitialI extends Initial
{
public
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 5a9492c6fa0..5434755389f 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/objects/Test.ice b/java/test/Ice/objects/Test.ice
index 14051f2ab39..5e2c75bca60 100644
--- a/java/test/Ice/objects/Test.ice
+++ b/java/test/Ice/objects/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/objects/build.xml b/java/test/Ice/objects/build.xml
index 628e8aa178f..728fea8a699 100644
--- a/java/test/Ice/objects/build.xml
+++ b/java/test/Ice/objects/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_objects" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py
index 81cc8b47b8e..d8cc4eddfa4 100755
--- a/java/test/Ice/objects/run.py
+++ b/java/test/Ice/objects/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index 5fd0cf03cb8..82e9f7323c7 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 3e228ea245d..07a76b16955 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index baa09ed9b8b..7ba8c80f29e 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Collocated
{
private static int
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 50d140646e5..5ba14c9a12f 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class MyDerivedClassI extends Test.MyDerivedClass
{
public
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index 89d7270e981..dfcf65ae9a4 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/operations/Test.ice b/java/test/Ice/operations/Test.ice
index ad1940d4577..0910350a530 100644
--- a/java/test/Ice/operations/Test.ice
+++ b/java/test/Ice/operations/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index 2a8d56b4659..95a8416a0dd 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class Twoways
{
private static void
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index 6fa68246494..2cf611b63a9 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
class TwowaysAMI
{
private static void
diff --git a/java/test/Ice/operations/build.xml b/java/test/Ice/operations/build.xml
index a7e22bcd5f8..b8906a83f07 100644
--- a/java/test/Ice/operations/build.xml
+++ b/java/test/Ice/operations/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_operations" default="all" basedir=".">
<!-- get access to env variables globally -->
diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py
index 090778df046..e952a9dda9d 100755
--- a/java/test/Ice/operations/run.py
+++ b/java/test/Ice/operations/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/operationsAMD/MyDerivedClassI.java b/java/test/Ice/operationsAMD/MyDerivedClassI.java
index 78432764648..0fe90e77057 100644
--- a/java/test/Ice/operationsAMD/MyDerivedClassI.java
+++ b/java/test/Ice/operationsAMD/MyDerivedClassI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class MyDerivedClassI extends Test.MyDerivedClass
{
static class Thread_opVoid extends Thread
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index 89d7270e981..dfcf65ae9a4 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/operationsAMD/TestAMD.ice b/java/test/Ice/operationsAMD/TestAMD.ice
index b157f9613b0..31593f263a8 100644
--- a/java/test/Ice/operationsAMD/TestAMD.ice
+++ b/java/test/Ice/operationsAMD/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/java/test/Ice/operationsAMD/build.xml b/java/test/Ice/operationsAMD/build.xml
index 841ef4c01c7..7f15ed0e045 100644
--- a/java/test/Ice/operationsAMD/build.xml
+++ b/java/test/Ice/operationsAMD/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_operations" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/slicing/build.xml b/java/test/Ice/slicing/build.xml
index 892c9a7d1ce..13b87d98146 100644
--- a/java/test/Ice/slicing/build.xml
+++ b/java/test/Ice/slicing/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_slicing" default="all" basedir=".">
<target name="all">
diff --git a/java/test/Ice/slicing/exceptions/Test.ice b/java/test/Ice/slicing/exceptions/Test.ice
index cb42aa4d87c..d2543d47aac 100644
--- a/java/test/Ice/slicing/exceptions/Test.ice
+++ b/java/test/Ice/slicing/exceptions/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/slicing/exceptions/build.xml b/java/test/Ice/slicing/exceptions/build.xml
index 9938aa1f3c4..c3ef0513f53 100644
--- a/java/test/Ice/slicing/exceptions/build.xml
+++ b/java/test/Ice/slicing/exceptions/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_slicing_objects" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/slicing/exceptions/csrc/AllTests.java b/java/test/Ice/slicing/exceptions/csrc/AllTests.java
index db5758944cf..cbf23707893 100644
--- a/java/test/Ice/slicing/exceptions/csrc/AllTests.java
+++ b/java/test/Ice/slicing/exceptions/csrc/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/slicing/exceptions/csrc/Client.java b/java/test/Ice/slicing/exceptions/csrc/Client.java
index 4c1e80e9947..3563ee2688c 100644
--- a/java/test/Ice/slicing/exceptions/csrc/Client.java
+++ b/java/test/Ice/slicing/exceptions/csrc/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py
index bac054b7e48..543d6c7e899 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/Ice/slicing/exceptions/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/slicing/exceptions/ssrc/Server.java b/java/test/Ice/slicing/exceptions/ssrc/Server.java
index 6402c74685f..18800e9be55 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/Server.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice
index ea486910461..343dbce5f88 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice
+++ b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_ICE
#define SERVERPRIVATE_ICE
diff --git a/java/test/Ice/slicing/exceptions/ssrc/TestI.java b/java/test/Ice/slicing/exceptions/ssrc/TestI.java
index 975194642d3..8223a078a47 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/TestI.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends _TestDisp
{
public
diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java
index 6402c74685f..18800e9be55 100644
--- a/java/test/Ice/slicing/exceptionsAMD/Server.java
+++ b/java/test/Ice/slicing/exceptionsAMD/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice
index 074b2b474b8..dc702e822c2 100644
--- a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice
+++ b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_AMD_ICE
#define SERVERPRIVATE_AMD_ICE
diff --git a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice
index f8dec1fd04e..4cce716566c 100644
--- a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice
+++ b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/java/test/Ice/slicing/exceptionsAMD/TestI.java b/java/test/Ice/slicing/exceptionsAMD/TestI.java
index 35b4f6aae4d..be6891a09cc 100644
--- a/java/test/Ice/slicing/exceptionsAMD/TestI.java
+++ b/java/test/Ice/slicing/exceptionsAMD/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends _TestDisp
{
public
diff --git a/java/test/Ice/slicing/exceptionsAMD/build.xml b/java/test/Ice/slicing/exceptionsAMD/build.xml
index e298857452a..d934c5b93bb 100644
--- a/java/test/Ice/slicing/exceptionsAMD/build.xml
+++ b/java/test/Ice/slicing/exceptionsAMD/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_slicing_exceptionsAMD" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/slicing/objects/Forward.ice b/java/test/Ice/slicing/objects/Forward.ice
index bcf3c459f62..4db43058410 100644
--- a/java/test/Ice/slicing/objects/Forward.ice
+++ b/java/test/Ice/slicing/objects/Forward.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FORWARD_ICE
#define FORWARD_ICE
diff --git a/java/test/Ice/slicing/objects/Test.ice b/java/test/Ice/slicing/objects/Test.ice
index a3344a46474..a20f048ad34 100644
--- a/java/test/Ice/slicing/objects/Test.ice
+++ b/java/test/Ice/slicing/objects/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/Ice/slicing/objects/build.xml b/java/test/Ice/slicing/objects/build.xml
index d739aa0ac87..6770ae48940 100644
--- a/java/test/Ice/slicing/objects/build.xml
+++ b/java/test/Ice/slicing/objects/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_slicing_objects" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/slicing/objects/csrc/AllTests.java b/java/test/Ice/slicing/objects/csrc/AllTests.java
index 1e481761720..7b52736aca8 100644
--- a/java/test/Ice/slicing/objects/csrc/AllTests.java
+++ b/java/test/Ice/slicing/objects/csrc/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/Ice/slicing/objects/csrc/Client.java b/java/test/Ice/slicing/objects/csrc/Client.java
index 4c1e80e9947..3563ee2688c 100644
--- a/java/test/Ice/slicing/objects/csrc/Client.java
+++ b/java/test/Ice/slicing/objects/csrc/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice
index 75c0f12c9a5..7e583dfe238 100644
--- a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice
+++ b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef CLIENTPRIVATE_ICE
#define CLIENTPRIVATE_ICE
diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py
index 3967c0467e7..dbbcff3b061 100755
--- a/java/test/Ice/slicing/objects/run.py
+++ b/java/test/Ice/slicing/objects/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/Ice/slicing/objects/ssrc/Server.java b/java/test/Ice/slicing/objects/ssrc/Server.java
index 6402c74685f..18800e9be55 100644
--- a/java/test/Ice/slicing/objects/ssrc/Server.java
+++ b/java/test/Ice/slicing/objects/ssrc/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice
index 80b6447e5c4..d0ebdefbe16 100644
--- a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice
+++ b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_ICE
#define SERVERPRIVATE_ICE
diff --git a/java/test/Ice/slicing/objects/ssrc/TestI.java b/java/test/Ice/slicing/objects/ssrc/TestI.java
index 49779a26d98..bb880ebcbde 100644
--- a/java/test/Ice/slicing/objects/ssrc/TestI.java
+++ b/java/test/Ice/slicing/objects/ssrc/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends _TestDisp
{
public
diff --git a/java/test/Ice/slicing/objectsAMD/Forward.ice b/java/test/Ice/slicing/objectsAMD/Forward.ice
index bcf3c459f62..4db43058410 100644
--- a/java/test/Ice/slicing/objectsAMD/Forward.ice
+++ b/java/test/Ice/slicing/objectsAMD/Forward.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef FORWARD_ICE
#define FORWARD_ICE
diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java
index 6402c74685f..18800e9be55 100644
--- a/java/test/Ice/slicing/objectsAMD/Server.java
+++ b/java/test/Ice/slicing/objectsAMD/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server
{
private static int
diff --git a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice
index b59df25fa0e..d385e2849f0 100644
--- a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice
+++ b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef SERVERPRIVATE_AMD_ICE
#define SERVERPRIVATE_AMD_ICE
diff --git a/java/test/Ice/slicing/objectsAMD/TestAMD.ice b/java/test/Ice/slicing/objectsAMD/TestAMD.ice
index 999b3cf7d04..c4815a7cdaf 100644
--- a/java/test/Ice/slicing/objectsAMD/TestAMD.ice
+++ b/java/test/Ice/slicing/objectsAMD/TestAMD.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_AMD_ICE
#define TEST_AMD_ICE
diff --git a/java/test/Ice/slicing/objectsAMD/TestI.java b/java/test/Ice/slicing/objectsAMD/TestI.java
index c56abf90dd3..8073873ea78 100644
--- a/java/test/Ice/slicing/objectsAMD/TestI.java
+++ b/java/test/Ice/slicing/objectsAMD/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public final class TestI extends _TestDisp
{
public
diff --git a/java/test/Ice/slicing/objectsAMD/build.xml b/java/test/Ice/slicing/objectsAMD/build.xml
index 77187c6ff0e..d1c266a67a2 100644
--- a/java/test/Ice/slicing/objectsAMD/build.xml
+++ b/java/test/Ice/slicing/objectsAMD/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_slicing_exceptionsAMD" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/Ice/translator/DoubleModuleNoPackage.ice b/java/test/Ice/translator/DoubleModuleNoPackage.ice
index 24eca3db202..723b35f9696 100644
--- a/java/test/Ice/translator/DoubleModuleNoPackage.ice
+++ b/java/test/Ice/translator/DoubleModuleNoPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// dmnp = double module no package
module M1
diff --git a/java/test/Ice/translator/DoubleModuleWithPackage.ice b/java/test/Ice/translator/DoubleModuleWithPackage.ice
index e2a749f7950..5a7df201832 100644
--- a/java/test/Ice/translator/DoubleModuleWithPackage.ice
+++ b/java/test/Ice/translator/DoubleModuleWithPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// dmwp = double module with package
[["java:package:dmwp"]]
diff --git a/java/test/Ice/translator/NoModuleNoPackage.ice b/java/test/Ice/translator/NoModuleNoPackage.ice
index ad6e885bcfe..1cf3fc36798 100644
--- a/java/test/Ice/translator/NoModuleNoPackage.ice
+++ b/java/test/Ice/translator/NoModuleNoPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// nmnp = no module no package
enum nmnpEnum { nmnpE1, nmnpE2 };
diff --git a/java/test/Ice/translator/NoModuleWithPackage.ice b/java/test/Ice/translator/NoModuleWithPackage.ice
index 3cb73ed4cad..d590aa739e5 100644
--- a/java/test/Ice/translator/NoModuleWithPackage.ice
+++ b/java/test/Ice/translator/NoModuleWithPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// nmwp = no module with package
[["java:package:nmwp"]]
diff --git a/java/test/Ice/translator/SingleModuleNoPackage.ice b/java/test/Ice/translator/SingleModuleNoPackage.ice
index b0c80cd5912..c1dc3433ff7 100644
--- a/java/test/Ice/translator/SingleModuleNoPackage.ice
+++ b/java/test/Ice/translator/SingleModuleNoPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// smnp = single module no package
module M
diff --git a/java/test/Ice/translator/SingleModuleWithPackage.ice b/java/test/Ice/translator/SingleModuleWithPackage.ice
index 15f626164de..23c103125bf 100644
--- a/java/test/Ice/translator/SingleModuleWithPackage.ice
+++ b/java/test/Ice/translator/SingleModuleWithPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// smwp = single module with package
[["java:package:smwp"]]
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice
index 2230efd3eb2..15ac9621717 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from top-level definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice
index 8296b223812..76bf79a9ccb 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from package definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice
index 1f5a9218448..a61e2d85cc6 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from (different) single module definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice
index 536cd1091d5..e1ae41f3fa9 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from (same) single module definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice
index 388ef40c8a6..89a92192ac9 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from (different) double module definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice
index 32118966995..2c2e60bd5db 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from (same) double module definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice
index 65483b77191..d2a8c4cd5d3 100644
--- a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice
+++ b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleNoPackage types from (same) double module with package definitions
#include <DoubleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice
index aea9ce11eaa..bba2776fd88 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from top-level definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice
index eab5b259437..62843ec4d67 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) double module with (different) package definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice
index cfa853219a9..4f493ce6149 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) double module with (same) package definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice
index 79897a102b6..bc5aace0000 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (different) package definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice
index 0aeab887e11..beec08a6270 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) package definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice
index ab6a36fdfeb..7ad92bba2cc 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (different) single module definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice
index c2782a201b8..e494fc678bc 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) single module definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice
index 8d3322d559e..0d44e887be9 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) single module with (different) package definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice
index 3684ccf9b45..330b6965cb8 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) single module with (same) package definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice
index 3c7024b610a..93a270b066b 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (different) double module definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice
index 4e643eba7b7..9edaf560cbe 100644
--- a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice
+++ b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use DoubleModuleWithPackage types from (same) double module definitions
#include <DoubleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleNoPackage.ice b/java/test/Ice/translator/TestNoModuleNoPackage.ice
index f5ac8d57705..562377a340c 100644
--- a/java/test/Ice/translator/TestNoModuleNoPackage.ice
+++ b/java/test/Ice/translator/TestNoModuleNoPackage.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleNoPackage types from top-level definitions. Note that
// we can *only* test from top-level definitions, because it's not possible
// to refer to top-level Java classes from within packaged types.
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage1.ice b/java/test/Ice/translator/TestNoModuleWithPackage1.ice
index 3296b74be11..b9c77eefe25 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage1.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage1.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from top-level definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage2.ice b/java/test/Ice/translator/TestNoModuleWithPackage2.ice
index daf0936a2f3..8b4afe434a0 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage2.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage2.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from (different) package definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage3.ice b/java/test/Ice/translator/TestNoModuleWithPackage3.ice
index acee226f43c..cd9f41eb3d6 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage3.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage3.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from (same) package definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage4.ice b/java/test/Ice/translator/TestNoModuleWithPackage4.ice
index c5da23e9670..b6fa4ceca4c 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage4.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage4.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from single module definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage5.ice b/java/test/Ice/translator/TestNoModuleWithPackage5.ice
index 19bee872cee..13e48377445 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage5.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage5.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from double module definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage6.ice b/java/test/Ice/translator/TestNoModuleWithPackage6.ice
index 905115ba8a0..90c9134dd09 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage6.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage6.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from single module with (different) package definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage7.ice b/java/test/Ice/translator/TestNoModuleWithPackage7.ice
index dfa0d6b0cf0..01d0c5b122f 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage7.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage7.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from single module with (same) package definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage8.ice b/java/test/Ice/translator/TestNoModuleWithPackage8.ice
index 545574e43d9..369e4c69682 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage8.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage8.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from double module with (different) package definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestNoModuleWithPackage9.ice b/java/test/Ice/translator/TestNoModuleWithPackage9.ice
index 4f715cdab3d..f9b77caa9df 100644
--- a/java/test/Ice/translator/TestNoModuleWithPackage9.ice
+++ b/java/test/Ice/translator/TestNoModuleWithPackage9.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use NoModuleWithPackage types from double module with (same) package definitions
#include <NoModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice
index b6be3ebce70..a775f6bb35b 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from top-level definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice
index ede9e651613..9bd34021425 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from package definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice
index 31f6e6da3f0..2876dd2190f 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from (different) single module definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice
index f468da16f9d..77ee74a2c5f 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from (same) single module definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice
index 61dd9bb5307..3fb729c12c4 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from (same) single module with package definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice
index 5bc263d849d..c069b058ce8 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from (different) double module definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice
index 7c8ff3841b2..718d13caa84 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from (same) double module definitions
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice
index 4e54cb250d1..56911ab6520 100644
--- a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice
+++ b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleNoPackage types from (same) double module definitions with package
#include <SingleModuleNoPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice
index 8a2c4382649..a71db34273f 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from top-level definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice
index 5ae7b709bbe..6c3e5381d00 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (same) double module definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice
index 61cce5bbda9..3716c351814 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) double module with (different) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice
index ca11896ab1d..3409d165a1b 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) double module with (same) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice
index 0d132e11852..9dc14073bb9 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (same) double module with (same) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice
index fce6e388a52..d0ef349deae 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice
index 7caa8da5f1d..42644543b34 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (same) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice
index f488f58691d..ad23903e285 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) single module definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice
index 42bd39ac9e7..5714863b1a8 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (same) single module definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice
index 6b39002090a..854195a6a96 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) single module with (different) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice
index c15f34b77be..a224b1b368f 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) single module with (same) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice
index 1c49d76f6c4..e5798fe8b0a 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (same) single module with (same) package definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice
index d49cc89a297..e3a735ae984 100644
--- a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice
+++ b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
// Test: use SingleModuleWithPackage types from (different) double module definitions
#include <SingleModuleWithPackage.ice>
diff --git a/java/test/Ice/translator/build.xml b/java/test/Ice/translator/build.xml
index 9efd92bb086..5469f916621 100644
--- a/java/test/Ice/translator/build.xml
+++ b/java/test/Ice/translator/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_Ice_translator" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/IcePack/build.xml b/java/test/IcePack/build.xml
index 93f433fecd6..358bf01b317 100644
--- a/java/test/IcePack/build.xml
+++ b/java/test/IcePack/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_IcePack" default="all" basedir=".">
<target name="all">
diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java
index 3e604c68d19..32085d8764c 100644
--- a/java/test/IcePack/deployer/AllTests.java
+++ b/java/test/IcePack/deployer/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/IcePack/deployer/Client.java b/java/test/IcePack/deployer/Client.java
index f74c78c0936..fec8c602c0c 100644
--- a/java/test/IcePack/deployer/Client.java
+++ b/java/test/IcePack/deployer/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/IcePack/deployer/FreezeService.java b/java/test/IcePack/deployer/FreezeService.java
index 2d61fc06a36..6e18a4b8376 100644
--- a/java/test/IcePack/deployer/FreezeService.java
+++ b/java/test/IcePack/deployer/FreezeService.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class FreezeService extends Ice.LocalObjectImpl implements IceBox.FreezeService
{
public void
diff --git a/java/test/IcePack/deployer/Server.java b/java/test/IcePack/deployer/Server.java
index 83b87cb8442..ff8c39a0a0b 100644
--- a/java/test/IcePack/deployer/Server.java
+++ b/java/test/IcePack/deployer/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server extends Ice.Application
{
public int
diff --git a/java/test/IcePack/deployer/Service.java b/java/test/IcePack/deployer/Service.java
index 47804503520..c63af18de8f 100644
--- a/java/test/IcePack/deployer/Service.java
+++ b/java/test/IcePack/deployer/Service.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Service extends Ice.LocalObjectImpl implements IceBox.Service
{
public void
diff --git a/java/test/IcePack/deployer/Test.ice b/java/test/IcePack/deployer/Test.ice
index 3e5dc716f94..19578e1c328 100644
--- a/java/test/IcePack/deployer/Test.ice
+++ b/java/test/IcePack/deployer/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/IcePack/deployer/TestI.java b/java/test/IcePack/deployer/TestI.java
index a2cb4904c36..074830757ae 100644
--- a/java/test/IcePack/deployer/TestI.java
+++ b/java/test/IcePack/deployer/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class TestI extends _TestDisp
{
public
diff --git a/java/test/IcePack/deployer/build.xml b/java/test/IcePack/deployer/build.xml
index ef02228e196..ce3236f5dbf 100644
--- a/java/test/IcePack/deployer/build.xml
+++ b/java/test/IcePack/deployer/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_IcePack_deployer" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/IcePack/deployer/run.py b/java/test/IcePack/deployer/run.py
index ac7e523c117..d7d5609ee20 100755
--- a/java/test/IcePack/deployer/run.py
+++ b/java/test/IcePack/deployer/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/IcePack/simple/AllTests.java b/java/test/IcePack/simple/AllTests.java
index df074a0f4ec..b3a3ab836b2 100644
--- a/java/test/IcePack/simple/AllTests.java
+++ b/java/test/IcePack/simple/AllTests.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class AllTests
{
private static void
diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java
index 2ec0cfa913d..e5848a3eb43 100644
--- a/java/test/IcePack/simple/Client.java
+++ b/java/test/IcePack/simple/Client.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Client
{
private static int
diff --git a/java/test/IcePack/simple/Server.java b/java/test/IcePack/simple/Server.java
index 7200f40043d..d42df4080d5 100644
--- a/java/test/IcePack/simple/Server.java
+++ b/java/test/IcePack/simple/Server.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class Server extends Ice.Application
{
public int
diff --git a/java/test/IcePack/simple/Test.ice b/java/test/IcePack/simple/Test.ice
index b2485b59317..65fe5377ad3 100644
--- a/java/test/IcePack/simple/Test.ice
+++ b/java/test/IcePack/simple/Test.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
#ifndef TEST_ICE
#define TEST_ICE
diff --git a/java/test/IcePack/simple/TestI.java b/java/test/IcePack/simple/TestI.java
index d11f4f50884..512f105b120 100644
--- a/java/test/IcePack/simple/TestI.java
+++ b/java/test/IcePack/simple/TestI.java
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
//
// All Rights Reserved.
//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
+
public class TestI extends _TestDisp
{
public
diff --git a/java/test/IcePack/simple/build.xml b/java/test/IcePack/simple/build.xml
index 94d1408c7e7..13eee488eb5 100644
--- a/java/test/IcePack/simple/build.xml
+++ b/java/test/IcePack/simple/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test_IcePack_simple" default="all" basedir=".">
<!-- set global properties for this build -->
diff --git a/java/test/IcePack/simple/run.py b/java/test/IcePack/simple/run.py
index a45ffd9a50f..e25b2b50059 100755
--- a/java/test/IcePack/simple/run.py
+++ b/java/test/IcePack/simple/run.py
@@ -1,18 +1,18 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
# ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
#
# All Rights Reserved.
#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
import os, sys
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/java/test/build.xml b/java/test/build.xml
index 889d9dbaf8c..dbbfce57f4b 100644
--- a/java/test/build.xml
+++ b/java/test/build.xml
@@ -1,16 +1,18 @@
<!--
+ **********************************************************************
-Copyright (c) 2003
-ZeroC, Inc.
-Billerica, MA, USA
+ Copyright (c) 2003 - 2004
+ ZeroC, Inc.
+ North Palm Beach, FL, USA
-All Rights Reserved.
+ All Rights Reserved.
-Ice is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
+ This copy of Ice is licensed to you under the terms described in the
+ ICE_LICENSE file included in this distribution.
+ **********************************************************************
-->
+
<project name="test" default="all" basedir=".">
<target name="all">