diff options
1501 files changed, 1720 insertions, 8899 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 296d8a21a73..67147e90b35 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = . include $(top_srcdir)/config/Make.rules diff --git a/cpp/allTests.py b/cpp/allTests.py index 4571f3e5d93..c0b6389b652 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 d35d0e9ea03..145bb4bc261 100644 --- a/cpp/config/IcePackAdmin.py +++ b/cpp/config/IcePackAdmin.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 161f1f0bd69..2253e351d35 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 80d6f5cb466..043978a323b 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 c070aee709c..f33eb704b68 100644 --- a/cpp/config/Make.rules.FreeBSD +++ b/cpp/config/Make.rules.FreeBSD @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 5228e3de2e6..de5c871e557 100644 --- a/cpp/config/Make.rules.HP-UX +++ b/cpp/config/Make.rules.HP-UX @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 e026c735cd8..1605e3a483b 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 f2be3e5dc2a..c250196058f 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 cb598403418..70cabe91546 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 18a45b0adb4..bbf33091747 100755 --- a/cpp/config/makedepend.py +++ b/cpp/config/makedepend.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 5ed12a2038d..f900c84fd75 100644 --- a/cpp/demo/Freeze/Makefile +++ b/cpp/demo/Freeze/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp index 8e927eda27f..5baa5477ee1 100644 --- a/cpp/demo/Freeze/backup/Client.cpp +++ b/cpp/demo/Freeze/backup/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 faee7ad17a3..8bfa27f1f50 100644 --- a/cpp/demo/Freeze/backup/Makefile +++ b/cpp/demo/Freeze/backup/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 3fdab602785..156a0b52bd5 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 44da66ee36b..c45861c9b42 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice index d32b95cb2f9..40dfef6a96e 100644 --- a/cpp/demo/Freeze/bench/Test.ice +++ b/cpp/demo/Freeze/bench/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 55db8e07182..d591fc6fa43 100644 --- a/cpp/demo/Freeze/library/BookFactory.cpp +++ b/cpp/demo/Freeze/library/BookFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <BookFactory.h> using namespace std; diff --git a/cpp/demo/Freeze/library/BookFactory.h b/cpp/demo/Freeze/library/BookFactory.h index 1730ab61862..11226b6c457 100644 --- a/cpp/demo/Freeze/library/BookFactory.h +++ b/cpp/demo/Freeze/library/BookFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 BOOK_FACTORY_H #define BOOK_FACTORY_H diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp index c70e171dcc5..c004078a30c 100644 --- a/cpp/demo/Freeze/library/Client.cpp +++ b/cpp/demo/Freeze/library/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp index 06b7745156f..515a4a09497 100644 --- a/cpp/demo/Freeze/library/Collocated.cpp +++ b/cpp/demo/Freeze/library/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e3c9346149f..ac784a7e854 100644 --- a/cpp/demo/Freeze/library/Grammar.y +++ b/cpp/demo/Freeze/library/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice index e437c235493..915aa6bff4c 100644 --- a/cpp/demo/Freeze/library/Library.ice +++ b/cpp/demo/Freeze/library/Library.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LIBRARY_ICE #define LIBRARY_ICE diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp index 1ed4bce7d9c..72fe7615165 100644 --- a/cpp/demo/Freeze/library/LibraryI.cpp +++ b/cpp/demo/Freeze/library/LibraryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Freeze/Freeze.h> #include <LibraryI.h> diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h index 2a51f77c168..5eb2c8c34d6 100644 --- a/cpp/demo/Freeze/library/LibraryI.h +++ b/cpp/demo/Freeze/library/LibraryI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LIBRARY_I_H #define LIBRARY_I_H diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile index 96ad95996ed..7024d7723bd 100644 --- a/cpp/demo/Freeze/library/Makefile +++ b/cpp/demo/Freeze/library/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp index 8028e306a52..14cce4c9550 100644 --- a/cpp/demo/Freeze/library/Parser.cpp +++ b/cpp/demo/Freeze/library/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h index a3650b9cd51..dbeb64016db 100644 --- a/cpp/demo/Freeze/library/Parser.h +++ b/cpp/demo/Freeze/library/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PARSER_H #define PARSER_H diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp index f7d1bbd5d55..25b938858df 100644 --- a/cpp/demo/Freeze/library/RunParser.cpp +++ b/cpp/demo/Freeze/library/RunParser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l index 96cbb62a4b3..0d896de41a1 100644 --- a/cpp/demo/Freeze/library/Scanner.l +++ b/cpp/demo/Freeze/library/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9d496a4c56a..859b2e9304d 100644 --- a/cpp/demo/Freeze/library/Server.cpp +++ b/cpp/demo/Freeze/library/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7b21c8a07f0..933c07117c0 100644 --- a/cpp/demo/Freeze/phonebook/Client.cpp +++ b/cpp/demo/Freeze/phonebook/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp index 1f98f3a1509..e73f717d15b 100644 --- a/cpp/demo/Freeze/phonebook/Collocated.cpp +++ b/cpp/demo/Freeze/phonebook/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a596a7872b2..40e0b3e8e9f 100644 --- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp +++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <ContactFactory.h> #include <PhoneBookI.h> diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.h b/cpp/demo/Freeze/phonebook/ContactFactory.h index f980052673a..508aa6da0a1 100644 --- a/cpp/demo/Freeze/phonebook/ContactFactory.h +++ b/cpp/demo/Freeze/phonebook/ContactFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CONTACT_FACTORY_H #define CONTACT_FACTORY_H diff --git a/cpp/demo/Freeze/phonebook/Grammar.y b/cpp/demo/Freeze/phonebook/Grammar.y index 7cbb21d2773..f3694a920d2 100644 --- a/cpp/demo/Freeze/phonebook/Grammar.y +++ b/cpp/demo/Freeze/phonebook/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index 23c805b7794..4d3809a6a48 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -1,18 +1,13 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp index 8bffb61f96f..b029e5e24f4 100644 --- a/cpp/demo/Freeze/phonebook/Parser.cpp +++ b/cpp/demo/Freeze/phonebook/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h index 34890d7f5f5..138524b1548 100644 --- a/cpp/demo/Freeze/phonebook/Parser.h +++ b/cpp/demo/Freeze/phonebook/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PARSER_H #define PARSER_H diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice index ddbe5fafb7b..06fc5a4b33a 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBook.ice +++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PHONE_BOOK_ICE #define PHONE_BOOK_ICE diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp index 23f62f2fcc7..1cb31d9fabf 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <PhoneBookI.h> #include <IceUtil/UUID.h> diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h index 4bae446e71e..66594a2efc8 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.h +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 5e5823194fe..96e227607ac 100644 --- a/cpp/demo/Freeze/phonebook/RunParser.cpp +++ b/cpp/demo/Freeze/phonebook/RunParser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Parser.h> diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l index de99029de14..d971abce6ac 100644 --- a/cpp/demo/Freeze/phonebook/Scanner.l +++ b/cpp/demo/Freeze/phonebook/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c65b1789a15..2a38062f77c 100644 --- a/cpp/demo/Freeze/phonebook/Server.cpp +++ b/cpp/demo/Freeze/phonebook/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <ContactFactory.h> #include <NameIndex.h> diff --git a/cpp/demo/Glacier/Makefile b/cpp/demo/Glacier/Makefile index 3bf586c1cbf..8bf6446d809 100644 --- a/cpp/demo/Glacier/Makefile +++ b/cpp/demo/Glacier/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp index dfd4d86fccd..038d996acdc 100644 --- a/cpp/demo/Glacier/session/Client.cpp +++ b/cpp/demo/Glacier/session/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 32f111b0783..250083428f5 100644 --- a/cpp/demo/Glacier/session/HelloSession.ice +++ b/cpp/demo/Glacier/session/HelloSession.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/Glacier/session/HelloSessionI.cpp b/cpp/demo/Glacier/session/HelloSessionI.cpp index 87adad827dc..10ac499c95e 100644 --- a/cpp/demo/Glacier/session/HelloSessionI.cpp +++ b/cpp/demo/Glacier/session/HelloSessionI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloSessionI.h> diff --git a/cpp/demo/Glacier/session/HelloSessionI.h b/cpp/demo/Glacier/session/HelloSessionI.h index 6365bf13e29..107d05d56df 100644 --- a/cpp/demo/Glacier/session/HelloSessionI.h +++ b/cpp/demo/Glacier/session/HelloSessionI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SESSION_I_H #define HELLO_SESSION_I_H diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile index 4268b607751..b159e5b6675 100644 --- a/cpp/demo/Glacier/session/Makefile +++ b/cpp/demo/Glacier/session/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Glacier/session/Server.cpp b/cpp/demo/Glacier/session/Server.cpp index 283d9a33af4..186e196bd13 100644 --- a/cpp/demo/Glacier/session/Server.cpp +++ b/cpp/demo/Glacier/session/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 882e96b8a55..10a98cc1ad3 100644 --- a/cpp/demo/Ice/MFC/client/Hello.ice +++ b/cpp/demo/Ice/MFC/client/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/Ice/MFC/client/HelloClient.cpp b/cpp/demo/Ice/MFC/client/HelloClient.cpp index cc7e46308c0..ad9a52a9aa1 100644 --- a/cpp/demo/Ice/MFC/client/HelloClient.cpp +++ b/cpp/demo/Ice/MFC/client/HelloClient.cpp @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/client/HelloClient.h b/cpp/demo/Ice/MFC/client/HelloClient.h index 46cac8a9d4e..c5c0cfc1d6c 100644 --- a/cpp/demo/Ice/MFC/client/HelloClient.h +++ b/cpp/demo/Ice/MFC/client/HelloClient.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp index b08986a3f3d..3ace6def467 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h index 75bc633b0c7..79da6aabdd0 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp index 0f0125b30f8..ed9647e3ec3 100644 --- a/cpp/demo/Ice/MFC/client/stdafx.cpp +++ b/cpp/demo/Ice/MFC/client/stdafx.cpp @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/client/stdafx.h b/cpp/demo/Ice/MFC/client/stdafx.h index 22c4a5ecac9..1fa9d8eeef8 100644 --- a/cpp/demo/Ice/MFC/client/stdafx.h +++ b/cpp/demo/Ice/MFC/client/stdafx.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice index 882e96b8a55..10a98cc1ad3 100644 --- a/cpp/demo/Ice/MFC/server/Hello.ice +++ b/cpp/demo/Ice/MFC/server/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/Ice/MFC/server/HelloI.cpp b/cpp/demo/Ice/MFC/server/HelloI.cpp index 2e43f383d68..9de5db12b3f 100644 --- a/cpp/demo/Ice/MFC/server/HelloI.cpp +++ b/cpp/demo/Ice/MFC/server/HelloI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <HelloI.h> diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h index 1361d688faf..6f577e43121 100644 --- a/cpp/demo/Ice/MFC/server/HelloI.h +++ b/cpp/demo/Ice/MFC/server/HelloI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 148d2538a57..039ef6ebad1 100644 --- a/cpp/demo/Ice/MFC/server/HelloServer.cpp +++ b/cpp/demo/Ice/MFC/server/HelloServer.cpp @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/HelloServer.h b/cpp/demo/Ice/MFC/server/HelloServer.h index 8451e9dc382..3642360d2e7 100644 --- a/cpp/demo/Ice/MFC/server/HelloServer.h +++ b/cpp/demo/Ice/MFC/server/HelloServer.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp index 2414737df43..620d6845bc2 100644 --- a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp +++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.h b/cpp/demo/Ice/MFC/server/HelloServerDlg.h index 5072d4efc04..101cb1007ed 100644 --- a/cpp/demo/Ice/MFC/server/HelloServerDlg.h +++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/LogI.cpp b/cpp/demo/Ice/MFC/server/LogI.cpp index ace1b31db96..f8aa79884f1 100644 --- a/cpp/demo/Ice/MFC/server/LogI.cpp +++ b/cpp/demo/Ice/MFC/server/LogI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 "LogI.h" diff --git a/cpp/demo/Ice/MFC/server/LogI.h b/cpp/demo/Ice/MFC/server/LogI.h index e769da7cb22..f6d3aae5138 100644 --- a/cpp/demo/Ice/MFC/server/LogI.h +++ b/cpp/demo/Ice/MFC/server/LogI.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/stdafx.cpp b/cpp/demo/Ice/MFC/server/stdafx.cpp index dd3111c0bce..6c1e0563de9 100644 --- a/cpp/demo/Ice/MFC/server/stdafx.cpp +++ b/cpp/demo/Ice/MFC/server/stdafx.cpp @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/MFC/server/stdafx.h b/cpp/demo/Ice/MFC/server/stdafx.h index 22c4a5ecac9..1fa9d8eeef8 100644 --- a/cpp/demo/Ice/MFC/server/stdafx.h +++ b/cpp/demo/Ice/MFC/server/stdafx.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/demo/Ice/Makefile b/cpp/demo/Ice/Makefile index cfe6268bbcd..85cbe7481d4 100644 --- a/cpp/demo/Ice/Makefile +++ b/cpp/demo/Ice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice index da64c2948e3..d275d358d91 100644 --- a/cpp/demo/Ice/callback/Callback.ice +++ b/cpp/demo/Ice/callback/Callback.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CALLBACK_ICE #define CALLBACK_ICE diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp index b9bdf2032bc..1e2fac27351 100644 --- a/cpp/demo/Ice/callback/CallbackI.cpp +++ b/cpp/demo/Ice/callback/CallbackI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <CallbackI.h> diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h index 1b3167c75e8..539ab05c588 100644 --- a/cpp/demo/Ice/callback/CallbackI.h +++ b/cpp/demo/Ice/callback/CallbackI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CALLBACK_I_H #define CALLBACK_I_H diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp index 0c1cc916cc0..9c575d49b82 100644 --- a/cpp/demo/Ice/callback/Client.cpp +++ b/cpp/demo/Ice/callback/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <CallbackI.h> diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile index 6df65ae3589..741861fe894 100644 --- a/cpp/demo/Ice/callback/Makefile +++ b/cpp/demo/Ice/callback/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp index 74be3ab32d2..1dbdb6d2d16 100644 --- a/cpp/demo/Ice/callback/Server.cpp +++ b/cpp/demo/Ice/callback/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <CallbackI.h> diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp index 1eddb644749..21de2c01d58 100644 --- a/cpp/demo/Ice/hello/Client.cpp +++ b/cpp/demo/Ice/hello/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Hello.h> diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice index 882e96b8a55..10a98cc1ad3 100644 --- a/cpp/demo/Ice/hello/Hello.ice +++ b/cpp/demo/Ice/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/Ice/hello/HelloI.cpp b/cpp/demo/Ice/hello/HelloI.cpp index 6f29d3b5332..dc529eaefa1 100644 --- a/cpp/demo/Ice/hello/HelloI.cpp +++ b/cpp/demo/Ice/hello/HelloI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloI.h> diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h index 12ed5ba1f9b..b3ca691c7e0 100644 --- a/cpp/demo/Ice/hello/HelloI.h +++ b/cpp/demo/Ice/hello/HelloI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_I_H #define HELLO_I_H diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile index 33ce7dc9504..70b3216fe0c 100644 --- a/cpp/demo/Ice/hello/Makefile +++ b/cpp/demo/Ice/hello/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp index de0870dd26c..7eebbe57a63 100644 --- a/cpp/demo/Ice/hello/Server.cpp +++ b/cpp/demo/Ice/hello/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloI.h> diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp index 97ba57bb900..39aaf20fef1 100644 --- a/cpp/demo/Ice/latency/Client.cpp +++ b/cpp/demo/Ice/latency/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Latency.h> diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice index b11e6cf4e94..04c9673ec48 100644 --- a/cpp/demo/Ice/latency/Latency.ice +++ b/cpp/demo/Ice/latency/Latency.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LATENCY_ICE #define LATENCY_ICE diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile index d615fc43246..0408ea341e3 100644 --- a/cpp/demo/Ice/latency/Makefile +++ b/cpp/demo/Ice/latency/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp index 1c3495ce1f9..97222dae998 100644 --- a/cpp/demo/Ice/latency/Server.cpp +++ b/cpp/demo/Ice/latency/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Latency.h> diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp index bc9f3d6e4ae..872c71436bc 100644 --- a/cpp/demo/Ice/nested/Client.cpp +++ b/cpp/demo/Ice/nested/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <NestedI.h> diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile index d6d3ce4c05b..20452cd3ccd 100644 --- a/cpp/demo/Ice/nested/Makefile +++ b/cpp/demo/Ice/nested/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice index e629bbe88d2..aaa52fd6780 100644 --- a/cpp/demo/Ice/nested/Nested.ice +++ b/cpp/demo/Ice/nested/Nested.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 NESTED_ICE #define NESTED_ICE diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp index a8c094e2f6c..55b84e6e370 100644 --- a/cpp/demo/Ice/nested/NestedI.cpp +++ b/cpp/demo/Ice/nested/NestedI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <NestedI.h> diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h index c2c91b4a4af..4ec81d2f9f0 100644 --- a/cpp/demo/Ice/nested/NestedI.h +++ b/cpp/demo/Ice/nested/NestedI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 NESTED_I_H #define NESTED_I_H diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp index 67b4f2f2b53..db59dc51956 100644 --- a/cpp/demo/Ice/nested/Server.cpp +++ b/cpp/demo/Ice/nested/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <NestedI.h> diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp index fda3b586a58..90eb5db671b 100644 --- a/cpp/demo/Ice/throughput/Client.cpp +++ b/cpp/demo/Ice/throughput/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Throughput.h> diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile index 26dbf057250..dde7eba7c39 100644 --- a/cpp/demo/Ice/throughput/Makefile +++ b/cpp/demo/Ice/throughput/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp index 3b1e23f1fe4..76b9e958eb0 100644 --- a/cpp/demo/Ice/throughput/Server.cpp +++ b/cpp/demo/Ice/throughput/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <ThroughputI.h> using namespace std; diff --git a/cpp/demo/Ice/throughput/Throughput.ice b/cpp/demo/Ice/throughput/Throughput.ice index 3b02a3861d9..20195e9924e 100644 --- a/cpp/demo/Ice/throughput/Throughput.ice +++ b/cpp/demo/Ice/throughput/Throughput.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 THROUGHPUT_ICE #define THROUGHPUT_ICE diff --git a/cpp/demo/Ice/throughput/ThroughputI.h b/cpp/demo/Ice/throughput/ThroughputI.h index f7d34ca5ee1..de7a31f69b8 100644 --- a/cpp/demo/Ice/throughput/ThroughputI.h +++ b/cpp/demo/Ice/throughput/ThroughputI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 THROUGHPUT_I_H #define THROUGHPUT_I_H diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp index e300c3933ca..510a7303d99 100644 --- a/cpp/demo/Ice/value/Client.cpp +++ b/cpp/demo/Ice/value/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Value.h> #include <ObjectFactory.h> diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile index 05bf1c2f0a8..4af94f03745 100644 --- a/cpp/demo/Ice/value/Makefile +++ b/cpp/demo/Ice/value/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp index 462cc1f0a39..bf2e6558178 100644 --- a/cpp/demo/Ice/value/ObjectFactory.cpp +++ b/cpp/demo/Ice/value/ObjectFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9cd2b21686d..6e1067947f5 100644 --- a/cpp/demo/Ice/value/ObjectFactory.h +++ b/cpp/demo/Ice/value/ObjectFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVANT_FACTORY_H #define SERVANT_FACTORY_H diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp index 62feea2ca91..6a501da8f66 100644 --- a/cpp/demo/Ice/value/Server.cpp +++ b/cpp/demo/Ice/value/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <ValueI.h> diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice index b4196a7bee3..b8f03f2448b 100644 --- a/cpp/demo/Ice/value/Value.ice +++ b/cpp/demo/Ice/value/Value.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 VALUE_ICE #define VALUE_ICE diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp index 782318aeb1c..80ff5b609bc 100644 --- a/cpp/demo/Ice/value/ValueI.cpp +++ b/cpp/demo/Ice/value/ValueI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <ValueI.h> diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h index 03007466407..3f656eb1297 100644 --- a/cpp/demo/Ice/value/ValueI.h +++ b/cpp/demo/Ice/value/ValueI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 VALUE_I_H #define VALUE_I_H diff --git a/cpp/demo/IceBox/Makefile b/cpp/demo/IceBox/Makefile index 1f9de301f04..288b840b6a2 100644 --- a/cpp/demo/IceBox/Makefile +++ b/cpp/demo/IceBox/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp index bac947faae7..f560d46c13e 100644 --- a/cpp/demo/IceBox/hello/Client.cpp +++ b/cpp/demo/IceBox/hello/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <Hello.h> diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice index 7fc2c380953..0ae5c36e63f 100644 --- a/cpp/demo/IceBox/hello/Hello.ice +++ b/cpp/demo/IceBox/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/IceBox/hello/HelloI.cpp b/cpp/demo/IceBox/hello/HelloI.cpp index 59b519fa825..01f2c8b2456 100644 --- a/cpp/demo/IceBox/hello/HelloI.cpp +++ b/cpp/demo/IceBox/hello/HelloI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloI.h> diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h index cbcb981cd84..ab98269ae92 100644 --- a/cpp/demo/IceBox/hello/HelloI.h +++ b/cpp/demo/IceBox/hello/HelloI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_I_H #define HELLO_I_H diff --git a/cpp/demo/IceBox/hello/HelloServiceI.cpp b/cpp/demo/IceBox/hello/HelloServiceI.cpp index 491e6333007..41ad5a8767d 100644 --- a/cpp/demo/IceBox/hello/HelloServiceI.cpp +++ b/cpp/demo/IceBox/hello/HelloServiceI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4a1773b497c..f2f125f506b 100644 --- a/cpp/demo/IceBox/hello/HelloServiceI.h +++ b/cpp/demo/IceBox/hello/HelloServiceI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SERVICE_I_H #define HELLO_SERVICE_I_H diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile index 5801d7731d2..1d71bc5575b 100644 --- a/cpp/demo/IceBox/hello/Makefile +++ b/cpp/demo/IceBox/hello/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/IcePack/Makefile b/cpp/demo/IcePack/Makefile index 2845533b65c..d4954def44c 100644 --- a/cpp/demo/IcePack/Makefile +++ b/cpp/demo/IcePack/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/IcePack/hello/Client.cpp b/cpp/demo/IcePack/hello/Client.cpp index 53477355ddf..a6f2f528276 100644 --- a/cpp/demo/IcePack/hello/Client.cpp +++ b/cpp/demo/IcePack/hello/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 97af57216f4..1fa498dd67c 100644 --- a/cpp/demo/IcePack/hello/Hello.ice +++ b/cpp/demo/IcePack/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/IcePack/hello/HelloI.cpp b/cpp/demo/IcePack/hello/HelloI.cpp index 3a159ec3257..fd8f88729a8 100644 --- a/cpp/demo/IcePack/hello/HelloI.cpp +++ b/cpp/demo/IcePack/hello/HelloI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 da4fbb0da0b..c0ac7c4ed40 100644 --- a/cpp/demo/IcePack/hello/HelloI.h +++ b/cpp/demo/IcePack/hello/HelloI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_I_H #define HELLO_I_H diff --git a/cpp/demo/IcePack/hello/HelloServiceI.cpp b/cpp/demo/IcePack/hello/HelloServiceI.cpp index 05ceca015d2..9321e8d418a 100644 --- a/cpp/demo/IcePack/hello/HelloServiceI.cpp +++ b/cpp/demo/IcePack/hello/HelloServiceI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 f7ac55fe62a..aec02bc2231 100644 --- a/cpp/demo/IcePack/hello/HelloServiceI.h +++ b/cpp/demo/IcePack/hello/HelloServiceI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SERVICE_I_H #define HELLO_SERVICE_I_H diff --git a/cpp/demo/IcePack/hello/Makefile b/cpp/demo/IcePack/hello/Makefile index f16e86f46ed..e703f282b61 100644 --- a/cpp/demo/IcePack/hello/Makefile +++ b/cpp/demo/IcePack/hello/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/IcePack/hello/Server.cpp b/cpp/demo/IcePack/hello/Server.cpp index 715d2ebec46..46b72b2b6f7 100644 --- a/cpp/demo/IcePack/hello/Server.cpp +++ b/cpp/demo/IcePack/hello/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloI.h> diff --git a/cpp/demo/IcePack/simple/Client.cpp b/cpp/demo/IcePack/simple/Client.cpp index 0fbb8ce7a54..4eebb81cc0d 100644 --- a/cpp/demo/IcePack/simple/Client.cpp +++ b/cpp/demo/IcePack/simple/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 882e96b8a55..10a98cc1ad3 100644 --- a/cpp/demo/IcePack/simple/Hello.ice +++ b/cpp/demo/IcePack/simple/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/cpp/demo/IcePack/simple/HelloI.cpp b/cpp/demo/IcePack/simple/HelloI.cpp index 6f29d3b5332..dc529eaefa1 100644 --- a/cpp/demo/IcePack/simple/HelloI.cpp +++ b/cpp/demo/IcePack/simple/HelloI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloI.h> diff --git a/cpp/demo/IcePack/simple/HelloI.h b/cpp/demo/IcePack/simple/HelloI.h index 12ed5ba1f9b..b3ca691c7e0 100644 --- a/cpp/demo/IcePack/simple/HelloI.h +++ b/cpp/demo/IcePack/simple/HelloI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_I_H #define HELLO_I_H diff --git a/cpp/demo/IcePack/simple/HelloServiceI.cpp b/cpp/demo/IcePack/simple/HelloServiceI.cpp index 7ce780a3009..23b342cf8fd 100644 --- a/cpp/demo/IcePack/simple/HelloServiceI.cpp +++ b/cpp/demo/IcePack/simple/HelloServiceI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4a1773b497c..f2f125f506b 100644 --- a/cpp/demo/IcePack/simple/HelloServiceI.h +++ b/cpp/demo/IcePack/simple/HelloServiceI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SERVICE_I_H #define HELLO_SERVICE_I_H diff --git a/cpp/demo/IcePack/simple/Makefile b/cpp/demo/IcePack/simple/Makefile index dae4fc28851..c4a8b16a16d 100644 --- a/cpp/demo/IcePack/simple/Makefile +++ b/cpp/demo/IcePack/simple/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/demo/IcePack/simple/Server.cpp b/cpp/demo/IcePack/simple/Server.cpp index dffcf6c4e77..c684dbea832 100644 --- a/cpp/demo/IcePack/simple/Server.cpp +++ b/cpp/demo/IcePack/simple/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <HelloI.h> diff --git a/cpp/demo/IceStorm/Makefile b/cpp/demo/IceStorm/Makefile index 20a6ef3fc3a..4d15be75b2e 100644 --- a/cpp/demo/IceStorm/Makefile +++ b/cpp/demo/IceStorm/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/IceStorm/clock/Clock.ice b/cpp/demo/IceStorm/clock/Clock.ice index 706a254640f..23710fdc4fd 100644 --- a/cpp/demo/IceStorm/clock/Clock.ice +++ b/cpp/demo/IceStorm/clock/Clock.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CLOCK_ICE #define CLOCK_ICE diff --git a/cpp/demo/IceStorm/clock/ClockI.cpp b/cpp/demo/IceStorm/clock/ClockI.cpp index 815b156788a..efc979bf5f5 100644 --- a/cpp/demo/IceStorm/clock/ClockI.cpp +++ b/cpp/demo/IceStorm/clock/ClockI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <ClockI.h> diff --git a/cpp/demo/IceStorm/clock/ClockI.h b/cpp/demo/IceStorm/clock/ClockI.h index 8b835daa8ec..3918b942a10 100644 --- a/cpp/demo/IceStorm/clock/ClockI.h +++ b/cpp/demo/IceStorm/clock/ClockI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CLOCK_I_H #define CLOCK_I_H diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile index d32f13231af..f3e1b836d45 100644 --- a/cpp/demo/IceStorm/clock/Makefile +++ b/cpp/demo/IceStorm/clock/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. PUBLISHER = publisher diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp index e942acc7528..9c358d87d99 100644 --- a/cpp/demo/IceStorm/clock/Publisher.cpp +++ b/cpp/demo/IceStorm/clock/Publisher.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <IceStorm/IceStorm.h> diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp index 855881f6534..2394b8d568e 100644 --- a/cpp/demo/IceStorm/clock/Subscriber.cpp +++ b/cpp/demo/IceStorm/clock/Subscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <IceStorm/IceStorm.h> #include <IceUtil/UUID.h> diff --git a/cpp/demo/IceUtil/Makefile b/cpp/demo/IceUtil/Makefile index f48d73d749b..2d1fa8e819b 100644 --- a/cpp/demo/IceUtil/Makefile +++ b/cpp/demo/IceUtil/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/demo/IceUtil/workqueue/Makefile b/cpp/demo/IceUtil/workqueue/Makefile index 306f78ec33d..a1d2aaa96d3 100644 --- a/cpp/demo/IceUtil/workqueue/Makefile +++ b/cpp/demo/IceUtil/workqueue/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = workqueue diff --git a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp index 2f0a0ac49c3..1735f49c055 100644 --- a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp +++ b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Thread.h> #include <IceUtil/Exception.h> #include <IceUtil/Monitor.h> diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile index 41c10fc7ce9..cf485ac199f 100644 --- a/cpp/demo/Makefile +++ b/cpp/demo/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = .. include $(top_srcdir)/config/Make.rules diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile index a0d9a426547..15242003a1c 100644 --- a/cpp/doc/Makefile +++ b/cpp/doc/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = .. TARGETS = manual/index.html diff --git a/cpp/doc/Properties.sgml b/cpp/doc/Properties.sgml index 3adb0dd7533..429e65cd394 100644 --- a/cpp/doc/Properties.sgml +++ b/cpp/doc/Properties.sgml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/cpp/doc/ProxiesEndpoints.sgml b/cpp/doc/ProxiesEndpoints.sgml index bdcb9c84d01..d4cd04ffc14 100644 --- a/cpp/doc/ProxiesEndpoints.sgml +++ b/cpp/doc/ProxiesEndpoints.sgml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/cpp/doc/manual.sgml b/cpp/doc/manual.sgml index d01990fd705..acea0342f69 100644 --- a/cpp/doc/manual.sgml +++ b/cpp/doc/manual.sgml @@ -19,11 +19,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/cpp/fixCopyright.py b/cpp/fixCopyright.py index c94aa47f48c..a4dd6720d02 100755 --- a/cpp/fixCopyright.py +++ b/cpp/fixCopyright.py @@ -22,15 +22,7 @@ def copyright(commentMark): result.append(commentMark) result.append("\n") result.append(commentMark) - result.append(" Copyright (c) 2003 - 2004\n") - result.append(commentMark) - result.append(" ZeroC, Inc.\n") - result.append(commentMark) - result.append(" North Palm Beach, FL, USA\n") - result.append(commentMark) - result.append("\n") - result.append(commentMark) - result.append(" All Rights Reserved.\n") + result.append(" Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n") result.append(commentMark) result.append("\n") result.append(commentMark) @@ -58,6 +50,8 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi beforeCopyrightLines = [] newLines = [] + justDone = 0 + if commentBegin == "": for x in oldLines: if not commentFound and not x.startswith(commentMark): @@ -68,8 +62,23 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi copyrightFound = 1 # skip this comment line else: - done = 1 - newLines.append(x) + if not done: + done = 1 + justDone = 1 + + # Eliminate double blank lines after copyright (bug introduced by previous fixCopyright script) + if justDone == 1: + newLines.append(x) + if x != "\n": + justDone = 0 + else: + justDone = 2 + elif justDone == 2: + if x != "\n": + newLines.append(x) + justDone = 0 + else: + newLines.append(x) else: for x in oldLines: @@ -83,10 +92,23 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi # skip this comment line if x.find(commentEnd) != -1: done = 1 + justDone = 1 else: beforeCopyrightLines.append(x) else: - newLines.append(x) + # Eliminate double blank lines after copyright (bug introduced by previous fixCopyright script) + if justDone == 1: + newLines.append(x) + if x != "\n": + justDone = 0 + else: + justDone = 2 + elif justDone == 2: + if x != "\n": + newLines.append(x) + justDone = 0 + else: + newLines.append(x) oldFile.close() @@ -102,8 +124,12 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi # # Hack to keep the .err files # - if fnmatch.fnmatch(file, "*test/Slice/errorDetection/*.ice") != -1: - newFile.write("\n") + if fnmatch.fnmatch(file, "*test/Slice/errorDetection/*.ice") > 0: + newFile.write("\n") + newFile.write("\n") + newFile.write("\n") + newFile.write("\n") + newFile.write("\n") newFile.writelines(newLines) newFile.close() diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h index 7c141d5269a..3bcf5677457 100644 --- a/cpp/include/Freeze/Freeze.h +++ b/cpp/include/Freeze/Freeze.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_FREEZE_H #define FREEZE_FREEZE_H diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h index c8c40478c4b..f26fec73751 100644 --- a/cpp/include/Freeze/Index.h +++ b/cpp/include/Freeze/Index.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_INDEX_H #define FREEZE_INDEX_H diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h index 507c1f5d22d..b09f0bca7ea 100644 --- a/cpp/include/Freeze/Initialize.h +++ b/cpp/include/Freeze/Initialize.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_INITIALIZE_H #define FREEZE_INITIALIZE_H diff --git a/cpp/include/Freeze/Makefile b/cpp/include/Freeze/Makefile index cf5a4660cb3..1e603262e97 100644 --- a/cpp/include/Freeze/Makefile +++ b/cpp/include/Freeze/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h index ce1648bb7d5..e4b06220647 100644 --- a/cpp/include/Freeze/Map.h +++ b/cpp/include/Freeze/Map.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_MAP_H #define FREEZE_MAP_H diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h index 0b3ffab9d97..55815aca32e 100644 --- a/cpp/include/Freeze/TransactionHolder.h +++ b/cpp/include/Freeze/TransactionHolder.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_HOLDER_H #define FREEZE_TRANSACTION_HOLDER_H diff --git a/cpp/include/Glacier/Glacier.h b/cpp/include/Glacier/Glacier.h index 5b452fa85b5..c7a31d33d47 100644 --- a/cpp/include/Glacier/Glacier.h +++ b/cpp/include/Glacier/Glacier.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_H #define GLACIER_H diff --git a/cpp/include/Glacier/Makefile b/cpp/include/Glacier/Makefile index 24ced4bd046..2c30a270ced 100644 --- a/cpp/include/Glacier/Makefile +++ b/cpp/include/Glacier/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index 43dbdbfa10d..708a2097176 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_APPLICATION_H #define ICE_APPLICATION_H diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index daf67c15080..21e67018d14 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STREAM_H #define ICE_STREAM_H diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h index 90868430396..64beb18dc56 100644 --- a/cpp/include/Ice/Buffer.h +++ b/cpp/include/Ice/Buffer.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_BUFFER_H #define ICE_BUFFER_H diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index 9fc932b9595..145d34ff4ca 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONFIG_H #define ICE_CONFIG_H diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h index a7bb0d2d582..94a385c8dc9 100644 --- a/cpp/include/Ice/ConnectionF.h +++ b/cpp/include/Ice/ConnectionF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONNECTION_F_H #define ICE_CONNECTION_F_H diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h index c9aba0a2d4b..c6951439a87 100644 --- a/cpp/include/Ice/ConnectionFactoryF.h +++ b/cpp/include/Ice/ConnectionFactoryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 f28b574d09a..081de20fb80 100644 --- a/cpp/include/Ice/ConnectionMonitorF.h +++ b/cpp/include/Ice/ConnectionMonitorF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 77129ba70bc..9d58f39fc64 100644 --- a/cpp/include/Ice/Direct.h +++ b/cpp/include/Ice/Direct.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_DIRECT_H #define ICE_DIRECT_H diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h index 688d8b9b628..8fa83c825ab 100644 --- a/cpp/include/Ice/DynamicLibrary.h +++ b/cpp/include/Ice/DynamicLibrary.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_DYNAMIC_LIBRARY_H #define ICE_DYNAMIC_LIBRARY_H diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h index da173c8a561..1b97e02359a 100644 --- a/cpp/include/Ice/DynamicLibraryF.h +++ b/cpp/include/Ice/DynamicLibraryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 63f6c1277e3..1b594d0dd7e 100644 --- a/cpp/include/Ice/EndpointF.h +++ b/cpp/include/Ice/EndpointF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ENDPOINT_F_H #define ICE_ENDPOINT_F_H diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h index a53bea7c494..145ef7b66e7 100644 --- a/cpp/include/Ice/EndpointFactory.h +++ b/cpp/include/Ice/EndpointFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ENDPOINT_FACTORY_H #define ICE_ENDPOINT_FACTORY_H diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h index 020bee6e1bc..12f023d4457 100644 --- a/cpp/include/Ice/EndpointFactoryF.h +++ b/cpp/include/Ice/EndpointFactoryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0fe6d9eddae..54f0986f627 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_EXCEPTION_H #define ICE_EXCEPTION_H diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h index cbb4eb5ebad..38261ecd909 100644 --- a/cpp/include/Ice/FactoryTable.h +++ b/cpp/include/Ice/FactoryTable.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_FACTORYTABLE_H #define ICE_FACTORYTABLE_H diff --git a/cpp/include/Ice/FactoryTableDef.h b/cpp/include/Ice/FactoryTableDef.h index 637360bbaaf..68287a10237 100644 --- a/cpp/include/Ice/FactoryTableDef.h +++ b/cpp/include/Ice/FactoryTableDef.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 7f1045e8813..44195e713fb 100644 --- a/cpp/include/Ice/Functional.h +++ b/cpp/include/Ice/Functional.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_FUNCTIONAL_H #define ICE_FUNCTIONAL_H diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h index c5fe59fe274..06557433e69 100644 --- a/cpp/include/Ice/Handle.h +++ b/cpp/include/Ice/Handle.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_HANDLE_H #define ICE_HANDLE_H diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index 490c3ce70b1..5ec4eff9b2d 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ICE_H #define ICE_ICE_H diff --git a/cpp/include/Ice/IdentityUtil.h b/cpp/include/Ice/IdentityUtil.h index ed864a33a05..8b3e020e1cc 100644 --- a/cpp/include/Ice/IdentityUtil.h +++ b/cpp/include/Ice/IdentityUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_IDENTITY_UTIL_H #define ICE_IDENTITY_UTIL_H diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h index ca95657b322..ae70cf8b59f 100644 --- a/cpp/include/Ice/Incoming.h +++ b/cpp/include/Ice/Incoming.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_INCOMING_H #define ICE_INCOMING_H diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h index b8dafb78df5..5cae46dc755 100644 --- a/cpp/include/Ice/IncomingAsync.h +++ b/cpp/include/Ice/IncomingAsync.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_INCOMING_ASYNC_H #define ICE_INCOMING_ASYNC_H diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h index 3a99af6d766..ca50eb95d5c 100644 --- a/cpp/include/Ice/IncomingAsyncF.h +++ b/cpp/include/Ice/IncomingAsyncF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 16900008983..0caf117d466 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_INITIALIZE_H #define ICE_INITIALIZE_H diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h index 73cae1355a9..2d22882716e 100644 --- a/cpp/include/Ice/InstanceF.h +++ b/cpp/include/Ice/InstanceF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_INSTANCE_F_H #define ICE_INSTANCE_F_H diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index 4b16fddf1bf..ff1ecd6f765 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOCAL_OBJECT_H #define ICE_LOCAL_OBJECT_H diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h index 709b0ae678b..bd40df4bf38 100644 --- a/cpp/include/Ice/LocalObjectF.h +++ b/cpp/include/Ice/LocalObjectF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ceb7daf3806..5b22e84ad70 100644 --- a/cpp/include/Ice/LoggerUtil.h +++ b/cpp/include/Ice/LoggerUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOGGER_UTIL_H #define ICE_LOGGER_UTIL_H diff --git a/cpp/include/Ice/Makefile b/cpp/include/Ice/Makefile index 4876331d855..60cb8ec36bc 100644 --- a/cpp/include/Ice/Makefile +++ b/cpp/include/Ice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index df362df30eb..3c57125651b 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OBJECT_H #define ICE_OBJECT_H diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h index d357db8aa83..adc2c124b7b 100644 --- a/cpp/include/Ice/ObjectAdapterFactoryF.h +++ b/cpp/include/Ice/ObjectAdapterFactoryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0d1963a04b3..e982d0721b6 100644 --- a/cpp/include/Ice/ObjectF.h +++ b/cpp/include/Ice/ObjectF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OBJECT_F_H #define ICE_OBJECT_F_H diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index d3db45835f7..8d91bfaacf7 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OUTGOING_H #define ICE_OUTGOING_H diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index 4ccda2d7542..1cc4673a422 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OUTGOING_ASYNC_H #define ICE_OUTGOING_ASYNC_H diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h index b2ba3eddb47..a884dd83f29 100644 --- a/cpp/include/Ice/OutgoingAsyncF.h +++ b/cpp/include/Ice/OutgoingAsyncF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ac720c15cf3..64b1e117325 100644 --- a/cpp/include/Ice/ProtocolPluginFacade.h +++ b/cpp/include/Ice/ProtocolPluginFacade.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0e4cfefdcc3..bb553ea6efa 100644 --- a/cpp/include/Ice/ProtocolPluginFacadeF.h +++ b/cpp/include/Ice/ProtocolPluginFacadeF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 e54e973f5e1..8044b601993 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROXY_H #define ICE_PROXY_H diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h index 00c75233303..3550e730d6d 100644 --- a/cpp/include/Ice/ProxyF.h +++ b/cpp/include/Ice/ProxyF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROXY_F_H #define ICE_PROXY_F_H diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h index 0a8c57fcfee..c2095d9a5c5 100644 --- a/cpp/include/Ice/ProxyFactoryF.h +++ b/cpp/include/Ice/ProxyFactoryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 1a63e7df34d..19de7533587 100644 --- a/cpp/include/Ice/ProxyHandle.h +++ b/cpp/include/Ice/ProxyHandle.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROXY_HANDLE_H #define ICE_PROXY_HANDLE_H diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h index 81a8435e3d8..c26a9632070 100644 --- a/cpp/include/Ice/ReferenceF.h +++ b/cpp/include/Ice/ReferenceF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_REFERENCE_F_H #define ICE_REFERENCE_F_H diff --git a/cpp/include/Ice/RoutingTable.h b/cpp/include/Ice/RoutingTable.h index b215f7ef2d3..d440cdf9803 100644 --- a/cpp/include/Ice/RoutingTable.h +++ b/cpp/include/Ice/RoutingTable.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ROUTING_TABLE_H #define ICE_ROUTING_TABLE_H diff --git a/cpp/include/Ice/RoutingTableF.h b/cpp/include/Ice/RoutingTableF.h index 56a34f22f68..bd51cdb24b1 100644 --- a/cpp/include/Ice/RoutingTableF.h +++ b/cpp/include/Ice/RoutingTableF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 fc6d00f4a52..422c06e07cf 100644 --- a/cpp/include/Ice/ServantManagerF.h +++ b/cpp/include/Ice/ServantManagerF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 7d5534a9af5..49ebe31bfd0 100755 --- a/cpp/include/Ice/Service.h +++ b/cpp/include/Ice/Service.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h index aaea6efe465..d7cf11a80ec 100644 --- a/cpp/include/Ice/UserExceptionFactory.h +++ b/cpp/include/Ice/UserExceptionFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a1fc7ce4f98..8f3bc147142 100644 --- a/cpp/include/Ice/UserExceptionFactoryF.h +++ b/cpp/include/Ice/UserExceptionFactoryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_USER_EXCEPTION_FACTORYF_H #define ICE_USER_EXCEPTION_FACTORYF_H diff --git a/cpp/include/IceBox/Makefile b/cpp/include/IceBox/Makefile index 722f0358137..995be1d7807 100644 --- a/cpp/include/IceBox/Makefile +++ b/cpp/include/IceBox/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IcePack/Makefile b/cpp/include/IcePack/Makefile index d5e2d7cb01f..12fc8bac778 100644 --- a/cpp/include/IcePack/Makefile +++ b/cpp/include/IcePack/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IcePatch/ClientUtil.h b/cpp/include/IcePatch/ClientUtil.h index 79450082b1a..8dcc116b5d4 100644 --- a/cpp/include/IcePatch/ClientUtil.h +++ b/cpp/include/IcePatch/ClientUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 147f4220a21..ad1acb30a98 100644 --- a/cpp/include/IcePatch/FileDescFactory.h +++ b/cpp/include/IcePatch/FileDescFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 7375a0c7d22..788ffb8afe7 100644 --- a/cpp/include/IcePatch/Makefile +++ b/cpp/include/IcePatch/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h index e2b8901b49e..8a6d4811144 100644 --- a/cpp/include/IcePatch/Util.h +++ b/cpp/include/IcePatch/Util.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PATCH_UTIL_H #define ICE_PATCH_UTIL_H diff --git a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h index a34efc84263..218d26e893d 100644 --- a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h +++ b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 4fd6570f6ad..9612928a099 100644 --- a/cpp/include/IceSSL/Config.h +++ b/cpp/include/IceSSL/Config.h @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,7 +8,6 @@ // ********************************************************************** - #ifndef ICE_SSL_CONFIG_H #define ICE_SSL_CONFIG_H diff --git a/cpp/include/IceSSL/Makefile b/cpp/include/IceSSL/Makefile index 2f52c9efd86..60e1c2ad7e3 100644 --- a/cpp/include/IceSSL/Makefile +++ b/cpp/include/IceSSL/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IceSSL/RSACertificateGen.h b/cpp/include/IceSSL/RSACertificateGen.h index b63b5a97a7f..1a381302f4e 100644 --- a/cpp/include/IceSSL/RSACertificateGen.h +++ b/cpp/include/IceSSL/RSACertificateGen.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 cea7263294c..ae202d85f2a 100644 --- a/cpp/include/IceSSL/RSACertificateGenF.h +++ b/cpp/include/IceSSL/RSACertificateGenF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 70cbe7d4665..cdf11573404 100644 --- a/cpp/include/IceSSL/RSAKeyPair.h +++ b/cpp/include/IceSSL/RSAKeyPair.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 fbd12b460b7..245f0f68c0a 100644 --- a/cpp/include/IceSSL/RSAKeyPairF.h +++ b/cpp/include/IceSSL/RSAKeyPairF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ffed8dc02e4..03c8cae0428 100644 --- a/cpp/include/IceSSL/RSAPrivateKey.h +++ b/cpp/include/IceSSL/RSAPrivateKey.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 14eac8adb4f..e2e49c1dd40 100644 --- a/cpp/include/IceSSL/RSAPrivateKeyF.h +++ b/cpp/include/IceSSL/RSAPrivateKeyF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8592cdd4c2f..dc7baeffe25 100644 --- a/cpp/include/IceSSL/RSAPublicKey.h +++ b/cpp/include/IceSSL/RSAPublicKey.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 105553dc73b..853e3ae01fd 100644 --- a/cpp/include/IceSSL/RSAPublicKeyF.h +++ b/cpp/include/IceSSL/RSAPublicKeyF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 75c7aca5f81..8247ff17ea7 100644 --- a/cpp/include/IceStorm/Makefile +++ b/cpp/include/IceStorm/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h index fb0e232e107..a3c7d93830d 100644 --- a/cpp/include/IceUtil/AbstractMutex.h +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 341c4c3156f..75da41bdaf5 100644 --- a/cpp/include/IceUtil/Algorithm.h +++ b/cpp/include/IceUtil/Algorithm.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_ALGORITHM_H #define ICE_UTIL_ALGORITHM_H diff --git a/cpp/include/IceUtil/Base64.h b/cpp/include/IceUtil/Base64.h index b4909600b6c..4233a2c526a 100644 --- a/cpp/include/IceUtil/Base64.h +++ b/cpp/include/IceUtil/Base64.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 c185b418006..657e1ae1b22 100644 --- a/cpp/include/IceUtil/Cache.h +++ b/cpp/include/IceUtil/Cache.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_CACHE_H #define ICE_UTIL_CACHE_H diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index e076c9b3d2f..d7f914d86d2 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_COND_H #define ICE_UTIL_COND_H diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index f457fc093ac..05de38222f9 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_CONFIG_H #define ICE_UTIL_CONFIG_H diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h index e85b3fc8031..1925c1c7306 100644 --- a/cpp/include/IceUtil/CountDownLatch.h +++ b/cpp/include/IceUtil/CountDownLatch.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 98d963371ab..b917391b3ad 100644 --- a/cpp/include/IceUtil/CtrlCHandler.h +++ b/cpp/include/IceUtil/CtrlCHandler.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0010bab3d47..01d6a2f5fa4 100644 --- a/cpp/include/IceUtil/Exception.h +++ b/cpp/include/IceUtil/Exception.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_EXCEPTION_H #define ICE_UTIL_EXCEPTION_H diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h index c0fe7a8fa30..553c5ccae80 100644 --- a/cpp/include/IceUtil/Functional.h +++ b/cpp/include/IceUtil/Functional.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_FUNCTIONAL_H #define ICE_UTIL_FUNCTIONAL_H diff --git a/cpp/include/IceUtil/GC.h b/cpp/include/IceUtil/GC.h index 2e1d5208de1..6959089501c 100644 --- a/cpp/include/IceUtil/GC.h +++ b/cpp/include/IceUtil/GC.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_GC_H #define ICE_GC_H diff --git a/cpp/include/IceUtil/GCRecMutex.h b/cpp/include/IceUtil/GCRecMutex.h index f82ef2d7d4c..e917a67879e 100644 --- a/cpp/include/IceUtil/GCRecMutex.h +++ b/cpp/include/IceUtil/GCRecMutex.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 18be995b2a6..7dffb3956e6 100644 --- a/cpp/include/IceUtil/GCShared.h +++ b/cpp/include/IceUtil/GCShared.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 26a0738ab9c..1e7a33be848 100644 --- a/cpp/include/IceUtil/Handle.h +++ b/cpp/include/IceUtil/Handle.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_HANDLE_H #define ICE_UTIL_HANDLE_H diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index 0b9d0117c6b..c2f9889320c 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8631d83bd8c..83f5427ecad 100644 --- a/cpp/include/IceUtil/InputUtil.h +++ b/cpp/include/IceUtil/InputUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ecb2a1dca69..d9e69896c73 100644 --- a/cpp/include/IceUtil/Iterator.h +++ b/cpp/include/IceUtil/Iterator.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_ITERATOR_H #define ICE_UTIL_ITERATOR_H diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h index 56d347b52c0..1821388c200 100644 --- a/cpp/include/IceUtil/Lock.h +++ b/cpp/include/IceUtil/Lock.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_LOCK_H #define ICE_UTIL_LOCK_H diff --git a/cpp/include/IceUtil/Makefile b/cpp/include/IceUtil/Makefile index 75f9045bc94..29fe0b0c3c3 100644 --- a/cpp/include/IceUtil/Makefile +++ b/cpp/include/IceUtil/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h index 63845f5338d..6416475bee7 100644 --- a/cpp/include/IceUtil/Monitor.h +++ b/cpp/include/IceUtil/Monitor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_MONITOR_H #define ICE_UTIL_MONITOR_H diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h index 7e01e767eab..d65245f85e2 100644 --- a/cpp/include/IceUtil/Mutex.h +++ b/cpp/include/IceUtil/Mutex.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_MUTEX_H #define ICE_UTIL_MUTEX_H diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h index d42bc8cee0a..3f95d2ef657 100644 --- a/cpp/include/IceUtil/OutputUtil.h +++ b/cpp/include/IceUtil/OutputUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 163a0f98f0b..9c7c2673de0 100644 --- a/cpp/include/IceUtil/RWRecMutex.h +++ b/cpp/include/IceUtil/RWRecMutex.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0b284bd6bb7..d6ff0fe8966 100644 --- a/cpp/include/IceUtil/RecMutex.h +++ b/cpp/include/IceUtil/RecMutex.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_RMUTEX_H #define ICE_UTIL_RMUTEX_H diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h index 2cbd20f3cad..699c8a3980d 100644 --- a/cpp/include/IceUtil/Shared.h +++ b/cpp/include/IceUtil/Shared.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_SHARED_H #define ICE_UTIL_SHARED_H diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h index 6dd867ae480..2c9a01a398f 100644 --- a/cpp/include/IceUtil/StaticMutex.h +++ b/cpp/include/IceUtil/StaticMutex.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a5d7699fc5c..16325a4489f 100644 --- a/cpp/include/IceUtil/StringUtil.h +++ b/cpp/include/IceUtil/StringUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STRING_UTIL_H #define ICE_STRING_UTIL_H diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index 8b2581097d5..d0a4a56193b 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_THREAD_H #define ICE_UTIL_THREAD_H diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index 65dbe4ace86..967bfe46da3 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 e4d4c20e025..776e6c56354 100644 --- a/cpp/include/IceUtil/Time.h +++ b/cpp/include/IceUtil/Time.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_TIME_H #define ICE_UTIL_TIME_H diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h index 5a0a4afa506..99de077d0a9 100644 --- a/cpp/include/IceUtil/UUID.h +++ b/cpp/include/IceUtil/UUID.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_UUID_H #define ICE_UTIL_UUID_H diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h index 9f986891c24..c548db9307b 100644 --- a/cpp/include/IceUtil/Unicode.h +++ b/cpp/include/IceUtil/Unicode.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UTIL_UNICODE_H #define ICE_UTIL_UNICODE_H diff --git a/cpp/include/IceXML/Makefile b/cpp/include/IceXML/Makefile index e9574c23767..ab3f18e2cde 100644 --- a/cpp/include/IceXML/Makefile +++ b/cpp/include/IceXML/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h index 7c6332a5213..5344becdf52 100644 --- a/cpp/include/IceXML/Parser.h +++ b/cpp/include/IceXML/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_XML_PARSER_H #define ICE_XML_PARSER_H diff --git a/cpp/include/Makefile b/cpp/include/Makefile index be8b09162d2..c3d1799b9b1 100644 --- a/cpp/include/Makefile +++ b/cpp/include/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = .. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index 8fc4f03e5a4..21bef134e9a 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 08ea6bc3c20..a96c9aa9b4d 100644 --- a/cpp/include/Slice/CsUtil.h +++ b/cpp/include/Slice/CsUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CS_UTIL_H #define CS_UTIL_H diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index 79681a06b17..bc1e5efc514 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 JAVA_UTIL_H #define JAVA_UTIL_H diff --git a/cpp/include/Slice/Makefile b/cpp/include/Slice/Makefile index c8ad333ef18..6a1108f360c 100644 --- a/cpp/include/Slice/Makefile +++ b/cpp/include/Slice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 22a32857c13..f1a47e5a0eb 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SLICE_PARSER_H #define SLICE_PARSER_H diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index 5b1e66f7f03..7e6f89179e1 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PREPROCESSOR_H #define PREPROCESSOR_H diff --git a/cpp/makedist.py b/cpp/makedist.py index 4d879045a8d..24374345a82 100755 --- a/cpp/makedist.py +++ b/cpp/makedist.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 9bce802571a..48469990a25 100755 --- a/cpp/slice/Freeze/Connection.ice +++ b/cpp/slice/Freeze/Connection.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/slice/Freeze/ConnectionF.ice b/cpp/slice/Freeze/ConnectionF.ice index 329e0938f41..da45ef305a3 100644 --- a/cpp/slice/Freeze/ConnectionF.ice +++ b/cpp/slice/Freeze/ConnectionF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_F_ICE #define FREEZE_CONNECTION_F_ICE diff --git a/cpp/slice/Freeze/DB.ice b/cpp/slice/Freeze/DB.ice index 2c88fd7fb65..35d019d55fe 100644 --- a/cpp/slice/Freeze/DB.ice +++ b/cpp/slice/Freeze/DB.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_DB_ICE #define FREEZE_DB_ICE diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice index 7e5edddca18..129dbcb9ab3 100644 --- a/cpp/slice/Freeze/Evictor.ice +++ b/cpp/slice/Freeze/Evictor.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_EVICTOR_ICE #define FREEZE_EVICTOR_ICE diff --git a/cpp/slice/Freeze/EvictorF.ice b/cpp/slice/Freeze/EvictorF.ice index 30526f18c2e..fcfb7e42b8a 100644 --- a/cpp/slice/Freeze/EvictorF.ice +++ b/cpp/slice/Freeze/EvictorF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_EVICTOR_F_ICE #define FREEZE_EVICTOR_F_ICE diff --git a/cpp/slice/Freeze/EvictorStorage.ice b/cpp/slice/Freeze/EvictorStorage.ice index 7e0c437a258..9de73877341 100644 --- a/cpp/slice/Freeze/EvictorStorage.ice +++ b/cpp/slice/Freeze/EvictorStorage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_EVICTOR_STORAGE_ICE #define FREEZE_EVICTOR_STORAGE_ICE diff --git a/cpp/slice/Freeze/Exception.ice b/cpp/slice/Freeze/Exception.ice index 9c2bd783b91..b74aece1c51 100644 --- a/cpp/slice/Freeze/Exception.ice +++ b/cpp/slice/Freeze/Exception.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_EXCEPTION_ICE #define FREEZE_EXCEPTION_ICE diff --git a/cpp/slice/Freeze/Makefile b/cpp/slice/Freeze/Makefile index d20798a8ec9..1a55e76a778 100644 --- a/cpp/slice/Freeze/Makefile +++ b/cpp/slice/Freeze/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/Freeze/Transaction.ice b/cpp/slice/Freeze/Transaction.ice index 2756ca861fb..bcf435d79ce 100755 --- a/cpp/slice/Freeze/Transaction.ice +++ b/cpp/slice/Freeze/Transaction.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/slice/Glacier/Makefile b/cpp/slice/Glacier/Makefile index c2435235926..8f7f3ba645b 100644 --- a/cpp/slice/Glacier/Makefile +++ b/cpp/slice/Glacier/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/Glacier/Router.ice b/cpp/slice/Glacier/Router.ice index 58effff1059..872291100e2 100644 --- a/cpp/slice/Glacier/Router.ice +++ b/cpp/slice/Glacier/Router.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_ROUTER_ICE #define GLACIER_ROUTER_ICE diff --git a/cpp/slice/Glacier/Session.ice b/cpp/slice/Glacier/Session.ice index c89528fdf1f..4b0857a9442 100644 --- a/cpp/slice/Glacier/Session.ice +++ b/cpp/slice/Glacier/Session.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_SESSION_ICE #define GLACIER_SESSION_ICE diff --git a/cpp/slice/Glacier/SessionF.ice b/cpp/slice/Glacier/SessionF.ice index 05e72069fb9..1d6d5819701 100644 --- a/cpp/slice/Glacier/SessionF.ice +++ b/cpp/slice/Glacier/SessionF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_SESSION_F_ICE #define GLACIER_SESSION_F_ICE diff --git a/cpp/slice/Glacier/SessionManager.ice b/cpp/slice/Glacier/SessionManager.ice index 0375a8cda21..a7836588ae2 100644 --- a/cpp/slice/Glacier/SessionManager.ice +++ b/cpp/slice/Glacier/SessionManager.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_SESSION_MANAGER_ICE #define GLACIER_SESSION_MANAGER_ICE diff --git a/cpp/slice/Glacier/SessionManagerF.ice b/cpp/slice/Glacier/SessionManagerF.ice index d589d7f524c..1c759f5962d 100644 --- a/cpp/slice/Glacier/SessionManagerF.ice +++ b/cpp/slice/Glacier/SessionManagerF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8454dc38059..61493bda755 100644 --- a/cpp/slice/Glacier/Starter.ice +++ b/cpp/slice/Glacier/Starter.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_ICE #define GLACIER_ICE diff --git a/cpp/slice/Ice/BuiltinSequences.ice b/cpp/slice/Ice/BuiltinSequences.ice index 7824ebae253..82b7e41f5b8 100644 --- a/cpp/slice/Ice/BuiltinSequences.ice +++ b/cpp/slice/Ice/BuiltinSequences.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_BUILTIN_SEQUENCES_ICE #define ICE_BUILTIN_SEQUENCES_ICE diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice index e8958149dae..e4cd961bd23 100644 --- a/cpp/slice/Ice/Communicator.ice +++ b/cpp/slice/Ice/Communicator.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_COMMUNICATOR_ICE #define ICE_COMMUNICATOR_ICE diff --git a/cpp/slice/Ice/CommunicatorF.ice b/cpp/slice/Ice/CommunicatorF.ice index 2b2f83d1589..3828fe3cd44 100644 --- a/cpp/slice/Ice/CommunicatorF.ice +++ b/cpp/slice/Ice/CommunicatorF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_COMMUNICATOR_F_ICE #define ICE_COMMUNICATOR_F_ICE diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice index ee569bf2a25..27d53a59022 100644 --- a/cpp/slice/Ice/Current.ice +++ b/cpp/slice/Ice/Current.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CURRENT_ICE #define ICE_CURRENT_ICE diff --git a/cpp/slice/Ice/FacetMap.ice b/cpp/slice/Ice/FacetMap.ice index db869ddc0dc..e02734274c8 100644 --- a/cpp/slice/Ice/FacetMap.ice +++ b/cpp/slice/Ice/FacetMap.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/slice/Ice/Identity.ice b/cpp/slice/Ice/Identity.ice index beb1a5c75bd..5387b203890 100644 --- a/cpp/slice/Ice/Identity.ice +++ b/cpp/slice/Ice/Identity.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_IDENTITY_ICE #define ICE_IDENTITY_ICE diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice index dd20382b44e..50a0a65e8c9 100644 --- a/cpp/slice/Ice/LocalException.ice +++ b/cpp/slice/Ice/LocalException.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOCAL_EXCEPTION_ICE #define ICE_LOCAL_EXCEPTION_ICE diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice index 21af0c51896..cca6cbebd70 100644 --- a/cpp/slice/Ice/Locator.ice +++ b/cpp/slice/Ice/Locator.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOCATOR_ICE #define ICE_LOCATOR_ICE diff --git a/cpp/slice/Ice/LocatorF.ice b/cpp/slice/Ice/LocatorF.ice index be175252758..bc432460ef6 100644 --- a/cpp/slice/Ice/LocatorF.ice +++ b/cpp/slice/Ice/LocatorF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOCATOR_F_ICE #define ICE_LOCATOR_F_ICE diff --git a/cpp/slice/Ice/Logger.ice b/cpp/slice/Ice/Logger.ice index 700618503e7..20f58257b0f 100644 --- a/cpp/slice/Ice/Logger.ice +++ b/cpp/slice/Ice/Logger.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOGGER_ICE #define ICE_LOGGER_ICE diff --git a/cpp/slice/Ice/LoggerF.ice b/cpp/slice/Ice/LoggerF.ice index d3684e06fa5..0d0b9b6cd69 100644 --- a/cpp/slice/Ice/LoggerF.ice +++ b/cpp/slice/Ice/LoggerF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOGGER_F_ICE #define ICE_LOGGER_F_ICE diff --git a/cpp/slice/Ice/Makefile b/cpp/slice/Ice/Makefile index 342eb433343..528d3502c29 100644 --- a/cpp/slice/Ice/Makefile +++ b/cpp/slice/Ice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice index a65dc383467..80b3011cc53 100644 --- a/cpp/slice/Ice/ObjectAdapter.ice +++ b/cpp/slice/Ice/ObjectAdapter.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OBJECT_ADAPTER_ICE #define ICE_OBJECT_ADAPTER_ICE diff --git a/cpp/slice/Ice/ObjectAdapterF.ice b/cpp/slice/Ice/ObjectAdapterF.ice index 433b1683409..c999ec21752 100644 --- a/cpp/slice/Ice/ObjectAdapterF.ice +++ b/cpp/slice/Ice/ObjectAdapterF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 7e482487b7c..1bf7fa64acf 100644 --- a/cpp/slice/Ice/ObjectFactory.ice +++ b/cpp/slice/Ice/ObjectFactory.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OBJECT_FACTORY_ICE #define ICE_OBJECT_FACTORY_ICE diff --git a/cpp/slice/Ice/ObjectFactoryF.ice b/cpp/slice/Ice/ObjectFactoryF.ice index 8c21c25a2c1..9afd80df646 100644 --- a/cpp/slice/Ice/ObjectFactoryF.ice +++ b/cpp/slice/Ice/ObjectFactoryF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 870e6cf119f..5ac62c1b166 100644 --- a/cpp/slice/Ice/Plugin.ice +++ b/cpp/slice/Ice/Plugin.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PLUGIN_ICE #define ICE_PLUGIN_ICE diff --git a/cpp/slice/Ice/PluginF.ice b/cpp/slice/Ice/PluginF.ice index 2992eb8a034..8a9247b7bcc 100644 --- a/cpp/slice/Ice/PluginF.ice +++ b/cpp/slice/Ice/PluginF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PLUGIN_F_ICE #define ICE_PLUGIN_F_ICE diff --git a/cpp/slice/Ice/Process.ice b/cpp/slice/Ice/Process.ice index 61f2076a71d..f6677c7082d 100644 --- a/cpp/slice/Ice/Process.ice +++ b/cpp/slice/Ice/Process.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROCESS_ICE #define ICE_PROCESS_ICE diff --git a/cpp/slice/Ice/ProcessF.ice b/cpp/slice/Ice/ProcessF.ice index a18e9c1f7b7..e88eb3c9fde 100644 --- a/cpp/slice/Ice/ProcessF.ice +++ b/cpp/slice/Ice/ProcessF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROCESS_F_ICE #define ICE_PROCESS_F_ICE diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice index 7fbdb5f4f1b..24d5ecff7d0 100644 --- a/cpp/slice/Ice/Properties.ice +++ b/cpp/slice/Ice/Properties.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROPERTIES_ICE #define ICE_PROPERTIES_ICE diff --git a/cpp/slice/Ice/PropertiesF.ice b/cpp/slice/Ice/PropertiesF.ice index a7a7f751443..a5ea5bd6139 100644 --- a/cpp/slice/Ice/PropertiesF.ice +++ b/cpp/slice/Ice/PropertiesF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROPERTIES_F_ICE #define ICE_PROPERTIES_F_ICE diff --git a/cpp/slice/Ice/Router.ice b/cpp/slice/Ice/Router.ice index b4ca9990ce6..90b8af6811e 100644 --- a/cpp/slice/Ice/Router.ice +++ b/cpp/slice/Ice/Router.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ROUTER_ICE #define ICE_ROUTER_ICE diff --git a/cpp/slice/Ice/RouterF.ice b/cpp/slice/Ice/RouterF.ice index f78734f812f..2c0bb1fbe8c 100644 --- a/cpp/slice/Ice/RouterF.ice +++ b/cpp/slice/Ice/RouterF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ROUTER_F_ICE #define ICE_ROUTER_F_ICE diff --git a/cpp/slice/Ice/ServantLocator.ice b/cpp/slice/Ice/ServantLocator.ice index 5e67c2a973c..22bbfdeb9ae 100644 --- a/cpp/slice/Ice/ServantLocator.ice +++ b/cpp/slice/Ice/ServantLocator.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SERVANT_LOCATOR_ICE #define ICE_SERVANT_LOCATOR_ICE diff --git a/cpp/slice/Ice/ServantLocatorF.ice b/cpp/slice/Ice/ServantLocatorF.ice index eca0ff2b99b..ad931dad52f 100644 --- a/cpp/slice/Ice/ServantLocatorF.ice +++ b/cpp/slice/Ice/ServantLocatorF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a9a68f6c9d6..c2a549483b9 100644 --- a/cpp/slice/Ice/Stats.ice +++ b/cpp/slice/Ice/Stats.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STATS_ICE #define ICE_STATS_ICE diff --git a/cpp/slice/Ice/StatsF.ice b/cpp/slice/Ice/StatsF.ice index 7b04808ab66..6d232cb7953 100644 --- a/cpp/slice/Ice/StatsF.ice +++ b/cpp/slice/Ice/StatsF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STATS_F_ICE #define ICE_STATS_F_ICE diff --git a/cpp/slice/IceBox/IceBox.ice b/cpp/slice/IceBox/IceBox.ice index 5b7dffe9a91..a18eae06937 100644 --- a/cpp/slice/IceBox/IceBox.ice +++ b/cpp/slice/IceBox/IceBox.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_BOX_ICE_BOX_ICE #define ICE_BOX_ICE_BOX_ICE diff --git a/cpp/slice/IceBox/Makefile b/cpp/slice/IceBox/Makefile index 50675bf3727..a884ecf93cc 100644 --- a/cpp/slice/IceBox/Makefile +++ b/cpp/slice/IceBox/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/IcePack/Admin.ice b/cpp/slice/IcePack/Admin.ice index 5b60a6e0e7b..59a86e74bbe 100644 --- a/cpp/slice/IcePack/Admin.ice +++ b/cpp/slice/IcePack/Admin.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_ADMIN_ICE #define ICE_PACK_ADMIN_ICE diff --git a/cpp/slice/IcePack/Exception.ice b/cpp/slice/IcePack/Exception.ice index 26436a27688..443a6a7c217 100644 --- a/cpp/slice/IcePack/Exception.ice +++ b/cpp/slice/IcePack/Exception.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_EXCEPTION_ICE #define ICE_PACK_EXCEPTION_ICE diff --git a/cpp/slice/IcePack/Makefile b/cpp/slice/IcePack/Makefile index cd22ffd2d7a..b6f8d7d20ca 100644 --- a/cpp/slice/IcePack/Makefile +++ b/cpp/slice/IcePack/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/IcePack/Query.ice b/cpp/slice/IcePack/Query.ice index 69d202b7920..4bb9d549763 100644 --- a/cpp/slice/IcePack/Query.ice +++ b/cpp/slice/IcePack/Query.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_QUERY_ICE #define ICE_PACK_QUERY_ICE diff --git a/cpp/slice/IcePatch/IcePatch.ice b/cpp/slice/IcePatch/IcePatch.ice index 9189b511682..132c4c7ebd6 100644 --- a/cpp/slice/IcePatch/IcePatch.ice +++ b/cpp/slice/IcePatch/IcePatch.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PATCH_ICE_PATCH_ICE #define ICE_PATCH_ICE_PATCH_ICE diff --git a/cpp/slice/IcePatch/Makefile b/cpp/slice/IcePatch/Makefile index 26514c12a2d..11b4a7ac2db 100644 --- a/cpp/slice/IcePatch/Makefile +++ b/cpp/slice/IcePatch/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/IceSSL/CertificateVerifier.ice b/cpp/slice/IceSSL/CertificateVerifier.ice index 842ebb09a76..2ab9f67eb36 100644 --- a/cpp/slice/IceSSL/CertificateVerifier.ice +++ b/cpp/slice/IceSSL/CertificateVerifier.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 1637d61c8c1..18615eca48b 100644 --- a/cpp/slice/IceSSL/CertificateVerifierF.ice +++ b/cpp/slice/IceSSL/CertificateVerifierF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 85de44199e2..ecc38057f30 100644 --- a/cpp/slice/IceSSL/Exception.ice +++ b/cpp/slice/IceSSL/Exception.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_EXCEPTION_ICE #define ICE_SSL_EXCEPTION_ICE diff --git a/cpp/slice/IceSSL/Makefile b/cpp/slice/IceSSL/Makefile index 0ff025a10c9..120dd07d17d 100644 --- a/cpp/slice/IceSSL/Makefile +++ b/cpp/slice/IceSSL/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/IceSSL/Plugin.ice b/cpp/slice/IceSSL/Plugin.ice index e0f336167de..7150fde916c 100644 --- a/cpp/slice/IceSSL/Plugin.ice +++ b/cpp/slice/IceSSL/Plugin.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_PLUGIN_ICE #define ICE_SSL_PLUGIN_ICE diff --git a/cpp/slice/IceSSL/PluginF.ice b/cpp/slice/IceSSL/PluginF.ice index b706f560a4c..db464eaf86c 100644 --- a/cpp/slice/IceSSL/PluginF.ice +++ b/cpp/slice/IceSSL/PluginF.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 d359d572ad6..01d089f99fd 100644 --- a/cpp/slice/IceStorm/IceStorm.ice +++ b/cpp/slice/IceStorm/IceStorm.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STORM_ICE #define ICE_STORM_ICE diff --git a/cpp/slice/IceStorm/Makefile b/cpp/slice/IceStorm/Makefile index 15041e34d6b..acd1beafc39 100644 --- a/cpp/slice/IceStorm/Makefile +++ b/cpp/slice/IceStorm/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/slice/Makefile b/cpp/slice/Makefile index 96b63f42e3c..9539daadbb7 100644 --- a/cpp/slice/Makefile +++ b/cpp/slice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = .. include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp index 55864b18840..8c824e061d7 100644 --- a/cpp/src/Freeze/ConnectionI.cpp +++ b/cpp/src/Freeze/ConnectionI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9bc308e6357..1099e97f516 100644 --- a/cpp/src/Freeze/ConnectionI.h +++ b/cpp/src/Freeze/ConnectionI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_CONNECTIONI_H #define FREEZE_CONNECTIONI_H diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index abba41d3845..913af86a0ae 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 562e2073ad3..906dd672ed7 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_EVICTOR_I_H #define FREEZE_EVICTOR_I_H diff --git a/cpp/src/Freeze/EvictorIteratorI.cpp b/cpp/src/Freeze/EvictorIteratorI.cpp index 1fec3fb94ed..c82b9eb4af8 100644 --- a/cpp/src/Freeze/EvictorIteratorI.cpp +++ b/cpp/src/Freeze/EvictorIteratorI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1408c94f555..96e54b86f8d 100644 --- a/cpp/src/Freeze/EvictorIteratorI.h +++ b/cpp/src/Freeze/EvictorIteratorI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 ebe80fb4226..2fd6673ef37 100644 --- a/cpp/src/Freeze/Index.cpp +++ b/cpp/src/Freeze/Index.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Freeze/Index.h> #include <Freeze/IndexI.h> diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp index 6e2bf08ad47..5e2ecca89c7 100644 --- a/cpp/src/Freeze/IndexI.cpp +++ b/cpp/src/Freeze/IndexI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 bf637408b0f..c5c5ac8bf1a 100644 --- a/cpp/src/Freeze/IndexI.h +++ b/cpp/src/Freeze/IndexI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_INDEX_I_H #define FREEZE_INDEX_I_H diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 711e373fca7..dc414ce3a59 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,Freeze,$(VERSION)) diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index 36eb69fe0bf..7e39199f794 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a5681554b7d..2bb28cf1b24 100644 --- a/cpp/src/Freeze/MapI.h +++ b/cpp/src/Freeze/MapI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_MAP_I_H #define FREEZE_MAP_I_H diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp index cae14a90935..05b994a5ec0 100644 --- a/cpp/src/Freeze/ObjectStore.cpp +++ b/cpp/src/Freeze/ObjectStore.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9b3f044dc87..753249a648e 100644 --- a/cpp/src/Freeze/ObjectStore.h +++ b/cpp/src/Freeze/ObjectStore.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_OBJECT_STORE_H #define FREEZE_OBJECT_STORE_H diff --git a/cpp/src/Freeze/SharedDb.cpp b/cpp/src/Freeze/SharedDb.cpp index f3fc331f39f..62c0e0cd6e3 100644 --- a/cpp/src/Freeze/SharedDb.cpp +++ b/cpp/src/Freeze/SharedDb.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3c3ad41bdd1..4260c05212d 100644 --- a/cpp/src/Freeze/SharedDb.h +++ b/cpp/src/Freeze/SharedDb.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SHARED_DB_H #define FREEZE_SHARED_DB_H diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp index c42d97a0d6d..5f47aa2fbc1 100644 --- a/cpp/src/Freeze/SharedDbEnv.cpp +++ b/cpp/src/Freeze/SharedDbEnv.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c7f884f31d2..f739c4105ec 100644 --- a/cpp/src/Freeze/SharedDbEnv.h +++ b/cpp/src/Freeze/SharedDbEnv.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 232243d1ab2..99896f36f08 100644 --- a/cpp/src/Freeze/TransactionHolder.cpp +++ b/cpp/src/Freeze/TransactionHolder.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Freeze/TransactionHolder.h> using namespace Freeze; diff --git a/cpp/src/Freeze/TransactionI.cpp b/cpp/src/Freeze/TransactionI.cpp index 104d8578878..ff77a0d7419 100644 --- a/cpp/src/Freeze/TransactionI.cpp +++ b/cpp/src/Freeze/TransactionI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7ce7a3d0404..270a59261ed 100644 --- a/cpp/src/Freeze/TransactionI.h +++ b/cpp/src/Freeze/TransactionI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_TRANSACTIONI_H #define FREEZE_TRANSACTIONI_H diff --git a/cpp/src/Freeze/Util.cpp b/cpp/src/Freeze/Util.cpp index c2fe143e012..9961efc731c 100644 --- a/cpp/src/Freeze/Util.cpp +++ b/cpp/src/Freeze/Util.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Freeze/Util.h> #include <Freeze/Exception.h> diff --git a/cpp/src/Freeze/Util.h b/cpp/src/Freeze/Util.h index ddcaf61bea2..6fbc7f9b78c 100644 --- a/cpp/src/Freeze/Util.h +++ b/cpp/src/Freeze/Util.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_UTIL_H #define FREEZE_UTIL_H diff --git a/cpp/src/FreezeScript/AssignVisitor.cpp b/cpp/src/FreezeScript/AssignVisitor.cpp index 6b69ae59ac8..b4be1085e3e 100644 --- a/cpp/src/FreezeScript/AssignVisitor.cpp +++ b/cpp/src/FreezeScript/AssignVisitor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <FreezeScript/AssignVisitor.h> #include <FreezeScript/Util.h> diff --git a/cpp/src/FreezeScript/AssignVisitor.h b/cpp/src/FreezeScript/AssignVisitor.h index 4f8dcdaaf20..29812d51809 100644 --- a/cpp/src/FreezeScript/AssignVisitor.h +++ b/cpp/src/FreezeScript/AssignVisitor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 e1966c49576..ceb94cafd77 100644 --- a/cpp/src/FreezeScript/Data.cpp +++ b/cpp/src/FreezeScript/Data.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 751739e85ad..2ec558fac8f 100644 --- a/cpp/src/FreezeScript/Data.h +++ b/cpp/src/FreezeScript/Data.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_DATA_H #define FREEZE_SCRIPT_DATA_H diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp index 7f39c1a65ce..fb216883191 100644 --- a/cpp/src/FreezeScript/DumpDB.cpp +++ b/cpp/src/FreezeScript/DumpDB.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 f2475c60d8b..9d8c505546a 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.cpp +++ b/cpp/src/FreezeScript/DumpDescriptors.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b304e968d51..b159b7aa0bd 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.h +++ b/cpp/src/FreezeScript/DumpDescriptors.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 517fc69838b..f22af82a80c 100644 --- a/cpp/src/FreezeScript/Error.cpp +++ b/cpp/src/FreezeScript/Error.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ada113f6810..dc0a8c5cf19 100644 --- a/cpp/src/FreezeScript/Error.h +++ b/cpp/src/FreezeScript/Error.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_ERROR_H #define FREEZE_SCRIPT_ERROR_H diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp index 7e77be65302..f784c591e95 100644 --- a/cpp/src/FreezeScript/Exception.cpp +++ b/cpp/src/FreezeScript/Exception.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <FreezeScript/Exception.h> using namespace std; diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h index c4eea166b35..0837ece9082 100644 --- a/cpp/src/FreezeScript/Exception.h +++ b/cpp/src/FreezeScript/Exception.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_EXCEPTION_H #define FREEZE_SCRIPT_EXCEPTION_H diff --git a/cpp/src/FreezeScript/Functions.cpp b/cpp/src/FreezeScript/Functions.cpp index f70aa9efbd0..2e952e686af 100644 --- a/cpp/src/FreezeScript/Functions.cpp +++ b/cpp/src/FreezeScript/Functions.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7c67a85f75c..4db4079b550 100644 --- a/cpp/src/FreezeScript/Functions.h +++ b/cpp/src/FreezeScript/Functions.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_FUNCTIONS_H #define FREEZE_SCRIPT_FUNCTIONS_H diff --git a/cpp/src/FreezeScript/Grammar.y b/cpp/src/FreezeScript/Grammar.y index 642837069de..e94a775c11c 100644 --- a/cpp/src/FreezeScript/Grammar.y +++ b/cpp/src/FreezeScript/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <FreezeScript/GrammarUtil.h> #ifdef _WIN32 diff --git a/cpp/src/FreezeScript/GrammarUtil.h b/cpp/src/FreezeScript/GrammarUtil.h index c7accce5294..eab16ebfebf 100644 --- a/cpp/src/FreezeScript/GrammarUtil.h +++ b/cpp/src/FreezeScript/GrammarUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_GRAMMAR_UTIL_H #define FREEZE_SCRIPT_GRAMMAR_UTIL_H diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index f7984374810..1c3f611d15b 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. TRANSFORMDB = $(top_srcdir)/bin/transformdb diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp index 0013fce8e01..a87f752042a 100644 --- a/cpp/src/FreezeScript/Parser.cpp +++ b/cpp/src/FreezeScript/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1691d7fdff4..c920f81afb8 100644 --- a/cpp/src/FreezeScript/Parser.h +++ b/cpp/src/FreezeScript/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_PARSER_H #define FREEZE_SCRIPT_PARSER_H diff --git a/cpp/src/FreezeScript/Print.cpp b/cpp/src/FreezeScript/Print.cpp index b7b09d85422..457f99716b6 100644 --- a/cpp/src/FreezeScript/Print.cpp +++ b/cpp/src/FreezeScript/Print.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 69bb013dba9..6dbd1673435 100644 --- a/cpp/src/FreezeScript/Print.h +++ b/cpp/src/FreezeScript/Print.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_PRINT_H #define FREEZE_SCRIPT_PRINT_H diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l index 8455a6fe2f0..3db77e3614d 100644 --- a/cpp/src/FreezeScript/Scanner.l +++ b/cpp/src/FreezeScript/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 087c7d92532..8ea4bc5b0c4 100644 --- a/cpp/src/FreezeScript/TransformAnalyzer.cpp +++ b/cpp/src/FreezeScript/TransformAnalyzer.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7fc5856071f..e6cc35a5a07 100644 --- a/cpp/src/FreezeScript/TransformAnalyzer.h +++ b/cpp/src/FreezeScript/TransformAnalyzer.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 e8ac95a430f..ced63514336 100644 --- a/cpp/src/FreezeScript/TransformVisitor.cpp +++ b/cpp/src/FreezeScript/TransformVisitor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <FreezeScript/TransformVisitor.h> #include <FreezeScript/Util.h> diff --git a/cpp/src/FreezeScript/TransformVisitor.h b/cpp/src/FreezeScript/TransformVisitor.h index b42f4a25705..1d665c707ab 100644 --- a/cpp/src/FreezeScript/TransformVisitor.h +++ b/cpp/src/FreezeScript/TransformVisitor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_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 f1794f41d1e..cc88f79d49e 100644 --- a/cpp/src/FreezeScript/Transformer.cpp +++ b/cpp/src/FreezeScript/Transformer.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b80af4c7fce..d05d8b9a6c6 100644 --- a/cpp/src/FreezeScript/Transformer.h +++ b/cpp/src/FreezeScript/Transformer.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_TRANSFORMER_H #define FREEZE_SCRIPT_TRANSFORMER_H diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp index 39f48bd8464..21eba9701ff 100644 --- a/cpp/src/FreezeScript/Util.cpp +++ b/cpp/src/FreezeScript/Util.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3776f6bc47e..2ef4862eb0e 100644 --- a/cpp/src/FreezeScript/Util.h +++ b/cpp/src/FreezeScript/Util.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_SCRIPT_UTIL_H #define FREEZE_SCRIPT_UTIL_H diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp index 7ce9b986ef2..41dcc42b085 100644 --- a/cpp/src/FreezeScript/transformdb.cpp +++ b/cpp/src/FreezeScript/transformdb.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 d223c865bd4..62edbe6be49 100644 --- a/cpp/src/Glacier/Blobject.cpp +++ b/cpp/src/Glacier/Blobject.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/RoutingTable.h> #include <Glacier/Blobject.h> diff --git a/cpp/src/Glacier/Blobject.h b/cpp/src/Glacier/Blobject.h index e1628d1e439..7491c63b929 100644 --- a/cpp/src/Glacier/Blobject.h +++ b/cpp/src/Glacier/Blobject.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 BLOBJECT_H #define BLOBJECT_H diff --git a/cpp/src/Glacier/ClientBlobject.cpp b/cpp/src/Glacier/ClientBlobject.cpp index 0e029b31ba6..947fd187d01 100644 --- a/cpp/src/Glacier/ClientBlobject.cpp +++ b/cpp/src/Glacier/ClientBlobject.cpp @@ -1,18 +1,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/RoutingTable.h> #include <Ice/IdentityUtil.h> diff --git a/cpp/src/Glacier/ClientBlobject.h b/cpp/src/Glacier/ClientBlobject.h index 804cc93c63d..de5930b3707 100644 --- a/cpp/src/Glacier/ClientBlobject.h +++ b/cpp/src/Glacier/ClientBlobject.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CLIENT_BLOBJECT_H #define CLIENT_BLOBJECT_H diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp index d6c4cb0fde6..9ab7e829958 100644 --- a/cpp/src/Glacier/GlacierRouter.cpp +++ b/cpp/src/Glacier/GlacierRouter.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 beb88418666..08c4790163a 100644 --- a/cpp/src/Glacier/GlacierStarter.cpp +++ b/cpp/src/Glacier/GlacierStarter.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Service.h> #include <Glacier/StarterI.h> #include <fstream> diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile index e7481ef374c..c7c52472b2f 100644 --- a/cpp/src/Glacier/Makefile +++ b/cpp/src/Glacier/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,Glacier,$(VERSION)) diff --git a/cpp/src/Glacier/Request.cpp b/cpp/src/Glacier/Request.cpp index a24c926471b..a9054e114d1 100644 --- a/cpp/src/Glacier/Request.cpp +++ b/cpp/src/Glacier/Request.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Glacier/Request.h> using namespace std; diff --git a/cpp/src/Glacier/Request.h b/cpp/src/Glacier/Request.h index fb53d5bff96..7eecda78f00 100644 --- a/cpp/src/Glacier/Request.h +++ b/cpp/src/Glacier/Request.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 MISSIVE_H #define MISSIVE_H diff --git a/cpp/src/Glacier/RouterI.cpp b/cpp/src/Glacier/RouterI.cpp index cb61e63d090..9d08816afdb 100644 --- a/cpp/src/Glacier/RouterI.cpp +++ b/cpp/src/Glacier/RouterI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7de3ab5d29b..ac075232429 100644 --- a/cpp/src/Glacier/RouterI.h +++ b/cpp/src/Glacier/RouterI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_ROUTER_I_H #define GLACIER_ROUTER_I_H diff --git a/cpp/src/Glacier/ServerBlobject.cpp b/cpp/src/Glacier/ServerBlobject.cpp index f22cdd6d82f..09cd4044a06 100644 --- a/cpp/src/Glacier/ServerBlobject.cpp +++ b/cpp/src/Glacier/ServerBlobject.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/RoutingTable.h> #include <Glacier/ServerBlobject.h> diff --git a/cpp/src/Glacier/ServerBlobject.h b/cpp/src/Glacier/ServerBlobject.h index 5e35c3bf593..a04ef3d3d15 100644 --- a/cpp/src/Glacier/ServerBlobject.h +++ b/cpp/src/Glacier/ServerBlobject.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVER_BLOBJECT_H #define SERVER_BLOBJECT_H diff --git a/cpp/src/Glacier/StarterI.cpp b/cpp/src/Glacier/StarterI.cpp index c306def8834..bd598148086 100644 --- a/cpp/src/Glacier/StarterI.cpp +++ b/cpp/src/Glacier/StarterI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9b7336c3f4d..a7389afaa97 100644 --- a/cpp/src/Glacier/StarterI.h +++ b/cpp/src/Glacier/StarterI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GLACIER_STARTER_I_H #define GLACIER_STARTER_I_H diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp index 34dc67ef46e..a6f985922ac 100644 --- a/cpp/src/Ice/Acceptor.cpp +++ b/cpp/src/Ice/Acceptor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Acceptor.h> using namespace std; diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h index 5262050c67b..05342bb5154 100644 --- a/cpp/src/Ice/Acceptor.h +++ b/cpp/src/Ice/Acceptor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ACCEPTOR_H #define ICE_ACCEPTOR_H diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h index d4965b5d525..5de69b76cb6 100644 --- a/cpp/src/Ice/AcceptorF.h +++ b/cpp/src/Ice/AcceptorF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ACCEPTOR_F_H #define ICE_ACCEPTOR_F_H diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 61d51131eb3..870fa1a6a1d 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 89f9bc3eda3..233b7f20495 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4fca8881a46..5116c5a8426 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 f91c27c202c..a6a400219ea 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_COMMUNICATOR_I_H #define ICE_COMMUNICATOR_I_H diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp index b1bacda2d1b..79e3915cb83 100644 --- a/cpp/src/Ice/Connection.cpp +++ b/cpp/src/Ice/Connection.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9993b85d7e9..e70b9a000d8 100644 --- a/cpp/src/Ice/Connection.h +++ b/cpp/src/Ice/Connection.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONNECTION_H #define ICE_CONNECTION_H diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 8f6998ede76..ab66c0528f3 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 f8db7164286..45870124540 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONNECTION_FACTORY_H #define ICE_CONNECTION_FACTORY_H diff --git a/cpp/src/Ice/ConnectionMonitor.cpp b/cpp/src/Ice/ConnectionMonitor.cpp index fec6b9471fd..59846eab595 100644 --- a/cpp/src/Ice/ConnectionMonitor.cpp +++ b/cpp/src/Ice/ConnectionMonitor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ed491655d91..4f25aba36b7 100644 --- a/cpp/src/Ice/ConnectionMonitor.h +++ b/cpp/src/Ice/ConnectionMonitor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONNECTION_MONITOR_H #define ICE_CONNECTION_MONITOR_H diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp index 212c10b8cf1..eb080f7da98 100644 --- a/cpp/src/Ice/Connector.cpp +++ b/cpp/src/Ice/Connector.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Connector.h> using namespace std; diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h index 7964f07bf30..06ff2a5eac5 100644 --- a/cpp/src/Ice/Connector.h +++ b/cpp/src/Ice/Connector.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONNECTOR_H #define ICE_CONNECTOR_H diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h index 4ec329be107..19d66c4ac12 100644 --- a/cpp/src/Ice/ConnectorF.h +++ b/cpp/src/Ice/ConnectorF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_CONNECTOR_F_H #define ICE_CONNECTOR_F_H diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp index 91fef83c7e5..375f78adadd 100755 --- a/cpp/src/Ice/DLLMain.cpp +++ b/cpp/src/Ice/DLLMain.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ccdbc0cab20..df744b82050 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 99c1efb87c9..9ca415ab900 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.h +++ b/cpp/src/Ice/DefaultsAndOverrides.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 5d68772e663..9af43e46d43 100644 --- a/cpp/src/Ice/DefaultsAndOverridesF.h +++ b/cpp/src/Ice/DefaultsAndOverridesF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ea3b9248f72..0ce778f27b0 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4008593be37..9b67ca50ce2 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/DynamicLibrary.h> #ifndef _WIN32 diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp index 5daae22cc0a..4114575d7aa 100644 --- a/cpp/src/Ice/Endpoint.cpp +++ b/cpp/src/Ice/Endpoint.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Endpoint.h> using namespace std; diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h index 0bf5cc3da68..b4302957204 100644 --- a/cpp/src/Ice/Endpoint.h +++ b/cpp/src/Ice/Endpoint.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ENDPOINT_H #define ICE_ENDPOINT_H diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp index c7c6188114d..8271efc937b 100644 --- a/cpp/src/Ice/EndpointFactory.cpp +++ b/cpp/src/Ice/EndpointFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/EndpointFactory.h> using namespace std; diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp index ffd2b686244..31470c58fa3 100644 --- a/cpp/src/Ice/EndpointFactoryManager.cpp +++ b/cpp/src/Ice/EndpointFactoryManager.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9d9ab4bb386..18dc410404a 100644 --- a/cpp/src/Ice/EndpointFactoryManager.h +++ b/cpp/src/Ice/EndpointFactoryManager.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 66eef2f1ba1..8ac21775d88 100644 --- a/cpp/src/Ice/EndpointFactoryManagerF.h +++ b/cpp/src/Ice/EndpointFactoryManagerF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 065d1cbd0ad..8e0c96c0d8b 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/EventHandler.h> diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index 2dc2d9a3977..a8b99b0c377 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_EVENT_HANDLER_H #define ICE_EVENT_HANDLER_H diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h index f20f048dc29..8ffb8360a5b 100644 --- a/cpp/src/Ice/EventHandlerF.h +++ b/cpp/src/Ice/EventHandlerF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 86b7168d04c..952184608c2 100755 --- a/cpp/src/Ice/EventLoggerI.cpp +++ b/cpp/src/Ice/EventLoggerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 30c3f5079b4..4e4791d3d05 100755 --- a/cpp/src/Ice/EventLoggerI.h +++ b/cpp/src/Ice/EventLoggerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8e8e42ab55a..b2a6ef7184c 100755 --- a/cpp/src/Ice/EventLoggerMsg.mc +++ b/cpp/src/Ice/EventLoggerMsg.mc @@ -1,17 +1,12 @@ ; // ********************************************************************** ; // -; // Copyright (c) 2003 - 2004 -; // ZeroC, Inc. -; // North Palm Beach, FL, USA -; // -; // All Rights Reserved. +; // Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. ; // ; // 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 0fb277a93a7..7c41e26e793 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 acbd959ff4f..b0f288517ae 100644 --- a/cpp/src/Ice/FactoryTable.cpp +++ b/cpp/src/Ice/FactoryTable.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/FactoryTable.h>
#include <Ice/UserExceptionFactory.h> diff --git a/cpp/src/Ice/FactoryTableDef.cpp b/cpp/src/Ice/FactoryTableDef.cpp index d4b59fa4ddd..2415b1af983 100644 --- a/cpp/src/Ice/FactoryTableDef.cpp +++ b/cpp/src/Ice/FactoryTableDef.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/FactoryTableDef.h> #include <Ice/UserExceptionFactory.h> diff --git a/cpp/src/Ice/IdentityUtil.cpp b/cpp/src/Ice/IdentityUtil.cpp index 8be0b3ad371..dbf59969aad 100644 --- a/cpp/src/Ice/IdentityUtil.cpp +++ b/cpp/src/Ice/IdentityUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5c9c8166067..3ceeca1e01d 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 13a23192b03..7624c20200f 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 08817b14b30..f73e4609664 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 03aca971709..fec1e81d106 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b59ad0c7d6e..f69f8b5dce4 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_INSTANCE_H #define ICE_INSTANCE_H diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp index 27191445e46..94f5ea66e7f 100644 --- a/cpp/src/Ice/LocalObject.cpp +++ b/cpp/src/Ice/LocalObject.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/LocalObject.h> using namespace std; diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index c9d5173ab3f..ab23e8f9995 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1ce223f7816..09dbaa75b7c 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOCATOR_INFO_H #define ICE_LOCATOR_INFO_H diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h index 9c4f8ea6406..e80af2fdde5 100644 --- a/cpp/src/Ice/LocatorInfoF.h +++ b/cpp/src/Ice/LocatorInfoF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 e1767d53161..aea6e956cc1 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Time.h> #include <Ice/LoggerI.h> diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h index fb4d3dc8d32..121ed1b0a11 100644 --- a/cpp/src/Ice/LoggerI.h +++ b/cpp/src/Ice/LoggerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_LOGGER_I_H #define ICE_LOGGER_I_H diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp index 244add39861..5e87c44cb5b 100644 --- a/cpp/src/Ice/LoggerUtil.cpp +++ b/cpp/src/Ice/LoggerUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/LoggerUtil.h> #include <Ice/Logger.h> diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 04080e543ca..3bf51009f09 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,Ice,$(VERSION)) diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 424b29af7f0..20a48b0d24a 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Network.h> #include <Ice/LocalException.h> diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index 36c7414151e..625112fcb57 100644 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_NETWORK_H #define ICE_NETWORK_H diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 1c09c2c5ef9..61ed16c259a 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 88fc010408b..aa0948387b2 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3a59b50aaf4..d3af10e6690 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 47815ac3157..e11d858594a 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 51c16b75265..59e3de66d2e 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 e650fc0ddc0..a5232d6a280 100644 --- a/cpp/src/Ice/ObjectFactoryManager.cpp +++ b/cpp/src/Ice/ObjectFactoryManager.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 34630d2abc5..01e974b5b88 100644 --- a/cpp/src/Ice/ObjectFactoryManager.h +++ b/cpp/src/Ice/ObjectFactoryManager.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0165bcee2ee..73f614f89e0 100644 --- a/cpp/src/Ice/ObjectFactoryManagerF.h +++ b/cpp/src/Ice/ObjectFactoryManagerF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 b5c531ee2bc..c7a0477e303 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 6dcb3c38583..82c523e047a 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 d7b0001cc3f..d9690a95a35 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 73608b6905e..fd6aad2a2a5 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 4171f41c8da..98e9c97d9e8 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 fd29b9c51f3..ac6a611224b 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROPERTIES_I_H #define ICE_PROPERTIES_I_H diff --git a/cpp/src/Ice/Protocol.h b/cpp/src/Ice/Protocol.h index d08db1bf139..65d2c3f2737 100644 --- a/cpp/src/Ice/Protocol.h +++ b/cpp/src/Ice/Protocol.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROTOCOL_H #define ICE_PROTOCOL_H diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp index f0c0830fe90..4fe1133da10 100644 --- a/cpp/src/Ice/ProtocolPluginFacade.cpp +++ b/cpp/src/Ice/ProtocolPluginFacade.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 be9fa64e428..f8d2aa9f389 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 952e58efd90..e8fcfe14bd9 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ec2f510ab4e..e4d6fe1b53e 100644 --- a/cpp/src/Ice/ProxyFactory.h +++ b/cpp/src/Ice/ProxyFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PROXY_FACTORY_H #define ICE_PROXY_FACTORY_H diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index e25a7fd0b72..6752226703c 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 2b778719588..281067adbcb 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_REFERENCE_H #define ICE_REFERENCE_H diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index 4c924aeb085..1ed3a31992e 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 d85cdebb149..6857963bf65 100644 --- a/cpp/src/Ice/ReferenceFactory.h +++ b/cpp/src/Ice/ReferenceFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_REFERENCE_FACTORY_H #define ICE_REFERENCE_FACTORY_H diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h index 5d78f8aa3c7..61e36b90e3f 100644 --- a/cpp/src/Ice/ReferenceFactoryF.h +++ b/cpp/src/Ice/ReferenceFactoryF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 77da5e8c5a9..3296f357765 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1bdecc97cb3..ca5ded0dc4b 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_ROUTER_INFO_H #define ICE_ROUTER_INFO_H diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h index 00e6402141a..ecc837e0f6d 100644 --- a/cpp/src/Ice/RouterInfoF.h +++ b/cpp/src/Ice/RouterInfoF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 fc62a3a42e0..604bc274002 100644 --- a/cpp/src/Ice/RoutingTable.cpp +++ b/cpp/src/Ice/RoutingTable.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/RoutingTable.h> #include <Ice/Proxy.h> diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp index 42c16b9fbb3..2e1bba0bb0a 100644 --- a/cpp/src/Ice/ServantManager.cpp +++ b/cpp/src/Ice/ServantManager.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 96d500c70ae..6c97d498c00 100644 --- a/cpp/src/Ice/ServantManager.h +++ b/cpp/src/Ice/ServantManager.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SERVANT_MANAGER_H #define ICE_SERVANT_MANAGER_H diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index f1c2c5fa2ad..8983298b5e4 100755 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 aa56f23c719..2a0ecf6dedd 100644 --- a/cpp/src/Ice/StringUtil.cpp +++ b/cpp/src/Ice/StringUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Config.h> #include <Ice/StringUtil.h> diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h index df46870d7c6..83d7dfb8182 100644 --- a/cpp/src/Ice/StringUtil.h +++ b/cpp/src/Ice/StringUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STRING_UTIL_H #define ICE_STRING_UTIL_H diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp index f2c21078e32..5481f388b1e 100644 --- a/cpp/src/Ice/SysLoggerI.cpp +++ b/cpp/src/Ice/SysLoggerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/SysLoggerI.h> #include <syslog.h> diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h index 72361327e33..fbfd6c3212f 100644 --- a/cpp/src/Ice/SysLoggerI.h +++ b/cpp/src/Ice/SysLoggerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 187beedacb3..8cc3feae491 100644 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e80eef8ef15..8526e112b0b 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TCP_ACCEPTOR_H #define ICE_TCP_ACCEPTOR_H diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp index d695f0d3183..4e6f52f3b93 100644 --- a/cpp/src/Ice/TcpConnector.cpp +++ b/cpp/src/Ice/TcpConnector.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c854a241938..921223505c8 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TCP_CONNECTOR_H #define ICE_TCP_CONNECTOR_H diff --git a/cpp/src/Ice/TcpEndpoint.cpp b/cpp/src/Ice/TcpEndpoint.cpp index e5ba211caff..2021e192b66 100644 --- a/cpp/src/Ice/TcpEndpoint.cpp +++ b/cpp/src/Ice/TcpEndpoint.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 dd4f511d631..8ffd76fe9ba 100644 --- a/cpp/src/Ice/TcpEndpoint.h +++ b/cpp/src/Ice/TcpEndpoint.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TCP_ENDPOINT_H #define ICE_TCP_ENDPOINT_H diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index 59b40375b2a..3cdcb3d19dd 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 bae3f6e9b74..8ad4dc52365 100644 --- a/cpp/src/Ice/TcpTransceiver.h +++ b/cpp/src/Ice/TcpTransceiver.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TCP_TRANSCEIVER_H #define ICE_TCP_TRANSCEIVER_H diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 0df54aa805b..04950ac8349 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 cb8b5a7e40b..547744e6507 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_THREAD_POOL_H #define ICE_THREAD_POOL_H diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h index 6b15b5294e8..6e3d0233811 100644 --- a/cpp/src/Ice/ThreadPoolF.h +++ b/cpp/src/Ice/ThreadPoolF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 99427753814..bf1cb42c1fe 100644 --- a/cpp/src/Ice/TraceLevels.cpp +++ b/cpp/src/Ice/TraceLevels.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/TraceLevels.h> #include <Ice/Properties.h> diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h index 99226b61a89..6b88b308907 100644 --- a/cpp/src/Ice/TraceLevels.h +++ b/cpp/src/Ice/TraceLevels.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TRACE_LEVELS_H #define ICE_TRACE_LEVELS_H diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h index ed79d86f1d6..38abf1fcd17 100644 --- a/cpp/src/Ice/TraceLevelsF.h +++ b/cpp/src/Ice/TraceLevelsF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 50e9cfddea7..9ef1a346074 100644 --- a/cpp/src/Ice/TraceUtil.cpp +++ b/cpp/src/Ice/TraceUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4e65eab6620..f79ea50cd04 100644 --- a/cpp/src/Ice/TraceUtil.h +++ b/cpp/src/Ice/TraceUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TRACE_UTIL_H #define ICE_TRACE_UTIL_H diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp index 4f4d8815f7a..23352ee2069 100644 --- a/cpp/src/Ice/Transceiver.cpp +++ b/cpp/src/Ice/Transceiver.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Transceiver.h> using namespace std; diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h index c98563ab511..c45fdd3d580 100644 --- a/cpp/src/Ice/Transceiver.h +++ b/cpp/src/Ice/Transceiver.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TRANSCEIVER_H #define ICE_TRANSCEIVER_H diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h index 556c366170e..5953490174d 100644 --- a/cpp/src/Ice/TransceiverF.h +++ b/cpp/src/Ice/TransceiverF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_TRANSCEIVER_F_H #define ICE_TRANSCEIVER_F_H diff --git a/cpp/src/Ice/UdpEndpoint.cpp b/cpp/src/Ice/UdpEndpoint.cpp index f55b3630d65..5f3314459ae 100644 --- a/cpp/src/Ice/UdpEndpoint.cpp +++ b/cpp/src/Ice/UdpEndpoint.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 beeb6f15f1a..911a5dfb2a9 100644 --- a/cpp/src/Ice/UdpEndpoint.h +++ b/cpp/src/Ice/UdpEndpoint.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UDP_ENDPOINT_H #define ICE_UDP_ENDPOINT_H diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index d3d8e360fa7..8498967f9bc 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 6e7918c3dc8..8252f543283 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UDP_TRANSCEIVER_H #define ICE_UDP_TRANSCEIVER_H diff --git a/cpp/src/Ice/UnknownEndpoint.cpp b/cpp/src/Ice/UnknownEndpoint.cpp index 1188ed06fe7..2f9bde8773a 100644 --- a/cpp/src/Ice/UnknownEndpoint.cpp +++ b/cpp/src/Ice/UnknownEndpoint.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e30579c7810..741a03aab14 100644 --- a/cpp/src/Ice/UnknownEndpoint.h +++ b/cpp/src/Ice/UnknownEndpoint.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_UNKNOWN_ENDPOINT_H #define ICE_UNKNOWN_ENDPOINT_H diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index 537f21b6866..31521d3c3bf 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <IceBox/IceBox.h> diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp index fccfb95d38d..42fb81bfaf2 100644 --- a/cpp/src/IceBox/Exception.cpp +++ b/cpp/src/IceBox/Exception.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceBox/IceBox.h> using namespace std; diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index be82aa82d0e..db079525d51 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION)) diff --git a/cpp/src/IceBox/Server.cpp b/cpp/src/IceBox/Server.cpp index e44bd1e93a4..ef8e0c9b035 100644 --- a/cpp/src/IceBox/Server.cpp +++ b/cpp/src/IceBox/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IceBox/ServiceManagerI.h> diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 8bc4d057428..c9102d2cecf 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5a22b8ea0dc..a54d9492e1b 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVICE_MANAGER_I_H #define SERVICE_MANAGER_I_H diff --git a/cpp/src/IcePack/Activator.ice b/cpp/src/IcePack/Activator.ice index 8b9e419aa24..a0c78c478d1 100644 --- a/cpp/src/IcePack/Activator.ice +++ b/cpp/src/IcePack/Activator.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_ACTIVATOR_ICE #define ICE_PACK_ACTIVATOR_ICE diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp index 3d9e6bf998a..ce640501f8e 100644 --- a/cpp/src/IcePack/ActivatorI.cpp +++ b/cpp/src/IcePack/ActivatorI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 21e4562a339..e12a8d3cb35 100644 --- a/cpp/src/IcePack/ActivatorI.h +++ b/cpp/src/IcePack/ActivatorI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_ACTIVATOR_H #define ICE_PACK_ACTIVATOR_H diff --git a/cpp/src/IcePack/AdapterFactory.cpp b/cpp/src/IcePack/AdapterFactory.cpp index 99284620a03..7000d4f5a20 100644 --- a/cpp/src/IcePack/AdapterFactory.cpp +++ b/cpp/src/IcePack/AdapterFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 2824722ba0a..ea2258b0b6f 100644 --- a/cpp/src/IcePack/AdapterFactory.h +++ b/cpp/src/IcePack/AdapterFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 23bd78a6e72..ca7d77c203e 100644 --- a/cpp/src/IcePack/AdapterI.cpp +++ b/cpp/src/IcePack/AdapterI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b960eee4638..1c7e94f68d2 100644 --- a/cpp/src/IcePack/AdapterI.h +++ b/cpp/src/IcePack/AdapterI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 61226cbe443..74bfd47e1bb 100644 --- a/cpp/src/IcePack/AdapterRegistryI.cpp +++ b/cpp/src/IcePack/AdapterRegistryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c2fb212c594..40adff7a649 100644 --- a/cpp/src/IcePack/AdapterRegistryI.h +++ b/cpp/src/IcePack/AdapterRegistryI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 574d7d1a539..31baa434e16 100644 --- a/cpp/src/IcePack/AdminI.cpp +++ b/cpp/src/IcePack/AdminI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ecee15bdf5b..b3a095b73ee 100644 --- a/cpp/src/IcePack/AdminI.h +++ b/cpp/src/IcePack/AdminI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a2955e56c24..2cdd9fe4630 100644 --- a/cpp/src/IcePack/ApplicationBuilder.cpp +++ b/cpp/src/IcePack/ApplicationBuilder.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IcePack/ApplicationBuilder.h> using namespace std; diff --git a/cpp/src/IcePack/ApplicationBuilder.h b/cpp/src/IcePack/ApplicationBuilder.h index 4ef80d90fb8..e5d3a578a40 100644 --- a/cpp/src/IcePack/ApplicationBuilder.h +++ b/cpp/src/IcePack/ApplicationBuilder.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 293378ba312..a15ac2eae0f 100644 --- a/cpp/src/IcePack/Client.cpp +++ b/cpp/src/IcePack/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <IcePack/Parser.h> #include <fstream> diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp index 9412f36a44d..2aa29dbd48a 100644 --- a/cpp/src/IcePack/ComponentBuilder.cpp +++ b/cpp/src/IcePack/ComponentBuilder.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 bdca1fdedef..d4fc957e60f 100644 --- a/cpp/src/IcePack/ComponentBuilder.h +++ b/cpp/src/IcePack/ComponentBuilder.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8e2e2472af8..be5d1e55343 100644 --- a/cpp/src/IcePack/GPL.h +++ b/cpp/src/IcePack/GPL.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_GPL_H #define ICE_GPL_H diff --git a/cpp/src/IcePack/Grammar.y b/cpp/src/IcePack/Grammar.y index 7ef7d781a2f..a571aeb8ea7 100644 --- a/cpp/src/IcePack/Grammar.y +++ b/cpp/src/IcePack/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IcePack/Parser.h> diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp index 8dfd6f73143..3cd502fdce9 100644 --- a/cpp/src/IcePack/IcePackNode.cpp +++ b/cpp/src/IcePack/IcePackNode.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 bc6bd0e0361..b539c63a1f0 100644 --- a/cpp/src/IcePack/IcePackRegistry.cpp +++ b/cpp/src/IcePack/IcePackRegistry.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e5e236a0757..7b3d7869727 100644 --- a/cpp/src/IcePack/Internal.ice +++ b/cpp/src/IcePack/Internal.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_INTERNAL_ICE #define ICE_PACK_INTERNAL_ICE diff --git a/cpp/src/IcePack/LocatorI.cpp b/cpp/src/IcePack/LocatorI.cpp index 13733373d29..354e1c5b939 100644 --- a/cpp/src/IcePack/LocatorI.cpp +++ b/cpp/src/IcePack/LocatorI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IcePack/LocatorI.h> diff --git a/cpp/src/IcePack/LocatorI.h b/cpp/src/IcePack/LocatorI.h index f321820c071..ab5ecd65123 100644 --- a/cpp/src/IcePack/LocatorI.h +++ b/cpp/src/IcePack/LocatorI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 421f9dad5d8..90eb357b43b 100644 --- a/cpp/src/IcePack/LocatorRegistryI.cpp +++ b/cpp/src/IcePack/LocatorRegistryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 363f2e2d526..d512642f3d0 100644 --- a/cpp/src/IcePack/LocatorRegistryI.h +++ b/cpp/src/IcePack/LocatorRegistryI.h @@ -1,18 +1,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 91252b7232c..c83c58b5934 100644 --- a/cpp/src/IcePack/Makefile +++ b/cpp/src/IcePack/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IcePack,$(VERSION)) diff --git a/cpp/src/IcePack/NodeI.cpp b/cpp/src/IcePack/NodeI.cpp index 7664a48e9af..4243b7ec0d1 100644 --- a/cpp/src/IcePack/NodeI.cpp +++ b/cpp/src/IcePack/NodeI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IcePack/NodeI.h> diff --git a/cpp/src/IcePack/NodeI.h b/cpp/src/IcePack/NodeI.h index 9dc2498cd96..38361cb6c80 100644 --- a/cpp/src/IcePack/NodeI.h +++ b/cpp/src/IcePack/NodeI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 7a67f06ad32..9e7963ea0bc 100644 --- a/cpp/src/IcePack/NodeInfo.cpp +++ b/cpp/src/IcePack/NodeInfo.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b2ca080d148..610f4d966f1 100644 --- a/cpp/src/IcePack/NodeInfo.h +++ b/cpp/src/IcePack/NodeInfo.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 c77905b61d1..b84d6bdcaa5 100644 --- a/cpp/src/IcePack/NodeRegistryI.cpp +++ b/cpp/src/IcePack/NodeRegistryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 851a37b4d66..d0271715de2 100644 --- a/cpp/src/IcePack/NodeRegistryI.h +++ b/cpp/src/IcePack/NodeRegistryI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 071cff8542d..8f403fb7e63 100644 --- a/cpp/src/IcePack/ObjectRegistryI.cpp +++ b/cpp/src/IcePack/ObjectRegistryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3fe40dbf00d..52973a92dcd 100644 --- a/cpp/src/IcePack/ObjectRegistryI.h +++ b/cpp/src/IcePack/ObjectRegistryI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 133db768f47..183825eb110 100644 --- a/cpp/src/IcePack/Parser.cpp +++ b/cpp/src/IcePack/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IcePack/Parser.h> diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h index 879c153a817..bfa10cd5784 100644 --- a/cpp/src/IcePack/Parser.h +++ b/cpp/src/IcePack/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_PARSER_H #define ICE_PACK_PARSER_H diff --git a/cpp/src/IcePack/QueryI.cpp b/cpp/src/IcePack/QueryI.cpp index 1354c99cb1b..a463ff1327e 100644 --- a/cpp/src/IcePack/QueryI.cpp +++ b/cpp/src/IcePack/QueryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IcePack/Internal.h> #include <IcePack/QueryI.h> diff --git a/cpp/src/IcePack/QueryI.h b/cpp/src/IcePack/QueryI.h index 708c6f5586e..174691bed4c 100644 --- a/cpp/src/IcePack/QueryI.h +++ b/cpp/src/IcePack/QueryI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 04a08c46a43..183009ae173 100644 --- a/cpp/src/IcePack/Registry.cpp +++ b/cpp/src/IcePack/Registry.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b5ec5e64a01..490f678e522 100644 --- a/cpp/src/IcePack/Registry.h +++ b/cpp/src/IcePack/Registry.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_PACK_REGISTRY_H #define ICE_PACK_REGISTRY_H diff --git a/cpp/src/IcePack/Scanner.l b/cpp/src/IcePack/Scanner.l index 6653519fd6d..a0391874da1 100644 --- a/cpp/src/IcePack/Scanner.l +++ b/cpp/src/IcePack/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3b14c7a25a8..9b4698dc9e0 100644 --- a/cpp/src/IcePack/ServerAdapterI.cpp +++ b/cpp/src/IcePack/ServerAdapterI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1fe23aef220..8f1c77aea08 100644 --- a/cpp/src/IcePack/ServerAdapterI.h +++ b/cpp/src/IcePack/ServerAdapterI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 9b6df71184b..3747926f79a 100644 --- a/cpp/src/IcePack/ServerBuilder.cpp +++ b/cpp/src/IcePack/ServerBuilder.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e2249cdf481..22f332744e8 100644 --- a/cpp/src/IcePack/ServerBuilder.h +++ b/cpp/src/IcePack/ServerBuilder.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 fd4613f23a5..5c8c7061d08 100644 --- a/cpp/src/IcePack/ServerDeployerI.cpp +++ b/cpp/src/IcePack/ServerDeployerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 d48c8c3d5fa..506cb06d177 100644 --- a/cpp/src/IcePack/ServerDeployerI.h +++ b/cpp/src/IcePack/ServerDeployerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 7e3ef512550..9eaa1bf7a3a 100644 --- a/cpp/src/IcePack/ServerFactory.cpp +++ b/cpp/src/IcePack/ServerFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 87ad9a22508..7493d302078 100644 --- a/cpp/src/IcePack/ServerFactory.h +++ b/cpp/src/IcePack/ServerFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 2ebca00f4a2..f4a9d4fd0b3 100644 --- a/cpp/src/IcePack/ServerI.cpp +++ b/cpp/src/IcePack/ServerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ad40d139ad1..97761cef2c5 100644 --- a/cpp/src/IcePack/ServerI.h +++ b/cpp/src/IcePack/ServerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 b6e1dc7cab9..a5f0bc70958 100644 --- a/cpp/src/IcePack/ServerRegistryI.cpp +++ b/cpp/src/IcePack/ServerRegistryI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 858fecb4ccc..4ed3ea573b4 100644 --- a/cpp/src/IcePack/ServerRegistryI.h +++ b/cpp/src/IcePack/ServerRegistryI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 91a78ab816a..39131265d72 100644 --- a/cpp/src/IcePack/ServiceBuilder.cpp +++ b/cpp/src/IcePack/ServiceBuilder.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 df2b3be082c..40de8fcc160 100644 --- a/cpp/src/IcePack/ServiceBuilder.h +++ b/cpp/src/IcePack/ServiceBuilder.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 887d10c4978..037683e1dd9 100644 --- a/cpp/src/IcePack/TraceLevels.cpp +++ b/cpp/src/IcePack/TraceLevels.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Properties.h> #include <IcePack/TraceLevels.h> diff --git a/cpp/src/IcePack/TraceLevels.h b/cpp/src/IcePack/TraceLevels.h index 0baf4eb9540..f8166a01d1f 100644 --- a/cpp/src/IcePack/TraceLevels.h +++ b/cpp/src/IcePack/TraceLevels.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 f68577bc4fa..79e143f33cc 100644 --- a/cpp/src/IcePack/WaitQueue.cpp +++ b/cpp/src/IcePack/WaitQueue.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IcePack/WaitQueue.h> diff --git a/cpp/src/IcePack/WaitQueue.h b/cpp/src/IcePack/WaitQueue.h index 1fbc90316fc..af563f5a919 100644 --- a/cpp/src/IcePack/WaitQueue.h +++ b/cpp/src/IcePack/WaitQueue.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 eadab101543..e7e2db9310e 100644 --- a/cpp/src/IcePatch/Calc.cpp +++ b/cpp/src/IcePatch/Calc.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IcePatch/Util.h> #include <set> diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp index 57e10b420a5..97ace976dc7 100644 --- a/cpp/src/IcePatch/Client.cpp +++ b/cpp/src/IcePatch/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 866ab16d874..07610ea2938 100644 --- a/cpp/src/IcePatch/ClientUtil.cpp +++ b/cpp/src/IcePatch/ClientUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IcePatch/Util.h> #include <IcePatch/ClientUtil.h> #include <fstream> diff --git a/cpp/src/IcePatch/FileDescFactory.cpp b/cpp/src/IcePatch/FileDescFactory.cpp index 94dae8bac0a..c43de4176f2 100644 --- a/cpp/src/IcePatch/FileDescFactory.cpp +++ b/cpp/src/IcePatch/FileDescFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IcePatch/FileDescFactory.h> using namespace std; diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp index b95bd44b8f9..3266b0bd7e4 100644 --- a/cpp/src/IcePatch/FileLocator.cpp +++ b/cpp/src/IcePatch/FileLocator.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 d83bc2e18c0..053a0cd2603 100644 --- a/cpp/src/IcePatch/FileLocator.h +++ b/cpp/src/IcePatch/FileLocator.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 130a5ff3e7f..296c90b396b 100644 --- a/cpp/src/IcePatch/IcePatchI.cpp +++ b/cpp/src/IcePatch/IcePatchI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IcePatch/IcePatchI.h> #include <IcePatch/Util.h> #include <fstream> diff --git a/cpp/src/IcePatch/IcePatchI.h b/cpp/src/IcePatch/IcePatchI.h index 059d7d5b77e..f72f17f1141 100644 --- a/cpp/src/IcePatch/IcePatchI.h +++ b/cpp/src/IcePatch/IcePatchI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 357c75cee38..534d6cfb1d3 100644 --- a/cpp/src/IcePatch/Makefile +++ b/cpp/src/IcePatch/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IcePatch,$(VERSION)) diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp index 11102c09098..b1f6bf0b098 100644 --- a/cpp/src/IcePatch/Server.cpp +++ b/cpp/src/IcePatch/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 45ce0d65748..6bb0f3b4e67 100644 --- a/cpp/src/IcePatch/Util.cpp +++ b/cpp/src/IcePatch/Util.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IcePatch/Util.h> #include <IceUtil/InputUtil.h> #include <fstream> diff --git a/cpp/src/IceSSL/BaseCerts.cpp b/cpp/src/IceSSL/BaseCerts.cpp index cd0c7b15f05..45ccda70a3a 100644 --- a/cpp/src/IceSSL/BaseCerts.cpp +++ b/cpp/src/IceSSL/BaseCerts.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/BaseCerts.h> using namespace IceSSL; diff --git a/cpp/src/IceSSL/BaseCerts.h b/cpp/src/IceSSL/BaseCerts.h index 5f39ffc49f8..e8cceff9141 100644 --- a/cpp/src/IceSSL/BaseCerts.h +++ b/cpp/src/IceSSL/BaseCerts.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 1e9829287d1..ab617167824 100644 --- a/cpp/src/IceSSL/CertificateAuthority.cpp +++ b/cpp/src/IceSSL/CertificateAuthority.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/CertificateAuthority.h> using namespace std; diff --git a/cpp/src/IceSSL/CertificateAuthority.h b/cpp/src/IceSSL/CertificateAuthority.h index 1b93824d6b0..be3029116a3 100644 --- a/cpp/src/IceSSL/CertificateAuthority.h +++ b/cpp/src/IceSSL/CertificateAuthority.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 5fbb869d03e..cb25eb092ff 100644 --- a/cpp/src/IceSSL/CertificateDesc.cpp +++ b/cpp/src/IceSSL/CertificateDesc.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/CertificateDesc.h> using namespace std; diff --git a/cpp/src/IceSSL/CertificateDesc.h b/cpp/src/IceSSL/CertificateDesc.h index 33feb112def..6f44c755dcf 100644 --- a/cpp/src/IceSSL/CertificateDesc.h +++ b/cpp/src/IceSSL/CertificateDesc.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 c9122eba122..249825b2e7f 100644 --- a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp +++ b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/CertificateVerifierOpenSSL.h> IceSSL::CertificateVerifierOpenSSL::~CertificateVerifierOpenSSL() diff --git a/cpp/src/IceSSL/ClientContext.cpp b/cpp/src/IceSSL/ClientContext.cpp index 18cd38fd36a..5b14a107307 100644 --- a/cpp/src/IceSSL/ClientContext.cpp +++ b/cpp/src/IceSSL/ClientContext.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Communicator.h> #include <Ice/LoggerUtil.h> diff --git a/cpp/src/IceSSL/ClientContext.h b/cpp/src/IceSSL/ClientContext.h index 95097f18822..6e8637f02e2 100644 --- a/cpp/src/IceSSL/ClientContext.h +++ b/cpp/src/IceSSL/ClientContext.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICESSL_CLIENT_CONTEXT_H #define ICESSL_CLIENT_CONTEXT_H diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp index f71f49411b1..b7a7eb5fe34 100644 --- a/cpp/src/IceSSL/ConfigParser.cpp +++ b/cpp/src/IceSSL/ConfigParser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 bec062aebcd..f4cc5b039e4 100644 --- a/cpp/src/IceSSL/ConfigParser.h +++ b/cpp/src/IceSSL/ConfigParser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 f046f2c9b56..5c4dd54c2b7 100644 --- a/cpp/src/IceSSL/Context.cpp +++ b/cpp/src/IceSSL/Context.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 35e9ec59ea0..ec15dbbf46a 100644 --- a/cpp/src/IceSSL/Context.h +++ b/cpp/src/IceSSL/Context.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICESSL_CONTEXT_H #define ICESSL_CONTEXT_H diff --git a/cpp/src/IceSSL/ContextF.h b/cpp/src/IceSSL/ContextF.h index 2e27e07d93d..b645f7f2ae8 100644 --- a/cpp/src/IceSSL/ContextF.h +++ b/cpp/src/IceSSL/ContextF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 86af68cc5c4..8a4b9ea0d3e 100644 --- a/cpp/src/IceSSL/Convert.cpp +++ b/cpp/src/IceSSL/Convert.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Config.h> #include <IceSSL/Convert.h> #include <iterator> diff --git a/cpp/src/IceSSL/Convert.h b/cpp/src/IceSSL/Convert.h index 12c0afe6133..45593a266b6 100644 --- a/cpp/src/IceSSL/Convert.h +++ b/cpp/src/IceSSL/Convert.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_CONVERT_H #define ICE_SSL_CONVERT_H diff --git a/cpp/src/IceSSL/DHParams.cpp b/cpp/src/IceSSL/DHParams.cpp index aa2f5e74ead..9eb6662a4d9 100644 --- a/cpp/src/IceSSL/DHParams.cpp +++ b/cpp/src/IceSSL/DHParams.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1d247a3fd24..30cf9d1a16e 100644 --- a/cpp/src/IceSSL/DHParams.h +++ b/cpp/src/IceSSL/DHParams.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_DH_PARAMS_H #define ICE_DH_PARAMS_H diff --git a/cpp/src/IceSSL/DHParamsF.h b/cpp/src/IceSSL/DHParamsF.h index 4ee09560ded..d46b47e2d52 100644 --- a/cpp/src/IceSSL/DHParamsF.h +++ b/cpp/src/IceSSL/DHParamsF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 288a99ca009..846b3add8ca 100644 --- a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp +++ b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a435dfcb06d..bb4169d4ea3 100644 --- a/cpp/src/IceSSL/DefaultCertificateVerifier.h +++ b/cpp/src/IceSSL/DefaultCertificateVerifier.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a631eaee43d..6ca78bc049f 100644 --- a/cpp/src/IceSSL/GeneralConfig.cpp +++ b/cpp/src/IceSSL/GeneralConfig.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/GeneralConfig.h> #include <string> diff --git a/cpp/src/IceSSL/GeneralConfig.h b/cpp/src/IceSSL/GeneralConfig.h index 9a6601b7d80..094ddaf09e1 100644 --- a/cpp/src/IceSSL/GeneralConfig.h +++ b/cpp/src/IceSSL/GeneralConfig.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_GENERAL_CONFIG_H #define ICE_SSL_GENERAL_CONFIG_H diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index 0d49613f08f..409591aff9f 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) diff --git a/cpp/src/IceSSL/OpenSSL.h b/cpp/src/IceSSL/OpenSSL.h index 576c66784e5..f95666b3bb2 100644 --- a/cpp/src/IceSSL/OpenSSL.h +++ b/cpp/src/IceSSL/OpenSSL.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_OPENSSL_H #define ICE_OPENSSL_H diff --git a/cpp/src/IceSSL/OpenSSLJanitors.cpp b/cpp/src/IceSSL/OpenSSLJanitors.cpp index 3431a9bf10b..6324de5cdc2 100644 --- a/cpp/src/IceSSL/OpenSSLJanitors.cpp +++ b/cpp/src/IceSSL/OpenSSLJanitors.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/OpenSSLJanitors.h> IceSSL::RSAJanitor::RSAJanitor(RSA* rsa) : diff --git a/cpp/src/IceSSL/OpenSSLJanitors.h b/cpp/src/IceSSL/OpenSSLJanitors.h index dc405f2f7a7..3f4092d056c 100644 --- a/cpp/src/IceSSL/OpenSSLJanitors.h +++ b/cpp/src/IceSSL/OpenSSLJanitors.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_JANITORS_H #define ICE_SSL_JANITORS_H diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp index 0fbe9b1701b..0d31dfda592 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.cpp +++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Mutex.h> #include <Ice/LoggerUtil.h> diff --git a/cpp/src/IceSSL/OpenSSLPluginI.h b/cpp/src/IceSSL/OpenSSLPluginI.h index e4f96d4a294..649b2ecc02c 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.h +++ b/cpp/src/IceSSL/OpenSSLPluginI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 f0e42a69144..2b9172c6ae2 100644 --- a/cpp/src/IceSSL/OpenSSLPluginIF.h +++ b/cpp/src/IceSSL/OpenSSLPluginIF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 14261af4593..54b1b2d8fbe 100644 --- a/cpp/src/IceSSL/OpenSSLUtils.cpp +++ b/cpp/src/IceSSL/OpenSSLUtils.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Mutex.h> #include <IceSSL/OpenSSLPluginI.h> diff --git a/cpp/src/IceSSL/OpenSSLUtils.h b/cpp/src/IceSSL/OpenSSLUtils.h index 4b7851e720e..10e45b22014 100644 --- a/cpp/src/IceSSL/OpenSSLUtils.h +++ b/cpp/src/IceSSL/OpenSSLUtils.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Config.h> #include <openssl/ssl.h> diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp index 160fc8e21bd..182c349766c 100644 --- a/cpp/src/IceSSL/RSACertificateGen.cpp +++ b/cpp/src/IceSSL/RSACertificateGen.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 91de5336d37..ad3277212e6 100644 --- a/cpp/src/IceSSL/RSAKeyPair.cpp +++ b/cpp/src/IceSSL/RSAKeyPair.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 731b3809fef..7af741c8edd 100644 --- a/cpp/src/IceSSL/RSAPrivateKey.cpp +++ b/cpp/src/IceSSL/RSAPrivateKey.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a70af2c24e8..7f10ba47338 100644 --- a/cpp/src/IceSSL/RSAPublicKey.cpp +++ b/cpp/src/IceSSL/RSAPublicKey.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 fd629b3d67e..ef959c6e34d 100644 --- a/cpp/src/IceSSL/ServerContext.cpp +++ b/cpp/src/IceSSL/ServerContext.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Communicator.h> #include <Ice/LoggerUtil.h> diff --git a/cpp/src/IceSSL/ServerContext.h b/cpp/src/IceSSL/ServerContext.h index aa3a658b5b1..6d412b9c495 100644 --- a/cpp/src/IceSSL/ServerContext.h +++ b/cpp/src/IceSSL/ServerContext.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICESSL_SERVER_CONTEXT_H #define ICESSL_SERVER_CONTEXT_H diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.cpp b/cpp/src/IceSSL/SingleCertificateVerifier.cpp index dcf72eddacd..5e274c008b0 100644 --- a/cpp/src/IceSSL/SingleCertificateVerifier.cpp +++ b/cpp/src/IceSSL/SingleCertificateVerifier.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c79c6bd64fc..790744d4f56 100644 --- a/cpp/src/IceSSL/SingleCertificateVerifier.h +++ b/cpp/src/IceSSL/SingleCertificateVerifier.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 27deb5c759c..da0fbae72bf 100644 --- a/cpp/src/IceSSL/SslAcceptor.cpp +++ b/cpp/src/IceSSL/SslAcceptor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/LoggerUtil.h> #include <Ice/Network.h> diff --git a/cpp/src/IceSSL/SslAcceptor.h b/cpp/src/IceSSL/SslAcceptor.h index ee49edd1cc2..9cc3e08cc18 100644 --- a/cpp/src/IceSSL/SslAcceptor.h +++ b/cpp/src/IceSSL/SslAcceptor.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_ACCEPTOR_H #define ICE_SSL_ACCEPTOR_H diff --git a/cpp/src/IceSSL/SslClientTransceiver.cpp b/cpp/src/IceSSL/SslClientTransceiver.cpp index e72250250fc..464849662a6 100644 --- a/cpp/src/IceSSL/SslClientTransceiver.cpp +++ b/cpp/src/IceSSL/SslClientTransceiver.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3ab69101d32..27a1c6af9b3 100644 --- a/cpp/src/IceSSL/SslClientTransceiver.h +++ b/cpp/src/IceSSL/SslClientTransceiver.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 88336f7aeab..ada0a5fd7eb 100644 --- a/cpp/src/IceSSL/SslConnector.cpp +++ b/cpp/src/IceSSL/SslConnector.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Logger.h> #include <Ice/Network.h> diff --git a/cpp/src/IceSSL/SslConnector.h b/cpp/src/IceSSL/SslConnector.h index 4ba4522e16b..3b2be02628c 100644 --- a/cpp/src/IceSSL/SslConnector.h +++ b/cpp/src/IceSSL/SslConnector.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_CONNECTOR_H #define ICE_SSL_CONNECTOR_H diff --git a/cpp/src/IceSSL/SslEndpoint.cpp b/cpp/src/IceSSL/SslEndpoint.cpp index cb23b0f9fa9..4102b44fa69 100644 --- a/cpp/src/IceSSL/SslEndpoint.cpp +++ b/cpp/src/IceSSL/SslEndpoint.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 10b8769b908..fe985c0db95 100644 --- a/cpp/src/IceSSL/SslEndpoint.h +++ b/cpp/src/IceSSL/SslEndpoint.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_ENDPOINT_H #define ICE_SSL_ENDPOINT_H diff --git a/cpp/src/IceSSL/SslException.cpp b/cpp/src/IceSSL/SslException.cpp index 95ed960d7b6..7d640c2828e 100644 --- a/cpp/src/IceSSL/SslException.cpp +++ b/cpp/src/IceSSL/SslException.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/LocalException.h> #include <IceSSL/Exception.h> diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp index ee3d4e5e320..3a8118e477f 100644 --- a/cpp/src/IceSSL/SslServerTransceiver.cpp +++ b/cpp/src/IceSSL/SslServerTransceiver.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1abae4d42df..04698df1ebc 100644 --- a/cpp/src/IceSSL/SslServerTransceiver.h +++ b/cpp/src/IceSSL/SslServerTransceiver.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 b457d46e1ff..38651542d12 100644 --- a/cpp/src/IceSSL/SslTransceiver.cpp +++ b/cpp/src/IceSSL/SslTransceiver.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 cccf650f016..38cbf43aa7a 100644 --- a/cpp/src/IceSSL/SslTransceiver.h +++ b/cpp/src/IceSSL/SslTransceiver.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_SSL_TRANSCEIVER_H #define ICE_SSL_TRANSCEIVER_H diff --git a/cpp/src/IceSSL/SslTransceiverF.h b/cpp/src/IceSSL/SslTransceiverF.h index 80cfbc29a87..727c9ede3aa 100644 --- a/cpp/src/IceSSL/SslTransceiverF.h +++ b/cpp/src/IceSSL/SslTransceiverF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 11a2b54e919..cf5dc4a56af 100644 --- a/cpp/src/IceSSL/TempCerts.cpp +++ b/cpp/src/IceSSL/TempCerts.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceSSL/TempCerts.h> IceSSL::TempCertificates::TempCertificates() diff --git a/cpp/src/IceSSL/TempCerts.h b/cpp/src/IceSSL/TempCerts.h index bb9ceb14f91..e93fb16d946 100644 --- a/cpp/src/IceSSL/TempCerts.h +++ b/cpp/src/IceSSL/TempCerts.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ca9622f85d6..b92fc57c72c 100644 --- a/cpp/src/IceSSL/TraceLevels.cpp +++ b/cpp/src/IceSSL/TraceLevels.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 8ef1407e361..816fba02e0b 100644 --- a/cpp/src/IceSSL/TraceLevels.h +++ b/cpp/src/IceSSL/TraceLevels.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a25e5a05bbe..cae46fa0a28 100644 --- a/cpp/src/IceSSL/TraceLevelsF.h +++ b/cpp/src/IceSSL/TraceLevelsF.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 6a7cf426b8c..c80c835a6a6 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <IceStorm/Parser.h> diff --git a/cpp/src/IceStorm/Event.h b/cpp/src/IceStorm/Event.h index e464a7f061c..593f2560882 100644 --- a/cpp/src/IceStorm/Event.h +++ b/cpp/src/IceStorm/Event.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 EVENT_H #define EVENT_H diff --git a/cpp/src/IceStorm/Flushable.h b/cpp/src/IceStorm/Flushable.h index 81e0a1e9293..48ddd61be13 100644 --- a/cpp/src/IceStorm/Flushable.h +++ b/cpp/src/IceStorm/Flushable.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 FLUSHABLE_H #define FLUSHABLE_H diff --git a/cpp/src/IceStorm/Flusher.cpp b/cpp/src/IceStorm/Flusher.cpp index a9697698781..673f112cdd1 100644 --- a/cpp/src/IceStorm/Flusher.cpp +++ b/cpp/src/IceStorm/Flusher.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 222f534363a..30fcef8ec3a 100644 --- a/cpp/src/IceStorm/Flusher.h +++ b/cpp/src/IceStorm/Flusher.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 FLUSHER_H #define FLUSHER_H diff --git a/cpp/src/IceStorm/GPL.h b/cpp/src/IceStorm/GPL.h index 8e2e2472af8..be5d1e55343 100644 --- a/cpp/src/IceStorm/GPL.h +++ b/cpp/src/IceStorm/GPL.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_GPL_H #define ICE_GPL_H diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y index b8dc5afc8e7..55e19d78cd2 100644 --- a/cpp/src/IceStorm/Grammar.y +++ b/cpp/src/IceStorm/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <IceStorm/Parser.h> diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice index 02959a6d9c9..b3197e98f3e 100644 --- a/cpp/src/IceStorm/IceStormInternal.ice +++ b/cpp/src/IceStorm/IceStormInternal.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STORM_INTERNAL_ICE #define ICE_STORM_INTERNAL_ICE diff --git a/cpp/src/IceStorm/LinkProxy.cpp b/cpp/src/IceStorm/LinkProxy.cpp index 342d5ffdeb0..22c1938c632 100644 --- a/cpp/src/IceStorm/LinkProxy.cpp +++ b/cpp/src/IceStorm/LinkProxy.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceStorm/LinkProxy.h> using namespace std; diff --git a/cpp/src/IceStorm/LinkProxy.h b/cpp/src/IceStorm/LinkProxy.h index 567a22270f9..7cce6c79785 100644 --- a/cpp/src/IceStorm/LinkProxy.h +++ b/cpp/src/IceStorm/LinkProxy.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LINK_PROXY_H #define LINK_PROXY_H diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice index faa43018fd3..4c6dbbd6fb4 100644 --- a/cpp/src/IceStorm/LinkRecord.ice +++ b/cpp/src/IceStorm/LinkRecord.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LINK_RECORD_ICE #define LINK_RECORD_ICE diff --git a/cpp/src/IceStorm/LinkSubscriber.cpp b/cpp/src/IceStorm/LinkSubscriber.cpp index e25a94b2418..34042fb9aa4 100644 --- a/cpp/src/IceStorm/LinkSubscriber.cpp +++ b/cpp/src/IceStorm/LinkSubscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 0d4d7a651ec..a058be78df1 100644 --- a/cpp/src/IceStorm/LinkSubscriber.h +++ b/cpp/src/IceStorm/LinkSubscriber.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LINK_SUBSCRIBER_H #define LINK_SUBSCRIBER_H diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 0e2cea470ea..2233924f2fa 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IceStorm,$(VERSION)) diff --git a/cpp/src/IceStorm/OnewayBatchSubscriber.cpp b/cpp/src/IceStorm/OnewayBatchSubscriber.cpp index 9ae49bbf575..cd27475ebce 100644 --- a/cpp/src/IceStorm/OnewayBatchSubscriber.cpp +++ b/cpp/src/IceStorm/OnewayBatchSubscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 fb57a042b3c..5f37f713fbd 100644 --- a/cpp/src/IceStorm/OnewayBatchSubscriber.h +++ b/cpp/src/IceStorm/OnewayBatchSubscriber.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ONEWAY_BATCH_SUBSCRIBER_H #define ONEWAY_BATCH_SUBSCRIBER_H diff --git a/cpp/src/IceStorm/OnewayProxy.cpp b/cpp/src/IceStorm/OnewayProxy.cpp index 22415a62f91..f5f0d6926ad 100644 --- a/cpp/src/IceStorm/OnewayProxy.cpp +++ b/cpp/src/IceStorm/OnewayProxy.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceStorm/OnewayProxy.h> using namespace std; diff --git a/cpp/src/IceStorm/OnewayProxy.h b/cpp/src/IceStorm/OnewayProxy.h index c70e9c2a102..cf74858337d 100644 --- a/cpp/src/IceStorm/OnewayProxy.h +++ b/cpp/src/IceStorm/OnewayProxy.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ONEWAY_PROXY_H #define ONEWAY_PROXY_H diff --git a/cpp/src/IceStorm/OnewaySubscriber.cpp b/cpp/src/IceStorm/OnewaySubscriber.cpp index c64219f79e0..4f57b88c02c 100644 --- a/cpp/src/IceStorm/OnewaySubscriber.cpp +++ b/cpp/src/IceStorm/OnewaySubscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 f7645af7032..d7c6028f15b 100644 --- a/cpp/src/IceStorm/OnewaySubscriber.h +++ b/cpp/src/IceStorm/OnewaySubscriber.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ONEWAY_SUBSCRIBER_H #define ONEWAY_SUBSCRIBER_H diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp index bfcb87777ba..17cc921b7d3 100644 --- a/cpp/src/IceStorm/Parser.cpp +++ b/cpp/src/IceStorm/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ce75ce86ba8..ad28a4bdeea 100644 --- a/cpp/src/IceStorm/Parser.h +++ b/cpp/src/IceStorm/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ICE_STORM_PARSER_H #define ICE_STORM_PARSER_H diff --git a/cpp/src/IceStorm/QueuedProxy.cpp b/cpp/src/IceStorm/QueuedProxy.cpp index c353d347569..c19e6390715 100644 --- a/cpp/src/IceStorm/QueuedProxy.cpp +++ b/cpp/src/IceStorm/QueuedProxy.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceStorm/QueuedProxy.h> using namespace std; diff --git a/cpp/src/IceStorm/QueuedProxy.h b/cpp/src/IceStorm/QueuedProxy.h index 51bb7776029..6f4c43e3c95 100644 --- a/cpp/src/IceStorm/QueuedProxy.h +++ b/cpp/src/IceStorm/QueuedProxy.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 QUEUED_PROXY_H #define QUEUED_PROXY_H diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l index c14bc0c4b50..d978c0c6d36 100644 --- a/cpp/src/IceStorm/Scanner.l +++ b/cpp/src/IceStorm/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 bb481b1c8b0..85c141473c1 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3d2435b33a1..1ec60cc36bc 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceStorm/Subscriber.h> #include <IceStorm/TraceLevels.h> diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h index acb83d65a03..1116330b763 100644 --- a/cpp/src/IceStorm/Subscriber.h +++ b/cpp/src/IceStorm/Subscriber.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SUBSCRIBER_H #define SUBSCRIBER_H diff --git a/cpp/src/IceStorm/SubscriberFactory.cpp b/cpp/src/IceStorm/SubscriberFactory.cpp index 5278159e656..eda06a6a7f9 100644 --- a/cpp/src/IceStorm/SubscriberFactory.cpp +++ b/cpp/src/IceStorm/SubscriberFactory.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b1df3af5406..23e4fd30c0e 100644 --- a/cpp/src/IceStorm/SubscriberFactory.h +++ b/cpp/src/IceStorm/SubscriberFactory.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SUBSCRIBER_FACTORY_H #define SUBSCRIBER_FACTORY_H diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 44876490676..08e444e5e2e 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 74e86b052ac..b72d3108345 100644 --- a/cpp/src/IceStorm/TopicI.h +++ b/cpp/src/IceStorm/TopicI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TOPIC_I_H #define TOPIC_I_H diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 952af4da3d4..65aaa117852 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 6c8547c6187..70cd73358ba 100644 --- a/cpp/src/IceStorm/TopicManagerI.h +++ b/cpp/src/IceStorm/TopicManagerI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TOPIC_MANAGER_I_H #define TOPIC_MANAGER_I_H diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp index c163c64d0bc..51dea3529c8 100644 --- a/cpp/src/IceStorm/TraceLevels.cpp +++ b/cpp/src/IceStorm/TraceLevels.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Properties.h> #include <IceStorm/TraceLevels.h> diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h index 8512826970e..3bf1f73df0a 100644 --- a/cpp/src/IceStorm/TraceLevels.h +++ b/cpp/src/IceStorm/TraceLevels.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 2afa7be5fb9..618ffd8a9e4 100644 --- a/cpp/src/IceStorm/WeightedGraph.cpp +++ b/cpp/src/IceStorm/WeightedGraph.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceStorm/WeightedGraph.h> #include <IceXML/Parser.h> diff --git a/cpp/src/IceStorm/WeightedGraph.h b/cpp/src/IceStorm/WeightedGraph.h index 46b9da0b6e7..91c47ad5ffd 100644 --- a/cpp/src/IceStorm/WeightedGraph.h +++ b/cpp/src/IceStorm/WeightedGraph.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 WEIGHTED_GRAPH_H #define WEIGHTED_GRAPH_H diff --git a/cpp/src/IceUtil/Base64.cpp b/cpp/src/IceUtil/Base64.cpp index a432110278e..9812a1587b7 100644 --- a/cpp/src/IceUtil/Base64.cpp +++ b/cpp/src/IceUtil/Base64.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Base64.h> #include <iostream> diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp index 312b3514aff..61a4afb8c66 100644 --- a/cpp/src/IceUtil/Cond.cpp +++ b/cpp/src/IceUtil/Cond.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Cond.h> #ifndef _WIN32 diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/IceUtil/CountDownLatch.cpp index 178b3ca2b4e..0fcca4e3f0b 100644 --- a/cpp/src/IceUtil/CountDownLatch.cpp +++ b/cpp/src/IceUtil/CountDownLatch.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/CountDownLatch.h> #include <IceUtil/ThreadException.h> diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index 0b11af63987..4e92ad5a0a7 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/CtrlCHandler.h> #include <IceUtil/StaticMutex.h> diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index e93b578949a..f2afffe8873 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Exception.h> using namespace std; diff --git a/cpp/src/IceUtil/GC.cpp b/cpp/src/IceUtil/GC.cpp index 8e1e9e33f3a..317050bd9a6 100644 --- a/cpp/src/IceUtil/GC.cpp +++ b/cpp/src/IceUtil/GC.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1b2eb54449a..060836436c5 100644 --- a/cpp/src/IceUtil/GCRecMutex.cpp +++ b/cpp/src/IceUtil/GCRecMutex.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/GCRecMutex.h> namespace IceUtil diff --git a/cpp/src/IceUtil/GCShared.cpp b/cpp/src/IceUtil/GCShared.cpp index 783d52448fc..a45b5870cf7 100644 --- a/cpp/src/IceUtil/GCShared.cpp +++ b/cpp/src/IceUtil/GCShared.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/GCShared.h> namespace IceUtil diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp index 9d71e3b2ced..ecc033ec525 100644 --- a/cpp/src/IceUtil/InputUtil.cpp +++ b/cpp/src/IceUtil/InputUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/InputUtil.h> #include <stdlib.h> #include <errno.h> diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index 20e3bca3734..37573945da2 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp index 870040959aa..661ddf98970 100644 --- a/cpp/src/IceUtil/OutputUtil.cpp +++ b/cpp/src/IceUtil/OutputUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/OutputUtil.h> using namespace std; diff --git a/cpp/src/IceUtil/RWRecMutex.cpp b/cpp/src/IceUtil/RWRecMutex.cpp index 6bf075df086..65a71965d03 100644 --- a/cpp/src/IceUtil/RWRecMutex.cpp +++ b/cpp/src/IceUtil/RWRecMutex.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1054779998d..6548cf1f91a 100644 --- a/cpp/src/IceUtil/RecMutex.cpp +++ b/cpp/src/IceUtil/RecMutex.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/RecMutex.h> #include <IceUtil/Exception.h> diff --git a/cpp/src/IceUtil/StaticMutex.cpp b/cpp/src/IceUtil/StaticMutex.cpp index 00af53e7498..44f5f465204 100644 --- a/cpp/src/IceUtil/StaticMutex.cpp +++ b/cpp/src/IceUtil/StaticMutex.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/StaticMutex.h> #include <IceUtil/ThreadException.h> diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index 220baf69595..b0311e37b53 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/StringUtil.h> using namespace std; diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp index 3bfd809c856..1e3e32c0bb0 100644 --- a/cpp/src/IceUtil/Thread.cpp +++ b/cpp/src/IceUtil/Thread.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 acc74c7fe71..0952ff66bf6 100644 --- a/cpp/src/IceUtil/ThreadException.cpp +++ b/cpp/src/IceUtil/ThreadException.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/ThreadException.h> using namespace std; diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index 7d365f820e1..9e3a1bbde93 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Time.h> #ifdef _WIN32 diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp index 82a341f82d6..0654c81a1b6 100644 --- a/cpp/src/IceUtil/UUID.cpp +++ b/cpp/src/IceUtil/UUID.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 31cf54cc56d..af3904f4f3b 100644 --- a/cpp/src/IceUtil/Unicode.cpp +++ b/cpp/src/IceUtil/Unicode.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Unicode.h> #include <algorithm> diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile index a37a7ec8891..af762460c96 100644 --- a/cpp/src/IceXML/Makefile +++ b/cpp/src/IceXML/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,IceXML,$(VERSION)) diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp index 647d73af588..1951361e976 100644 --- a/cpp/src/IceXML/Parser.cpp +++ b/cpp/src/IceXML/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceXML/Parser.h> #include <expat.h> #include <list> diff --git a/cpp/src/Makefile b/cpp/src/Makefile index 8f348a8b758..704ecfa1565 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = .. include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 58ae8503265..a503f0532b5 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/CPlusPlusUtil.h> using namespace std; diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 64f8037e634..6027c015346 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/CsUtil.h> #include <IceUtil/Functional.h> diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 05ace116581..f0e8604ffc5 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/GrammarUtil.h> #include <IceUtil/UUID.h> diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index bb3324f0861..b23dfdeee6b 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SLICE_GRAMMAR_UTIL_H #define SLICE_GRAMMAR_UTIL_H diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 7e213e49fb7..9daefd0b2c0 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/JavaUtil.h> #include <IceUtil/Functional.h> diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index d0b3f029d7c..64824ed5c44 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. LIBFILENAME = $(call mklibfilename,Slice,$(VERSION)) diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 71be398148f..10b62ce9a86 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 15cb5e19e8e..7c736eb13df 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <algorithm> diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index 13e3983d715..76525a689a5 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a6b4a82e0f9..8b1b5585863 100644 --- a/cpp/src/icecpp/Makefile +++ b/cpp/src/icecpp/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 dabec0f95f4..09d3a211cc9 100644 --- a/cpp/src/icecpp/config.h +++ b/cpp/src/icecpp/config.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 6ae7c222962..15c409a0ffe 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 24c2fbae9a5..9787eb51610 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GEN_H #define GEN_H diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 9a84a4d31c8..9655c1c2068 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <Gen.h> diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index 129d6a6ae4d..b8d1fed0910 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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/slice2cpp diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 41c3230ccb4..4e18b7abc86 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Functional.h> #include <Gen.h> #include <limits> diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index 96a83e5bd55..13c5a96a28c 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GEN_H #define GEN_H diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index 036c4060de8..36f999429bf 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <Gen.h> diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile index c2936899ebe..7c67b30dba1 100644 --- a/cpp/src/slice2cs/Makefile +++ b/cpp/src/slice2cs/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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/slice2cs diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp index 8151fa2d008..14357189587 100644 --- a/cpp/src/slice2docbook/Gen.cpp +++ b/cpp/src/slice2docbook/Gen.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Functional.h> #include <Gen.h> diff --git a/cpp/src/slice2docbook/Gen.h b/cpp/src/slice2docbook/Gen.h index f49dc522b03..284f8f87dd8 100644 --- a/cpp/src/slice2docbook/Gen.h +++ b/cpp/src/slice2docbook/Gen.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GEN_H #define GEN_H diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp index f9e79fdd48b..a48fb324789 100644 --- a/cpp/src/slice2docbook/Main.cpp +++ b/cpp/src/slice2docbook/Main.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <Gen.h> diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile index 25e5a71c665..c8949820cf7 100644 --- a/cpp/src/slice2docbook/Makefile +++ b/cpp/src/slice2docbook/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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/slice2docbook diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 4a42d917f62..96907c2e5b7 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <Slice/CPlusPlusUtil.h> #include <IceUtil/OutputUtil.h> diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile index d637eed2b5e..4901ef548e8 100644 --- a/cpp/src/slice2freeze/Makefile +++ b/cpp/src/slice2freeze/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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/slice2freeze diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 22e9c20befb..6fb84317128 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <Slice/JavaUtil.h> diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile index 1e1923bd314..0c8db2e6739 100644 --- a/cpp/src/slice2freezej/Makefile +++ b/cpp/src/slice2freezej/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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/slice2freezej diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 83d293377ab..7a065c91502 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 b06e9ddbab0..d088804064a 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 GEN_H #define GEN_H diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 9f159e8254a..1e5d888b23e 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Slice/Preprocessor.h> #include <Gen.h> diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile index 8efc35e0341..77acc951b98 100644 --- a/cpp/src/slice2java/Makefile +++ b/cpp/src/slice2java/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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/slice2java diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile index 81096ebe07f..0b7fcf64afd 100644 --- a/cpp/test/Freeze/Makefile +++ b/cpp/test/Freeze/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp index c5d8c5e17bb..2f8d30aa53a 100644 --- a/cpp/test/Freeze/complex/Client.cpp +++ b/cpp/test/Freeze/complex/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 859e89515a1..8833c45ac95 100644 --- a/cpp/test/Freeze/complex/Complex.ice +++ b/cpp/test/Freeze/complex/Complex.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b867867ef6d..ccb7d6915c3 100644 --- a/cpp/test/Freeze/complex/Grammar.y +++ b/cpp/test/Freeze/complex/Grammar.y @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <NodeI.h> #include <Parser.h> diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index abe21644f51..0b3d1b06aed 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Freeze/complex/NodeI.h b/cpp/test/Freeze/complex/NodeI.h index 85aaccc7bcd..dfa77255e27 100644 --- a/cpp/test/Freeze/complex/NodeI.h +++ b/cpp/test/Freeze/complex/NodeI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 NODE_I_H #define NODE_I_H diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp index 73717c203b0..6fb3e390b43 100644 --- a/cpp/test/Freeze/complex/Parser.cpp +++ b/cpp/test/Freeze/complex/Parser.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Parser.h> using namespace std; diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h index 24468b84831..96ff4c69ff4 100644 --- a/cpp/test/Freeze/complex/Parser.h +++ b/cpp/test/Freeze/complex/Parser.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PARSER_H #define PARSER_H diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l index fbc29ed7a83..351abf60c8d 100644 --- a/cpp/test/Freeze/complex/Scanner.l +++ b/cpp/test/Freeze/complex/Scanner.l @@ -2,18 +2,13 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1a04fbfa95f..0c37e77359a 100755 --- a/cpp/test/Freeze/complex/run.py +++ b/cpp/test/Freeze/complex/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 b4a2f9917a7..b21a0807fe4 100644 --- a/cpp/test/Freeze/dbmap/Client.cpp +++ b/cpp/test/Freeze/dbmap/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 06978ff021e..519b298e451 100644 --- a/cpp/test/Freeze/dbmap/Makefile +++ b/cpp/test/Freeze/dbmap/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py index acef03da659..9cc9cd8ed39 100755 --- a/cpp/test/Freeze/dbmap/run.py +++ b/cpp/test/Freeze/dbmap/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 0a60b3ae6ee..65505c7a39f 100644 --- a/cpp/test/Freeze/evictor/Client.cpp +++ b/cpp/test/Freeze/evictor/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4a417b141aa..afc09576dee 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index 8188f5cfdd0..18c9f811464 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 728d0a4bf19..331a41184a7 100644 --- a/cpp/test/Freeze/evictor/Test.ice +++ b/cpp/test/Freeze/evictor/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp index 8676ffb9398..2ec6c99db50 100644 --- a/cpp/test/Freeze/evictor/TestI.cpp +++ b/cpp/test/Freeze/evictor/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 12e0bc75c77..19b8bfbfc2b 100644 --- a/cpp/test/Freeze/evictor/TestI.h +++ b/cpp/test/Freeze/evictor/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py index 4f55468b362..e2feaa55b56 100755 --- a/cpp/test/Freeze/evictor/run.py +++ b/cpp/test/Freeze/evictor/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 425c5f2f5ed..c4f8b357c07 100644 --- a/cpp/test/FreezeScript/Makefile +++ b/cpp/test/FreezeScript/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile index 03143bff480..f36f22aeff3 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ b/cpp/test/FreezeScript/dbmap/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = makedb diff --git a/cpp/test/FreezeScript/dbmap/makedb.cpp b/cpp/test/FreezeScript/dbmap/makedb.cpp index c5a17846942..dcda6f5cd3e 100644 --- a/cpp/test/FreezeScript/dbmap/makedb.cpp +++ b/cpp/test/FreezeScript/dbmap/makedb.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 2e19c15c2ea..6ed553d5279 100755 --- a/cpp/test/FreezeScript/dbmap/run.py +++ b/cpp/test/FreezeScript/dbmap/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 aaee7bab525..a718e27d627 100644 --- a/cpp/test/FreezeScript/evictor/Makefile +++ b/cpp/test/FreezeScript/evictor/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = makedb diff --git a/cpp/test/FreezeScript/evictor/makedb.cpp b/cpp/test/FreezeScript/evictor/makedb.cpp index 664e266958d..ef8f575fdb5 100644 --- a/cpp/test/FreezeScript/evictor/makedb.cpp +++ b/cpp/test/FreezeScript/evictor/makedb.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a67668b83d7..8812a486cd8 100755 --- a/cpp/test/FreezeScript/evictor/run.py +++ b/cpp/test/FreezeScript/evictor/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 bc5f886511c..dc14bc827f0 100644 --- a/cpp/test/Glacier/Makefile +++ b/cpp/test/Glacier/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/Glacier/starter/Callback.ice b/cpp/test/Glacier/starter/Callback.ice index 5df246bbb52..fb56ee553d1 100644 --- a/cpp/test/Glacier/starter/Callback.ice +++ b/cpp/test/Glacier/starter/Callback.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CALLBACK_ICE #define CALLBACK_ICE diff --git a/cpp/test/Glacier/starter/CallbackI.cpp b/cpp/test/Glacier/starter/CallbackI.cpp index 3942120033c..2a5be3f93cf 100644 --- a/cpp/test/Glacier/starter/CallbackI.cpp +++ b/cpp/test/Glacier/starter/CallbackI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <CallbackI.h> diff --git a/cpp/test/Glacier/starter/CallbackI.h b/cpp/test/Glacier/starter/CallbackI.h index a8c37504bb1..91d92458313 100644 --- a/cpp/test/Glacier/starter/CallbackI.h +++ b/cpp/test/Glacier/starter/CallbackI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CALLBACK_I_H #define CALLBACK_I_H diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp index 98a03c5bd3f..b514c249f1c 100644 --- a/cpp/test/Glacier/starter/Client.cpp +++ b/cpp/test/Glacier/starter/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 556a13ea46f..635d3b4f549 100644 --- a/cpp/test/Glacier/starter/Makefile +++ b/cpp/test/Glacier/starter/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Glacier/starter/Server.cpp b/cpp/test/Glacier/starter/Server.cpp index c6ea155677e..2fe64be5a45 100644 --- a/cpp/test/Glacier/starter/Server.cpp +++ b/cpp/test/Glacier/starter/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <CallbackI.h> diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py index 18581f6e93a..f1e8de06996 100755 --- a/cpp/test/Glacier/starter/run.py +++ b/cpp/test/Glacier/starter/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 c1d52ef40bb..336afff52f8 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 98dbabbe984..58fd09951d9 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 291c70c5853..e11d09a5d62 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c3efca7f41f..7510e04c6a4 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Application.h> #include <ServantLocatorI.h> #include <TestCommon.h> diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile index 62ad9806000..773dc6ceedf 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile +++ b/cpp/test/Ice/adapterDeactivation/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp index 0c159c02665..af6d58f6a4c 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ff851fd9d49..502f010dee5 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 f06060417b8..d8de3827110 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 a3b0d2a4cca..61e539de9be 100644 --- a/cpp/test/Ice/adapterDeactivation/Test.ice +++ b/cpp/test/Ice/adapterDeactivation/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp index d111c693d94..05cffcf9d88 100644 --- a/cpp/test/Ice/adapterDeactivation/TestI.cpp +++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 f2131b24255..73b75a0bb8e 100644 --- a/cpp/test/Ice/adapterDeactivation/TestI.h +++ b/cpp/test/Ice/adapterDeactivation/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py index 9c8cf6abcf6..d00bb45d415 100755 --- a/cpp/test/Ice/adapterDeactivation/run.py +++ b/cpp/test/Ice/adapterDeactivation/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 19dccabad57..d563d5251f3 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 0100258e7ee..990b074a80f 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 cf1516e56b3..267677062e9 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile index 332c563bf02..3122dc75fb4 100644 --- a/cpp/test/Ice/exceptions/Makefile +++ b/cpp/test/Ice/exceptions/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index b3a8c39e607..cf70dffebb0 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 9593e79f1bc..d2122d5e85e 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestAMDI.h> diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice index 6fe30d34edc..814de090d12 100644 --- a/cpp/test/Ice/exceptions/Test.ice +++ b/cpp/test/Ice/exceptions/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 327b89df9e1..4195793c995 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index 48e8475ead3..41b9f08d8d8 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestAMDI.h> diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h index 36fb756e307..bdfb3132e76 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.h +++ b/cpp/test/Ice/exceptions/TestAMDI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp index 96d1a5b4369..a5696ec828f 100644 --- a/cpp/test/Ice/exceptions/TestI.cpp +++ b/cpp/test/Ice/exceptions/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h index e0a5982bd6c..c0014dae7ed 100644 --- a/cpp/test/Ice/exceptions/TestI.h +++ b/cpp/test/Ice/exceptions/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py index 76a4f6c77a3..6daa62a165f 100755 --- a/cpp/test/Ice/exceptions/run.py +++ b/cpp/test/Ice/exceptions/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 16c3744ddbc..2d158fbf4ce 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 482a4634a2e..ff88f942b96 100644 --- a/cpp/test/Ice/facets/Client.cpp +++ b/cpp/test/Ice/facets/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 219bfb27d38..2dd0aed44b6 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/facets/Makefile b/cpp/test/Ice/facets/Makefile index fe3a1a85a09..ec10e0c12e1 100644 --- a/cpp/test/Ice/facets/Makefile +++ b/cpp/test/Ice/facets/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index fad55a1fde3..97ba8a04214 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice index e8f202bff53..adfcb0b9c31 100644 --- a/cpp/test/Ice/facets/Test.ice +++ b/cpp/test/Ice/facets/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp index cb3393552e2..3f580ef8ec7 100644 --- a/cpp/test/Ice/facets/TestI.cpp +++ b/cpp/test/Ice/facets/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h index a3e0d45d002..e3b9a6d132b 100644 --- a/cpp/test/Ice/facets/TestI.h +++ b/cpp/test/Ice/facets/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py index f850ddef920..5ac24685e78 100755 --- a/cpp/test/Ice/facets/run.py +++ b/cpp/test/Ice/facets/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 547f62fd082..efbd59dbc17 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 953a4125c26..054fa0b9c46 100644 --- a/cpp/test/Ice/faultTolerance/Client.cpp +++ b/cpp/test/Ice/faultTolerance/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestCommon.h> #include <Test.h> diff --git a/cpp/test/Ice/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile index 0b130f407e7..6552056e0a4 100644 --- a/cpp/test/Ice/faultTolerance/Makefile +++ b/cpp/test/Ice/faultTolerance/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index c1dd94e6e58..94ffbdb6448 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice index 15fa8e63042..aa61a3d687f 100644 --- a/cpp/test/Ice/faultTolerance/Test.ice +++ b/cpp/test/Ice/faultTolerance/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp index b04baadbd52..12551b866d8 100644 --- a/cpp/test/Ice/faultTolerance/TestI.cpp +++ b/cpp/test/Ice/faultTolerance/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h index 5f47ab2fc28..b9cd2fee481 100644 --- a/cpp/test/Ice/faultTolerance/TestI.h +++ b/cpp/test/Ice/faultTolerance/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index 18077d5c05d..d3882612077 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 f49cc219bb8..8249ec0aaa3 100644 --- a/cpp/test/Ice/gc/Client.cpp +++ b/cpp/test/Ice/gc/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 0405b6155e8..6723fa657ea 100644 --- a/cpp/test/Ice/gc/Makefile +++ b/cpp/test/Ice/gc/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice index fa01b865d5d..ac8315b1ce4 100644 --- a/cpp/test/Ice/gc/Test.ice +++ b/cpp/test/Ice/gc/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py index 1a12fe870a5..b9d43f19736 100755 --- a/cpp/test/Ice/gc/run.py +++ b/cpp/test/Ice/gc/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 26545cc6493..0d1429a56a8 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 83b6e270da4..dc3b3686645 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 0631f6271bb..4d44ce4f043 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile index fe3a1a85a09..ec10e0c12e1 100644 --- a/cpp/test/Ice/inheritance/Makefile +++ b/cpp/test/Ice/inheritance/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index d7f269e9534..f1b57b06644 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice index a5bcdd48d5c..db8df3320c5 100644 --- a/cpp/test/Ice/inheritance/Test.ice +++ b/cpp/test/Ice/inheritance/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp index 052395c55a8..6aeb20763dc 100644 --- a/cpp/test/Ice/inheritance/TestI.cpp +++ b/cpp/test/Ice/inheritance/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h index 4f36b2ec572..ed0638a2ee1 100644 --- a/cpp/test/Ice/inheritance/TestI.h +++ b/cpp/test/Ice/inheritance/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TESTI_H #define TESTI_H diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py index 7e5c3fdb887..9e134d09e8a 100755 --- a/cpp/test/Ice/inheritance/run.py +++ b/cpp/test/Ice/inheritance/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 6eeb9643c13..1a59bd50aca 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5e4cebfca84..7312a64d712 100644 --- a/cpp/test/Ice/location/Client.cpp +++ b/cpp/test/Ice/location/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7d35d7d6176..a65fa959194 100644 --- a/cpp/test/Ice/location/Collocated.cpp +++ b/cpp/test/Ice/location/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/location/Makefile b/cpp/test/Ice/location/Makefile index 48917843d10..63232cfcc3a 100644 --- a/cpp/test/Ice/location/Makefile +++ b/cpp/test/Ice/location/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index 95eaffbf142..67eae609f29 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 22932bfbec7..2a3b05c1694 100644 --- a/cpp/test/Ice/location/ServerLocator.cpp +++ b/cpp/test/Ice/location/ServerLocator.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9b69cc46167..08e895741fe 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVER_LOCATOR_H #define SERVER_LOCATOR_H diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice index df89980dfa3..03f7b371bf9 100644 --- a/cpp/test/Ice/location/Test.ice +++ b/cpp/test/Ice/location/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 524f704d2d7..02ea1c89c43 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3fae64a6433..b3d5662b152 100644 --- a/cpp/test/Ice/location/TestI.h +++ b/cpp/test/Ice/location/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py index 2b5e2a209ad..f35b02a6499 100755 --- a/cpp/test/Ice/location/run.py +++ b/cpp/test/Ice/location/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 69a8789105c..375885d7bb8 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5e75d122ea7..0a50ec3ccc4 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 53b4a28ae32..ae373c4c156 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile index 14495be3060..487a31203d7 100644 --- a/cpp/test/Ice/objects/Makefile +++ b/cpp/test/Ice/objects/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 5b6947a9055..908658ba974 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice index 5e2c75bca60..3f57616f160 100644 --- a/cpp/test/Ice/objects/Test.ice +++ b/cpp/test/Ice/objects/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index 995cd3fc1be..e4025efdce7 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index b7f13159f95..d28c18dd5f1 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py index 3bf88cb9c1b..9003cf1dd63 100755 --- a/cpp/test/Ice/objects/run.py +++ b/cpp/test/Ice/objects/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 2a434e12bf3..7e70f85a7c0 100644 --- a/cpp/test/Ice/operations/AllTests.cpp +++ b/cpp/test/Ice/operations/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7e5aeb54de1..d43deacf936 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 466e9a4ff6b..041274f7050 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/operations/Makefile b/cpp/test/Ice/operations/Makefile index 2fd0648ba35..4d21bcabe9c 100644 --- a/cpp/test/Ice/operations/Makefile +++ b/cpp/test/Ice/operations/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index e97a29dee25..8bfac161335 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index 48982e820db..939bb4a0fe0 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestAMDI.h> diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index 0910350a530..a819ad845a5 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice index 31593f263a8..e6f7f4f205d 100644 --- a/cpp/test/Ice/operations/TestAMD.ice +++ b/cpp/test/Ice/operations/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index c80e8cd19be..385fe10ce3f 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5a0c1942199..abeb22d6a45 100644 --- a/cpp/test/Ice/operations/TestAMDI.h +++ b/cpp/test/Ice/operations/TestAMDI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ad4c3e5aa94..c4854d6bd97 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9d499a48803..12de3c380f4 100644 --- a/cpp/test/Ice/operations/TestI.h +++ b/cpp/test/Ice/operations/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index fd3fd03bd19..ea88277ff74 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 33132f5f18f..cfd5422903e 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 027ba88fe66..c75c6ae20d2 100755 --- a/cpp/test/Ice/operations/run.py +++ b/cpp/test/Ice/operations/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 6ee713c95e1..a310b9b14d2 100644 --- a/cpp/test/Ice/slicing/Makefile +++ b/cpp/test/Ice/slicing/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. 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 9bd4738616f..da6bc5ca55e 100644 --- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp +++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 150ddf0836e..afd4f697e01 100644 --- a/cpp/test/Ice/slicing/exceptions/Client.cpp +++ b/cpp/test/Ice/slicing/exceptions/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 9b2e3ae4be7..d7882510c19 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile +++ b/cpp/test/Ice/slicing/exceptions/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../../.. CLIENT = client diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 3ddc2258a72..68a7e938911 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e9306d1b91f..4d75bee7e11 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 343dbce5f88..7fb5f592869 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVERPRIVATE_ICE #define SERVERPRIVATE_ICE diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index 08e45b35f37..9426a0c9273 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVERPRIVATEAMD_ICE #define SERVERPRIVATEAMD_ICE diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice index d2543d47aac..cc3e8b3f85f 100644 --- a/cpp/test/Ice/slicing/exceptions/Test.ice +++ b/cpp/test/Ice/slicing/exceptions/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice index 4cce716566c..54f3dca65ec 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice +++ b/cpp/test/Ice/slicing/exceptions/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 75e009cb52d..9a54e0dc347 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 6da5fee592b..1eb34729a1b 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TESTAMDI_H #define TESTAMDI_H diff --git a/cpp/test/Ice/slicing/exceptions/TestI.cpp b/cpp/test/Ice/slicing/exceptions/TestI.cpp index 76d71390cd4..4f04f203eb7 100644 --- a/cpp/test/Ice/slicing/exceptions/TestI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 aa807b7d349..f7de3b0da5d 100644 --- a/cpp/test/Ice/slicing/exceptions/TestI.h +++ b/cpp/test/Ice/slicing/exceptions/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TESTI_H #define TESTI_H diff --git a/cpp/test/Ice/slicing/exceptions/run.py b/cpp/test/Ice/slicing/exceptions/run.py index c716e9bea5b..d3ba673ed15 100755 --- a/cpp/test/Ice/slicing/exceptions/run.py +++ b/cpp/test/Ice/slicing/exceptions/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 e2c0c190691..53bf7758a01 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c22dea27a7f..5d65ddc55a4 100644 --- a/cpp/test/Ice/slicing/objects/Client.cpp +++ b/cpp/test/Ice/slicing/objects/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 7e583dfe238..c32c2495f52 100644 --- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice +++ b/cpp/test/Ice/slicing/objects/ClientPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CLIENTPRIVATE_ICE #define CLIENTPRIVATE_ICE diff --git a/cpp/test/Ice/slicing/objects/Forward.ice b/cpp/test/Ice/slicing/objects/Forward.ice index 4db43058410..74ae4b8c7e0 100644 --- a/cpp/test/Ice/slicing/objects/Forward.ice +++ b/cpp/test/Ice/slicing/objects/Forward.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 FORWARD_ICE #define FORWARD_ICE diff --git a/cpp/test/Ice/slicing/objects/Makefile b/cpp/test/Ice/slicing/objects/Makefile index c4b19a9a337..df526dbb91b 100644 --- a/cpp/test/Ice/slicing/objects/Makefile +++ b/cpp/test/Ice/slicing/objects/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../../.. CLIENT = client diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index 3ddc2258a72..68a7e938911 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 e9306d1b91f..4d75bee7e11 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 d0ebdefbe16..b963d10122d 100644 --- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice +++ b/cpp/test/Ice/slicing/objects/ServerPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SERVERPRIVATE_ICE #define SERVERPRIVATE_ICE diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice index d385e2849f0..07e05c6a76b 100644 --- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a20f048ad34..3817f608833 100644 --- a/cpp/test/Ice/slicing/objects/Test.ice +++ b/cpp/test/Ice/slicing/objects/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/Ice/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice index c4815a7cdaf..b68706f831e 100644 --- a/cpp/test/Ice/slicing/objects/TestAMD.ice +++ b/cpp/test/Ice/slicing/objects/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 6beed12016a..9915f35c06c 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 556866d7ea2..0fa7f350990 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.h +++ b/cpp/test/Ice/slicing/objects/TestAMDI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TESTI_H #define TESTI_H diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp index 739b0b083e6..1deb66fe725 100644 --- a/cpp/test/Ice/slicing/objects/TestI.cpp +++ b/cpp/test/Ice/slicing/objects/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 ff53ae76ec3..5eda53d47f1 100644 --- a/cpp/test/Ice/slicing/objects/TestI.h +++ b/cpp/test/Ice/slicing/objects/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TESTI_H #define TESTI_H diff --git a/cpp/test/Ice/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py index 9ee46724944..8b778b11ec1 100755 --- a/cpp/test/Ice/slicing/objects/run.py +++ b/cpp/test/Ice/slicing/objects/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 4451caffc0b..247476d8b4b 100644 --- a/cpp/test/IcePack/Makefile +++ b/cpp/test/IcePack/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp index 023f271280a..dadf9a923ae 100644 --- a/cpp/test/IcePack/deployer/AllTests.cpp +++ b/cpp/test/IcePack/deployer/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 63247e4db6f..0e27007fa79 100644 --- a/cpp/test/IcePack/deployer/Client.cpp +++ b/cpp/test/IcePack/deployer/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestCommon.h> #include <Test.h> diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile index 2b55615a783..61f5b97e486 100644 --- a/cpp/test/IcePack/deployer/Makefile +++ b/cpp/test/IcePack/deployer/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IcePack/deployer/Server.cpp b/cpp/test/IcePack/deployer/Server.cpp index 6a306710fd7..4b6486cf1ce 100644 --- a/cpp/test/IcePack/deployer/Server.cpp +++ b/cpp/test/IcePack/deployer/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 3c4e35f2ae8..7a5986804c0 100644 --- a/cpp/test/IcePack/deployer/Service.cpp +++ b/cpp/test/IcePack/deployer/Service.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 19578e1c328..04841b0d1db 100644 --- a/cpp/test/IcePack/deployer/Test.ice +++ b/cpp/test/IcePack/deployer/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/IcePack/deployer/TestI.cpp b/cpp/test/IcePack/deployer/TestI.cpp index 7620b9f8d84..eb0ad880816 100644 --- a/cpp/test/IcePack/deployer/TestI.cpp +++ b/cpp/test/IcePack/deployer/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/IcePack/deployer/TestI.h b/cpp/test/IcePack/deployer/TestI.h index 0e041f2e2ed..d760ad720b7 100644 --- a/cpp/test/IcePack/deployer/TestI.h +++ b/cpp/test/IcePack/deployer/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py index 8173de5ecde..b05f102cd24 100755 --- a/cpp/test/IcePack/deployer/run.py +++ b/cpp/test/IcePack/deployer/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 7e9ce0e56e7..eeb8592b0e6 100644 --- a/cpp/test/IcePack/simple/AllTests.cpp +++ b/cpp/test/IcePack/simple/AllTests.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 fef908b4497..5ff301d7ac0 100644 --- a/cpp/test/IcePack/simple/Client.cpp +++ b/cpp/test/IcePack/simple/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestCommon.h> #include <Test.h> diff --git a/cpp/test/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile index eff57c7affc..ec672b6d689 100644 --- a/cpp/test/IcePack/simple/Makefile +++ b/cpp/test/IcePack/simple/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IcePack/simple/Server.cpp b/cpp/test/IcePack/simple/Server.cpp index 92c9e780ffa..f36f564778b 100644 --- a/cpp/test/IcePack/simple/Server.cpp +++ b/cpp/test/IcePack/simple/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/IcePack/simple/Test.ice b/cpp/test/IcePack/simple/Test.ice index 65fe5377ad3..54953223857 100644 --- a/cpp/test/IcePack/simple/Test.ice +++ b/cpp/test/IcePack/simple/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/cpp/test/IcePack/simple/TestI.cpp b/cpp/test/IcePack/simple/TestI.cpp index b109574486f..10f2ecade27 100644 --- a/cpp/test/IcePack/simple/TestI.cpp +++ b/cpp/test/IcePack/simple/TestI.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <Ice/Ice.h> #include <TestI.h> diff --git a/cpp/test/IcePack/simple/TestI.h b/cpp/test/IcePack/simple/TestI.h index 3b0e03dbc91..59790712392 100644 --- a/cpp/test/IcePack/simple/TestI.h +++ b/cpp/test/IcePack/simple/TestI.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_I_H #define TEST_I_H diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py index 30083d573b9..4ee135a8960 100755 --- a/cpp/test/IcePack/simple/run.py +++ b/cpp/test/IcePack/simple/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 1bc382f1f22..280308ff067 100644 --- a/cpp/test/IceSSL/Makefile +++ b/cpp/test/IceSSL/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp index 4da8f9d9489..fc39a26a30e 100644 --- a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp +++ b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 94eef934be3..40fadf39333 100644 --- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile +++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = certificateAndKeyParsing diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py index bb23ad244d9..6ba36e6e744 100755 --- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py +++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 5107fc72104..60505c4ba02 100644 --- a/cpp/test/IceSSL/certificateVerification/Client.cpp +++ b/cpp/test/IceSSL/certificateVerification/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5393adfaf2a..e558ada2de5 100644 --- a/cpp/test/IceSSL/certificateVerification/Makefile +++ b/cpp/test/IceSSL/certificateVerification/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IceSSL/certificateVerification/Pinger.ice b/cpp/test/IceSSL/certificateVerification/Pinger.ice index 401ef8198e6..8fbe12b4b27 100644 --- a/cpp/test/IceSSL/certificateVerification/Pinger.ice +++ b/cpp/test/IceSSL/certificateVerification/Pinger.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PINGER_ICE #define PINGER_ICE diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp index 6134df1960d..b5bc762bd6a 100644 --- a/cpp/test/IceSSL/certificateVerification/Server.cpp +++ b/cpp/test/IceSSL/certificateVerification/Server.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 035efe4b9dd..6559f3b6ea5 100755 --- a/cpp/test/IceSSL/certificateVerification/run.py +++ b/cpp/test/IceSSL/certificateVerification/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 9a53978453d..e7153a12ce4 100644 --- a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp +++ b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 01f627730f5..405d4600baa 100644 --- a/cpp/test/IceSSL/certificateVerifier/Makefile +++ b/cpp/test/IceSSL/certificateVerifier/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = certificateVerifier diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py index 0aa389acfaf..2cfb1fdda42 100755 --- a/cpp/test/IceSSL/certificateVerifier/run.py +++ b/cpp/test/IceSSL/certificateVerifier/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 eae0eee57cb..62d825a6cc2 100644 --- a/cpp/test/IceSSL/configuration/Configuration.cpp +++ b/cpp/test/IceSSL/configuration/Configuration.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 2f720084158..e36a881b098 100644 --- a/cpp/test/IceSSL/configuration/Makefile +++ b/cpp/test/IceSSL/configuration/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = configuration diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index 291aa2fdf63..90bd44d0186 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 4290f5404c7..7108a09b26a 100644 --- a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp +++ b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 37d24b4b91e..9165ca6c55a 100644 --- a/cpp/test/IceSSL/loadPEM/Makefile +++ b/cpp/test/IceSSL/loadPEM/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = loadPEM diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py index 3804058d88a..89f0d37f0ba 100755 --- a/cpp/test/IceSSL/loadPEM/run.py +++ b/cpp/test/IceSSL/loadPEM/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 411b7dc5666..9ab36926cb0 100644 --- a/cpp/test/IceStorm/Makefile +++ b/cpp/test/IceStorm/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice index c581aa6c606..82f18651871 100644 --- a/cpp/test/IceStorm/federation/Event.ice +++ b/cpp/test/IceStorm/federation/Event.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 EVENT_ICE #define EVENT_ICE diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 9883d812633..07a5abc04aa 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. PUBLISHER = publisher diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp index 3f644a3c649..2ceac955796 100644 --- a/cpp/test/IceStorm/federation/Publisher.cpp +++ b/cpp/test/IceStorm/federation/Publisher.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 c5432280162..14b8be18faa 100644 --- a/cpp/test/IceStorm/federation/Subscriber.cpp +++ b/cpp/test/IceStorm/federation/Subscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 50f46e33f48..cb3bff15576 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 4b59e352778..74767fcae7b 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 4c632857ba2..baed109ec5e 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. PUBLISHER = publisher diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp index fa95ee6c44c..fd106e1e5e1 100644 --- a/cpp/test/IceStorm/single/Publisher.cpp +++ b/cpp/test/IceStorm/single/Publisher.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 4febe657333..a4a1b8cecdf 100644 --- a/cpp/test/IceStorm/single/Single.ice +++ b/cpp/test/IceStorm/single/Single.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 SINGLE_ICE #define SINGLE_ICE diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp index 07a438bc913..70225e34b0a 100644 --- a/cpp/test/IceStorm/single/Subscriber.cpp +++ b/cpp/test/IceStorm/single/Subscriber.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 afbb19fee8f..12f62af6ba5 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 7990ed2c1f7..2e5fe219171 100644 --- a/cpp/test/IceUtil/Makefile +++ b/cpp/test/IceUtil/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/IceUtil/ctrlCHandler/Client.cpp b/cpp/test/IceUtil/ctrlCHandler/Client.cpp index 3d8e17e22f7..95927fe74d3 100644 --- a/cpp/test/IceUtil/ctrlCHandler/Client.cpp +++ b/cpp/test/IceUtil/ctrlCHandler/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1874d2ea655..3b8a971dd0a 100644 --- a/cpp/test/IceUtil/ctrlCHandler/Makefile +++ b/cpp/test/IceUtil/ctrlCHandler/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp index d1c4e969f82..8969ada542d 100644 --- a/cpp/test/IceUtil/inputUtil/Client.cpp +++ b/cpp/test/IceUtil/inputUtil/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1874d2ea655..3b8a971dd0a 100644 --- a/cpp/test/IceUtil/inputUtil/Makefile +++ b/cpp/test/IceUtil/inputUtil/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py index 42b1afb4870..95ef6336e1f 100755 --- a/cpp/test/IceUtil/inputUtil/run.py +++ b/cpp/test/IceUtil/inputUtil/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 69c70cb02f7..afb90d02db3 100644 --- a/cpp/test/IceUtil/thread/AliveTest.cpp +++ b/cpp/test/IceUtil/thread/AliveTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 5dccc703664..238c13fe3de 100644 --- a/cpp/test/IceUtil/thread/AliveTest.h +++ b/cpp/test/IceUtil/thread/AliveTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 ALIVE_TEST_H #define ALIVE_TEST_H diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp index 44583d91650..4ece3c7e75b 100644 --- a/cpp/test/IceUtil/thread/Client.cpp +++ b/cpp/test/IceUtil/thread/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <stdlib.h> diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp index c042a6fa05e..1d6ca57cdf4 100644 --- a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp +++ b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <CountDownLatchTest.h> diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.h b/cpp/test/IceUtil/thread/CountDownLatchTest.h index d035e593605..15162b21ef0 100644 --- a/cpp/test/IceUtil/thread/CountDownLatchTest.h +++ b/cpp/test/IceUtil/thread/CountDownLatchTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 45b2ff2a827..a86250c8463 100644 --- a/cpp/test/IceUtil/thread/CreateTest.cpp +++ b/cpp/test/IceUtil/thread/CreateTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <stdio.h> diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h index c27c69ca430..d4f2a159ffb 100644 --- a/cpp/test/IceUtil/thread/CreateTest.h +++ b/cpp/test/IceUtil/thread/CreateTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CREATE_TEST_H #define CREATE_TEST_H diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile index ce2a7f2717a..6312d34c41e 100644 --- a/cpp/test/IceUtil/thread/Makefile +++ b/cpp/test/IceUtil/thread/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp index ba4b06fdefd..1d2713c2219 100644 --- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp +++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <MonitorMutexTest.h> diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h index 763715c8425..d71281af354 100644 --- a/cpp/test/IceUtil/thread/MonitorMutexTest.h +++ b/cpp/test/IceUtil/thread/MonitorMutexTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 6eb404d548b..58304fdd0ff 100644 --- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <MonitorRecMutexTest.h> diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h index 1d86d92d476..034af701c54 100644 --- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h +++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 6ae2d136480..c8bdfec1d88 100644 --- a/cpp/test/IceUtil/thread/MutexTest.cpp +++ b/cpp/test/IceUtil/thread/MutexTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <MutexTest.h> diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h index 8d4447a1a3f..5250d3b0a84 100644 --- a/cpp/test/IceUtil/thread/MutexTest.h +++ b/cpp/test/IceUtil/thread/MutexTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 MUTEX_TEST_H #define MUTEX_TEST_H diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp index d225861eacb..b340fedfab2 100644 --- a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <RWRecMutexTest.h> diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.h b/cpp/test/IceUtil/thread/RWRecMutexTest.h index 40a81a9707d..186c00faaca 100644 --- a/cpp/test/IceUtil/thread/RWRecMutexTest.h +++ b/cpp/test/IceUtil/thread/RWRecMutexTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ea9a887fda0..4093582022a 100644 --- a/cpp/test/IceUtil/thread/RecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <RecMutexTest.h> diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h index 353df8d40a6..b1b5164e191 100644 --- a/cpp/test/IceUtil/thread/RecMutexTest.h +++ b/cpp/test/IceUtil/thread/RecMutexTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 4774fdaffb3..eb2e40b43bc 100644 --- a/cpp/test/IceUtil/thread/StartTest.cpp +++ b/cpp/test/IceUtil/thread/StartTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <stdio.h> diff --git a/cpp/test/IceUtil/thread/StartTest.h b/cpp/test/IceUtil/thread/StartTest.h index 5e91df42136..c0d2782f841 100644 --- a/cpp/test/IceUtil/thread/StartTest.h +++ b/cpp/test/IceUtil/thread/StartTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 START_TEST_H #define START_TEST_H diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.cpp b/cpp/test/IceUtil/thread/StaticMutexTest.cpp index 0c37a7cefb5..0986f7abdf3 100644 --- a/cpp/test/IceUtil/thread/StaticMutexTest.cpp +++ b/cpp/test/IceUtil/thread/StaticMutexTest.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <StaticMutexTest.h> diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.h b/cpp/test/IceUtil/thread/StaticMutexTest.h index 2b0e54a1389..89d1a320a02 100644 --- a/cpp/test/IceUtil/thread/StaticMutexTest.h +++ b/cpp/test/IceUtil/thread/StaticMutexTest.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 3e7da6a7e55..1ea343af0be 100644 --- a/cpp/test/IceUtil/thread/TestBase.cpp +++ b/cpp/test/IceUtil/thread/TestBase.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/IceUtil.h> #include <TestBase.h> diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h index 26c2d2dd924..62d2b195ce2 100644 --- a/cpp/test/IceUtil/thread/TestBase.h +++ b/cpp/test/IceUtil/thread/TestBase.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_BASE_H #define TEST_BASE_H diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp index c933840624a..2a9306b9b11 100644 --- a/cpp/test/IceUtil/thread/TestSuite.cpp +++ b/cpp/test/IceUtil/thread/TestSuite.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 429b02479d7..fc5a1a45b73 100644 --- a/cpp/test/IceUtil/thread/TestSuite.h +++ b/cpp/test/IceUtil/thread/TestSuite.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_SUITE_H #define TEST_SUITE_H diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py index 711fe3912fe..6612d951f75 100755 --- a/cpp/test/IceUtil/thread/run.py +++ b/cpp/test/IceUtil/thread/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 7b7432bef29..d0d45d3bedf 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <IceUtil/Unicode.h> #include <TestCommon.h> #include <fstream> diff --git a/cpp/test/IceUtil/unicode/Makefile b/cpp/test/IceUtil/unicode/Makefile index 1874d2ea655..3b8a971dd0a 100644 --- a/cpp/test/IceUtil/unicode/Makefile +++ b/cpp/test/IceUtil/unicode/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py index d9385d3b429..0d92699dc5b 100755 --- a/cpp/test/IceUtil/unicode/run.py +++ b/cpp/test/IceUtil/unicode/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 293aa8c3602..7e2e096adfc 100644 --- a/cpp/test/IceUtil/uuid/Client.cpp +++ b/cpp/test/IceUtil/uuid/Client.cpp @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 <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 1874d2ea655..3b8a971dd0a 100644 --- a/cpp/test/IceUtil/uuid/Makefile +++ b/cpp/test/IceUtil/uuid/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../../.. CLIENT = client diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py index e52a1dde3d0..75ca25ec8ea 100755 --- a/cpp/test/IceUtil/uuid/run.py +++ b/cpp/test/IceUtil/uuid/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 933fc016466..e6cda45f98b 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. 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 = .. include $(top_srcdir)/config/Make.rules diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice index d246347b901..fa0e5e674c9 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + interface i1 { void op(); diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.ice b/cpp/test/Slice/errorDetection/CaseSensitive.ice index 2e50d5c073c..32149de9f8c 100644 --- a/cpp/test/Slice/errorDetection/CaseSensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseSensitive.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + module M1 { }; diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice index 81e1b7669fd..92d9c2cdbec 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + sequence<long> ls; struct s00 diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice index 9570ea69f23..3de8fb3b7f5 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 b773e5c08a5..c5861cbc604 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.ice +++ b/cpp/test/Slice/errorDetection/ConstDef.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + // // Basic checks (all OK) // diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice index a3c69a17a0b..570c125b7dc 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + class C { int member; diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice index c2c00fa758a..5a96a7b04cb 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 9615678b86d..24acc948e4b 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + interface Base1 { void op(); diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice index c461230a9f5..b7dac037a28 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 69a4870740f..8891863793c 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + class Foo { long l; diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice index 81a1743245f..0fb106536c3 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 34e452e6521..7e796ae8b1e 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.ice +++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,4 +8,8 @@ // ********************************************************************** + + + + enum foo {}; diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice index d951aa3c8f8..43adb38c70a 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + 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 682ceea93c8..ea25dffb995 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + 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 84abdf65e62..13df1383c65 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + INTERFACE i { void op(); }; exception Void {}; diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice index 7ad0bdec8c7..837a627d86e 100644 --- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice +++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + exception E; struct S; diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice index b83f48d088f..ac12f2e1be3 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 dce7da03fb5..e6d60267696 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.ice +++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 4376479b2ea..63cf8bbaf68 100644 --- a/cpp/test/Slice/errorDetection/IllegalMI.ice +++ b/cpp/test/Slice/errorDetection/IllegalMI.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + module M1 { diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice index c362ab85eb6..28c78d7020c 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + exception module; exception void { diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice index 1543f0948a0..cedefd8e10c 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 887ccb84e43..ae6d1e04017 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 ed4e454593b..e78ac93057f 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.ice +++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 243e7f100ba..53591468854 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + class Foo { void Foo(); diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice index e64d1afaf11..f99a5d10d1a 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 00f09483bde..be2be1176ea 100644 --- a/cpp/test/Slice/errorDetection/NotException.ice +++ b/cpp/test/Slice/errorDetection/NotException.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + module M { diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice index d39d49bb19c..2e7f7912737 100644 --- a/cpp/test/Slice/errorDetection/NotType.ice +++ b/cpp/test/Slice/errorDetection/NotType.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + module Module1 { }; module Module2 { }; module Module3 { }; diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice index 5f438d4b4cd..10c44d4c00e 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + class C { void operation(); diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice index ccbb63b2121..0d6df517a33 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 32e1531d99a..08a43f09ad3 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + sequence<int> Sequence1; class Sequence1; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice index 6130ae4644b..3b0c2b89737 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + class C { void operation(); diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice index 37a6552babc..7f5178267c5 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + 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 f310276a5c0..469959e52c8 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + 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 957b25982b1..ff518a042e1 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 908708f87a9..3a102088a90 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + sequence<int> Sequence1; interface Sequence1; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice index a33ba4626a3..cbccdc98141 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + sequence<int> Seq; module Seq; module Mod { }; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice index 6c44335fd6e..580ae63aac5 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + class C { int member; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice index 8a537f11eed..67755555dc2 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + class C { long l; }; sequence<int> C; diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice index 63ff7d7d4cc..fe46f18e74a 100644 --- a/cpp/test/Slice/errorDetection/Reserved.ice +++ b/cpp/test/Slice/errorDetection/Reserved.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + #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 e9fd5ae5d31..f12132fffbd 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.ice +++ b/cpp/test/Slice/errorDetection/SelfContainment.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + struct x { int i; diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice index 7d4370d43b2..42456734ab5 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,5 +8,9 @@ // ********************************************************************** + + + + sequence<int> Seq; sequence<int> Seq; diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice index 705778c1b4c..7cf23f0ac75 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.ice +++ b/cpp/test/Slice/errorDetection/StructMembers.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + struct s1 // Illegal empty struct { }; diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice index 067f68ec365..af2982bc5af 100644 --- a/cpp/test/Slice/errorDetection/Undefined.ice +++ b/cpp/test/Slice/errorDetection/Undefined.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 e3033579b8d..042042c5a6d 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.ice +++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,6 +8,10 @@ // ********************************************************************** + + + + 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 bc86c2bcf08..ad077615473 100644 --- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice +++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -12,4 +8,8 @@ // ********************************************************************** + + + + module IceSomething {}; diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index a676b64246d..ce6a0c337ae 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 f62214209c1..c0714789e8e 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_COMMON_H #define TEST_COMMON_H diff --git a/java/Makefile b/java/Makefile index 21bad43d52d..cc4dd7a83d5 100644 --- a/java/Makefile +++ b/java/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 fe7cf475e7a..b8575c4ed9f 100755 --- a/java/allTests.py +++ b/java/allTests.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 4b6964efadf..5153aded9a1 100644 --- a/java/ant/Slice2FreezeJTask.java +++ b/java/ant/Slice2FreezeJTask.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice.Ant; import org.apache.tools.ant.Task; diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java index f98f12942c9..7ea34743a97 100644 --- a/java/ant/Slice2JavaTask.java +++ b/java/ant/Slice2JavaTask.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice.Ant; import org.apache.tools.ant.Task; diff --git a/java/ant/SliceDefine.java b/java/ant/SliceDefine.java index cf72fba7142..4fca91050c5 100644 --- a/java/ant/SliceDefine.java +++ b/java/ant/SliceDefine.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice.Ant; public class SliceDefine diff --git a/java/ant/SliceTask.java b/java/ant/SliceTask.java index 3c6dc94d518..11fac78ff8f 100644 --- a/java/ant/SliceTask.java +++ b/java/ant/SliceTask.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice.Ant; import org.apache.tools.ant.Task; diff --git a/java/build.xml b/java/build.xml index 25c76d0e61f..c670f8f66e3 100644 --- a/java/build.xml +++ b/java/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/config/IcePackAdmin.py b/java/config/IcePackAdmin.py index c144c48bd5e..22b5fc4a8eb 100644 --- a/java/config/IcePackAdmin.py +++ b/java/config/IcePackAdmin.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 76514e0c886..64a53d86a64 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 e857cf49696..cf2ee55ffb7 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 a0cae7e60c2..f7aee6eb942 100644 --- a/java/demo/Freeze/bench/Client.java +++ b/java/demo/Freeze/bench/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c5b8689f362..96aa7807143 100644 --- a/java/demo/Freeze/bench/StopWatch.java +++ b/java/demo/Freeze/bench/StopWatch.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d32b95cb2f9..40dfef6a96e 100644 --- a/java/demo/Freeze/bench/Test.ice +++ b/java/demo/Freeze/bench/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b11bd0910c9..5fc12961ceb 100644 --- a/java/demo/Freeze/bench/build.xml +++ b/java/demo/Freeze/bench/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Freeze/build.xml b/java/demo/Freeze/build.xml index 73cbc60e3df..418ccc46e6e 100644 --- a/java/demo/Freeze/build.xml +++ b/java/demo/Freeze/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Freeze/library/BookFactory.java b/java/demo/Freeze/library/BookFactory.java index af620cb255b..85bc9cbb723 100644 --- a/java/demo/Freeze/library/BookFactory.java +++ b/java/demo/Freeze/library/BookFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e6fc4b06065..5dacd3f4679 100644 --- a/java/demo/Freeze/library/BookI.java +++ b/java/demo/Freeze/library/BookI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 2cdeb366f81..b45e33eb878 100644 --- a/java/demo/Freeze/library/Client.java +++ b/java/demo/Freeze/library/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 50ee2d70553..ef37915cd76 100644 --- a/java/demo/Freeze/library/Collocated.java +++ b/java/demo/Freeze/library/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d28fbfca613..13ae77d7352 100644 --- a/java/demo/Freeze/library/Grammar.java +++ b/java/demo/Freeze/library/Grammar.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e437c235493..915aa6bff4c 100644 --- a/java/demo/Freeze/library/Library.ice +++ b/java/demo/Freeze/library/Library.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LIBRARY_ICE #define LIBRARY_ICE diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java index f58e21f02d2..7ab176841c5 100644 --- a/java/demo/Freeze/library/LibraryI.java +++ b/java/demo/Freeze/library/LibraryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ae35dd7da5f..1dc7262e109 100644 --- a/java/demo/Freeze/library/Parser.java +++ b/java/demo/Freeze/library/Parser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 1572eea56e7..5fdcf782e4a 100644 --- a/java/demo/Freeze/library/RunParser.java +++ b/java/demo/Freeze/library/RunParser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b481bb672cc..4910d29f565 100644 --- a/java/demo/Freeze/library/Scanner.java +++ b/java/demo/Freeze/library/Scanner.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 0508a85516d..6eca5f48aa6 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ad4ea892805..b406551cf15 100644 --- a/java/demo/Freeze/library/Token.java +++ b/java/demo/Freeze/library/Token.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 8dcb8276307..60b088f3ad2 100644 --- a/java/demo/Freeze/library/build.xml +++ b/java/demo/Freeze/library/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Freeze/phonebook/Client.java b/java/demo/Freeze/phonebook/Client.java index dff82bff1a2..ca7d7a9eaf1 100644 --- a/java/demo/Freeze/phonebook/Client.java +++ b/java/demo/Freeze/phonebook/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3eb0a8ae763..fcf8813580f 100644 --- a/java/demo/Freeze/phonebook/Collocated.java +++ b/java/demo/Freeze/phonebook/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d62f52f5056..10a1b8a782b 100644 --- a/java/demo/Freeze/phonebook/ContactFactory.java +++ b/java/demo/Freeze/phonebook/ContactFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 6d5c66dc570..e1fb1662e04 100644 --- a/java/demo/Freeze/phonebook/ContactI.java +++ b/java/demo/Freeze/phonebook/ContactI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 fe01ed29a90..8c6ed5f8328 100644 --- a/java/demo/Freeze/phonebook/Grammar.java +++ b/java/demo/Freeze/phonebook/Grammar.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 8d709140792..e4a745ddae3 100644 --- a/java/demo/Freeze/phonebook/Parser.java +++ b/java/demo/Freeze/phonebook/Parser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5b357258cbd..61c502f3c88 100644 --- a/java/demo/Freeze/phonebook/PhoneBook.ice +++ b/java/demo/Freeze/phonebook/PhoneBook.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 PHONE_BOOK_ICE #define PHONE_BOOK_ICE diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java index 374a05f8df2..b0f21c0d76d 100644 --- a/java/demo/Freeze/phonebook/PhoneBookI.java +++ b/java/demo/Freeze/phonebook/PhoneBookI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9c5465335ef..4c564dbb671 100644 --- a/java/demo/Freeze/phonebook/RunParser.java +++ b/java/demo/Freeze/phonebook/RunParser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a30ab8d8ec1..f61e03b7461 100644 --- a/java/demo/Freeze/phonebook/Scanner.java +++ b/java/demo/Freeze/phonebook/Scanner.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9c99272f42e..e6d647040c9 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 10c9d75756b..7f86679d9d0 100644 --- a/java/demo/Freeze/phonebook/Token.java +++ b/java/demo/Freeze/phonebook/Token.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d0ec6247327..9f388a27df8 100644 --- a/java/demo/Freeze/phonebook/build.xml +++ b/java/demo/Freeze/phonebook/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Glacier/build.xml b/java/demo/Glacier/build.xml index cde310bbdf2..cd29896a5cb 100644 --- a/java/demo/Glacier/build.xml +++ b/java/demo/Glacier/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java index 109c647b0de..2ed45e994fc 100644 --- a/java/demo/Glacier/session/Client.java +++ b/java/demo/Glacier/session/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 32f111b0783..250083428f5 100644 --- a/java/demo/Glacier/session/HelloSession.ice +++ b/java/demo/Glacier/session/HelloSession.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/java/demo/Glacier/session/HelloSessionI.java b/java/demo/Glacier/session/HelloSessionI.java index d9451643334..430c1f4e619 100644 --- a/java/demo/Glacier/session/HelloSessionI.java +++ b/java/demo/Glacier/session/HelloSessionI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 553c61e0c83..b6c14ad6ea0 100644 --- a/java/demo/Glacier/session/HelloSessionManagerI.java +++ b/java/demo/Glacier/session/HelloSessionManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 55e8275c3de..90852bfb895 100644 --- a/java/demo/Glacier/session/Server.java +++ b/java/demo/Glacier/session/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ee8b1270012..9f001a832d5 100644 --- a/java/demo/Glacier/session/build.xml +++ b/java/demo/Glacier/session/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/build.xml b/java/demo/Ice/build.xml index 3d5e1d76494..f4b3746329b 100644 --- a/java/demo/Ice/build.xml +++ b/java/demo/Ice/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice index da64c2948e3..d275d358d91 100644 --- a/java/demo/Ice/callback/Callback.ice +++ b/java/demo/Ice/callback/Callback.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CALLBACK_ICE #define CALLBACK_ICE diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java index 038d8e109c9..6009fdcab97 100644 --- a/java/demo/Ice/callback/CallbackClient.java +++ b/java/demo/Ice/callback/CallbackClient.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c46d189d143..2d5aa324ad0 100644 --- a/java/demo/Ice/callback/CallbackI.java +++ b/java/demo/Ice/callback/CallbackI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3850e55cdf7..c408da821c2 100644 --- a/java/demo/Ice/callback/CallbackReceiverI.java +++ b/java/demo/Ice/callback/CallbackReceiverI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 bbff1e815aa..ea007ed9a51 100644 --- a/java/demo/Ice/callback/CallbackServer.java +++ b/java/demo/Ice/callback/CallbackServer.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 dd3a234e570..0c12f41ed47 100644 --- a/java/demo/Ice/callback/Client.java +++ b/java/demo/Ice/callback/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e676c6d302f..8238584f4a2 100644 --- a/java/demo/Ice/callback/Server.java +++ b/java/demo/Ice/callback/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b760dbb1bbe..1e2e2629b22 100644 --- a/java/demo/Ice/callback/build.xml +++ b/java/demo/Ice/callback/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java index 653dce189dc..11158a5b276 100644 --- a/java/demo/Ice/hello/Client.java +++ b/java/demo/Ice/hello/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 882e96b8a55..10a98cc1ad3 100644 --- a/java/demo/Ice/hello/Hello.ice +++ b/java/demo/Ice/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java index e9ac52c046d..02b174e8051 100644 --- a/java/demo/Ice/hello/HelloI.java +++ b/java/demo/Ice/hello/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3dd477891be..73e77b92fa9 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 33c1d527a3f..6eef4ec76a3 100644 --- a/java/demo/Ice/hello/build.xml +++ b/java/demo/Ice/hello/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java index f26f4168477..aed3aba460b 100644 --- a/java/demo/Ice/latency/Client.java +++ b/java/demo/Ice/latency/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b11e6cf4e94..04c9673ec48 100644 --- a/java/demo/Ice/latency/Latency.ice +++ b/java/demo/Ice/latency/Latency.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 LATENCY_ICE #define LATENCY_ICE diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index d77f0986042..9ec218222b1 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 079ad40dbdb..edef21888fb 100644 --- a/java/demo/Ice/latency/build.xml +++ b/java/demo/Ice/latency/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java index 670c3455ac9..34987604e03 100644 --- a/java/demo/Ice/nested/Client.java +++ b/java/demo/Ice/nested/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e629bbe88d2..aaa52fd6780 100644 --- a/java/demo/Ice/nested/Nested.ice +++ b/java/demo/Ice/nested/Nested.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 NESTED_ICE #define NESTED_ICE diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java index 592d41a34d9..48e277e0bbe 100644 --- a/java/demo/Ice/nested/NestedClient.java +++ b/java/demo/Ice/nested/NestedClient.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 53f4de87b2b..8f45576a92d 100644 --- a/java/demo/Ice/nested/NestedI.java +++ b/java/demo/Ice/nested/NestedI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 1bf3b44e1de..3606a1a83eb 100644 --- a/java/demo/Ice/nested/NestedServer.java +++ b/java/demo/Ice/nested/NestedServer.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a8723ba8760..8301d252e5f 100644 --- a/java/demo/Ice/nested/Server.java +++ b/java/demo/Ice/nested/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 64eff32aa03..d081199b0a7 100644 --- a/java/demo/Ice/nested/build.xml +++ b/java/demo/Ice/nested/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java index b351851057e..37ea5d400e8 100644 --- a/java/demo/Ice/throughput/Client.java +++ b/java/demo/Ice/throughput/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9208c55e19e..3a436876e3e 100644 --- a/java/demo/Ice/throughput/Server.java +++ b/java/demo/Ice/throughput/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3b02a3861d9..20195e9924e 100644 --- a/java/demo/Ice/throughput/Throughput.ice +++ b/java/demo/Ice/throughput/Throughput.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 THROUGHPUT_ICE #define THROUGHPUT_ICE diff --git a/java/demo/Ice/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java index 51b1fe843c1..733033072fa 100644 --- a/java/demo/Ice/throughput/ThroughputI.java +++ b/java/demo/Ice/throughput/ThroughputI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 81b50a74b89..8cdf0a56fb4 100644 --- a/java/demo/Ice/throughput/build.xml +++ b/java/demo/Ice/throughput/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java index acd54eee8da..1a3c2b03ddc 100644 --- a/java/demo/Ice/value/Client.java +++ b/java/demo/Ice/value/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 acb67aa8661..329047ca33e 100644 --- a/java/demo/Ice/value/DerivedPrinterI.java +++ b/java/demo/Ice/value/DerivedPrinterI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5aa50a2571d..e9bbfb79734 100644 --- a/java/demo/Ice/value/InitialI.java +++ b/java/demo/Ice/value/InitialI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 bd8e81a17a8..2bcae1fdece 100644 --- a/java/demo/Ice/value/ObjectFactory.java +++ b/java/demo/Ice/value/ObjectFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3ceff35cbf7..50e5a4f723b 100644 --- a/java/demo/Ice/value/PrinterI.java +++ b/java/demo/Ice/value/PrinterI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 572ae6c369e..3e3325b8a9e 100644 --- a/java/demo/Ice/value/Server.java +++ b/java/demo/Ice/value/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b4196a7bee3..b8f03f2448b 100644 --- a/java/demo/Ice/value/Value.ice +++ b/java/demo/Ice/value/Value.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 VALUE_ICE #define VALUE_ICE diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml index 0129d1c1844..f23fec5412e 100644 --- a/java/demo/Ice/value/build.xml +++ b/java/demo/Ice/value/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IceBox/build.xml b/java/demo/IceBox/build.xml index e9b524ad9bb..8868fa3350c 100644 --- a/java/demo/IceBox/build.xml +++ b/java/demo/IceBox/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java index 9e9ee6f0938..263cb446dfa 100644 --- a/java/demo/IceBox/hello/Client.java +++ b/java/demo/IceBox/hello/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7fc2c380953..0ae5c36e63f 100644 --- a/java/demo/IceBox/hello/Hello.ice +++ b/java/demo/IceBox/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java index e9ac52c046d..02b174e8051 100644 --- a/java/demo/IceBox/hello/HelloI.java +++ b/java/demo/IceBox/hello/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3cc2f24d26c..bb6d611f8eb 100644 --- a/java/demo/IceBox/hello/HelloServiceI.java +++ b/java/demo/IceBox/hello/HelloServiceI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a0860dae79d..7766704576b 100644 --- a/java/demo/IceBox/hello/build.xml +++ b/java/demo/IceBox/hello/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IcePack/build.xml b/java/demo/IcePack/build.xml index 66b8896ecfb..9882e0f63dd 100644 --- a/java/demo/IcePack/build.xml +++ b/java/demo/IcePack/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IcePack/hello/Client.java b/java/demo/IcePack/hello/Client.java index 1b06bd619c4..b1bb01a86b0 100644 --- a/java/demo/IcePack/hello/Client.java +++ b/java/demo/IcePack/hello/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 97af57216f4..1fa498dd67c 100644 --- a/java/demo/IcePack/hello/Hello.ice +++ b/java/demo/IcePack/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/java/demo/IcePack/hello/HelloFactoryI.java b/java/demo/IcePack/hello/HelloFactoryI.java index 26483ed7913..4182726508f 100644 --- a/java/demo/IcePack/hello/HelloFactoryI.java +++ b/java/demo/IcePack/hello/HelloFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 77f32062eb3..faf5805610d 100644 --- a/java/demo/IcePack/hello/HelloI.java +++ b/java/demo/IcePack/hello/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 416ab087cf5..66a0c52d217 100644 --- a/java/demo/IcePack/hello/HelloServiceI.java +++ b/java/demo/IcePack/hello/HelloServiceI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5d6816b8456..1d241a1584d 100644 --- a/java/demo/IcePack/hello/Server.java +++ b/java/demo/IcePack/hello/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 eadb9cc5171..7505ba9ef16 100644 --- a/java/demo/IcePack/hello/build.xml +++ b/java/demo/IcePack/hello/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IcePack/simple/Client.java b/java/demo/IcePack/simple/Client.java index 112cfa802cc..030b050bbc9 100644 --- a/java/demo/IcePack/simple/Client.java +++ b/java/demo/IcePack/simple/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 882e96b8a55..10a98cc1ad3 100644 --- a/java/demo/IcePack/simple/Hello.ice +++ b/java/demo/IcePack/simple/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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_ICE #define HELLO_ICE diff --git a/java/demo/IcePack/simple/HelloI.java b/java/demo/IcePack/simple/HelloI.java index e9ac52c046d..02b174e8051 100644 --- a/java/demo/IcePack/simple/HelloI.java +++ b/java/demo/IcePack/simple/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 1cbfa69fb5a..87ca1860443 100644 --- a/java/demo/IcePack/simple/HelloServiceI.java +++ b/java/demo/IcePack/simple/HelloServiceI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 34a96a12f7b..663952dc9e0 100644 --- a/java/demo/IcePack/simple/Server.java +++ b/java/demo/IcePack/simple/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 61ade4ff85c..24ec5e6f8fc 100644 --- a/java/demo/IcePack/simple/build.xml +++ b/java/demo/IcePack/simple/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/book/evictor/EvictorBase.java b/java/demo/book/evictor/EvictorBase.java index b33bf21d00e..3324aac363c 100644 --- a/java/demo/book/evictor/EvictorBase.java +++ b/java/demo/book/evictor/EvictorBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 2361b33337c..98e0e495312 100644 --- a/java/demo/book/evictor/LinkedList.java +++ b/java/demo/book/evictor/LinkedList.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Evictor; // diff --git a/java/demo/build.xml b/java/demo/build.xml index 9e2d9954138..f0b72cbde29 100644 --- a/java/demo/build.xml +++ b/java/demo/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/makebindist.py b/java/makebindist.py index a88364687b7..546d958e857 100755 --- a/java/makebindist.py +++ b/java/makebindist.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 5e50a7a1153..bb265ef502c 100755 --- a/java/makedist.py +++ b/java/makedist.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 fdd5a13ae2e..37a8be7c062 100755 --- a/java/src/Freeze/ConnectionI.java +++ b/java/src/Freeze/ConnectionI.java @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/EvictorElement.java index bfaa9717074..5e3635b0615 100644 --- a/java/src/Freeze/EvictorElement.java +++ b/java/src/Freeze/EvictorElement.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; class EvictorElement extends Ice.LocalObjectImpl diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java index 042b241f78f..dfb769c98a3 100644 --- a/java/src/Freeze/EvictorI.java +++ b/java/src/Freeze/EvictorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java index f0e4f0a362f..20bb5ecc29c 100644 --- a/java/src/Freeze/EvictorIteratorI.java +++ b/java/src/Freeze/EvictorIteratorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; class EvictorIteratorI extends Ice.LocalObjectImpl implements EvictorIterator diff --git a/java/src/Freeze/FatalErrorCallback.java b/java/src/Freeze/FatalErrorCallback.java index a5621e10600..9e615423b88 100644 --- a/java/src/Freeze/FatalErrorCallback.java +++ b/java/src/Freeze/FatalErrorCallback.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; public interface FatalErrorCallback diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/Index.java index a47104f5f26..76e5df06f93 100644 --- a/java/src/Freeze/Index.java +++ b/java/src/Freeze/Index.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; public abstract class Index implements com.sleepycat.db.DbSecondaryKeyCreate diff --git a/java/src/Freeze/LinkedList.java b/java/src/Freeze/LinkedList.java index c40e63cc68e..61765821463 100644 --- a/java/src/Freeze/LinkedList.java +++ b/java/src/Freeze/LinkedList.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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/Map.java b/java/src/Freeze/Map.java index 91ee586325e..3759827af8c 100644 --- a/java/src/Freeze/Map.java +++ b/java/src/Freeze/Map.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; public abstract class Map extends java.util.AbstractMap diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java index 12a97a09fe7..b7aae62e46a 100644 --- a/java/src/Freeze/ObjectStore.java +++ b/java/src/Freeze/ObjectStore.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; class ObjectStore implements IceUtil.Store diff --git a/java/src/Freeze/SharedDb.java b/java/src/Freeze/SharedDb.java index c74778464fe..60610d0859f 100755 --- a/java/src/Freeze/SharedDb.java +++ b/java/src/Freeze/SharedDb.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; class SharedDb extends com.sleepycat.db.Db diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/SharedDbEnv.java index 53a521ca80f..c11fa68bc5c 100644 --- a/java/src/Freeze/SharedDbEnv.java +++ b/java/src/Freeze/SharedDbEnv.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; 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 d5a199e7359..49cc059823f 100755 --- a/java/src/Freeze/TransactionI.java +++ b/java/src/Freeze/TransactionI.java @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/java/src/Freeze/Util.java b/java/src/Freeze/Util.java index aa03497363d..712ba11ebc2 100644 --- a/java/src/Freeze/Util.java +++ b/java/src/Freeze/Util.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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; public class Util diff --git a/java/src/Ice/AMD_Object_ice_invoke.java b/java/src/Ice/AMD_Object_ice_invoke.java index 28cff522627..5ff00e3095d 100644 --- a/java/src/Ice/AMD_Object_ice_invoke.java +++ b/java/src/Ice/AMD_Object_ice_invoke.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0a9a20d72a6..1d49abbce98 100644 --- a/java/src/Ice/AMI_Object_ice_invoke.java +++ b/java/src/Ice/AMI_Object_ice_invoke.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 692dc40bb5a..028250ee33d 100644 --- a/java/src/Ice/Application.java +++ b/java/src/Ice/Application.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public abstract class Application diff --git a/java/src/Ice/Blobject.java b/java/src/Ice/Blobject.java index 9719786a76a..fa0e9df7055 100644 --- a/java/src/Ice/Blobject.java +++ b/java/src/Ice/Blobject.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public abstract class Blobject extends Ice.ObjectImpl diff --git a/java/src/Ice/BlobjectAsync.java b/java/src/Ice/BlobjectAsync.java index 533a78d8470..c62e202cc87 100644 --- a/java/src/Ice/BlobjectAsync.java +++ b/java/src/Ice/BlobjectAsync.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public abstract class BlobjectAsync extends Ice.ObjectImpl diff --git a/java/src/Ice/BooleanHolder.java b/java/src/Ice/BooleanHolder.java index 985f5868bb7..e69fdffea33 100644 --- a/java/src/Ice/BooleanHolder.java +++ b/java/src/Ice/BooleanHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class BooleanHolder diff --git a/java/src/Ice/ByteHolder.java b/java/src/Ice/ByteHolder.java index 04889dd0d90..9d8860779a6 100644 --- a/java/src/Ice/ByteHolder.java +++ b/java/src/Ice/ByteHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class ByteHolder diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java index f4bf63466a0..3c5eb68b315 100644 --- a/java/src/Ice/CommunicatorI.java +++ b/java/src/Ice/CommunicatorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; final class CommunicatorI extends LocalObjectImpl implements Communicator diff --git a/java/src/Ice/DoubleHolder.java b/java/src/Ice/DoubleHolder.java index 1c40c12e3d5..54ab63b44c8 100644 --- a/java/src/Ice/DoubleHolder.java +++ b/java/src/Ice/DoubleHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class DoubleHolder diff --git a/java/src/Ice/FloatHolder.java b/java/src/Ice/FloatHolder.java index 33984e6f10b..6038d894c72 100644 --- a/java/src/Ice/FloatHolder.java +++ b/java/src/Ice/FloatHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class FloatHolder diff --git a/java/src/Ice/IntHolder.java b/java/src/Ice/IntHolder.java index 96f75482881..363c6f2f686 100644 --- a/java/src/Ice/IntHolder.java +++ b/java/src/Ice/IntHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class IntHolder diff --git a/java/src/Ice/LocalException.java b/java/src/Ice/LocalException.java index 974aea74706..a6c6e166bb4 100644 --- a/java/src/Ice/LocalException.java +++ b/java/src/Ice/LocalException.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public abstract class LocalException extends RuntimeException diff --git a/java/src/Ice/LocalObject.java b/java/src/Ice/LocalObject.java index aca135b60b7..2b2e6cf6849 100644 --- a/java/src/Ice/LocalObject.java +++ b/java/src/Ice/LocalObject.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public interface LocalObject diff --git a/java/src/Ice/LocalObjectHolder.java b/java/src/Ice/LocalObjectHolder.java index 479f7072135..78aad02b2d9 100644 --- a/java/src/Ice/LocalObjectHolder.java +++ b/java/src/Ice/LocalObjectHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class LocalObjectHolder diff --git a/java/src/Ice/LocalObjectImpl.java b/java/src/Ice/LocalObjectImpl.java index d0981b022ee..1fedbc642e2 100644 --- a/java/src/Ice/LocalObjectImpl.java +++ b/java/src/Ice/LocalObjectImpl.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 f883f92f50f..24ed8f2b8d8 100644 --- a/java/src/Ice/LoggerI.java +++ b/java/src/Ice/LoggerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class LoggerI extends LocalObjectImpl implements Logger diff --git a/java/src/Ice/LongHolder.java b/java/src/Ice/LongHolder.java index ce143667ff9..5444c28ac6d 100644 --- a/java/src/Ice/LongHolder.java +++ b/java/src/Ice/LongHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class LongHolder diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java index 53652f11672..854324b273c 100644 --- a/java/src/Ice/Object.java +++ b/java/src/Ice/Object.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public interface Object diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 57cdcb4e59f..6c4803268c1 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/ObjectHolder.java index 08246e5b403..54f3303ed26 100644 --- a/java/src/Ice/ObjectHolder.java +++ b/java/src/Ice/ObjectHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class ObjectHolder diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java index 9446bd1447b..179f9d5cf65 100644 --- a/java/src/Ice/ObjectImpl.java +++ b/java/src/Ice/ObjectImpl.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public class ObjectImpl implements Object, java.lang.Cloneable diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java index 3ac00e76ce0..1aab12bea25 100644 --- a/java/src/Ice/ObjectPrx.java +++ b/java/src/Ice/ObjectPrx.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public interface ObjectPrx diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java index 2cf7ac5fae4..b87dcee662e 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/ObjectPrxHelper.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public class ObjectPrxHelper extends ObjectPrxHelperBase diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index c54124090e9..4ffbe2003ea 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public class ObjectPrxHelperBase implements ObjectPrx diff --git a/java/src/Ice/ObjectPrxHolder.java b/java/src/Ice/ObjectPrxHolder.java index a0b474330ce..48343349452 100644 --- a/java/src/Ice/ObjectPrxHolder.java +++ b/java/src/Ice/ObjectPrxHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class ObjectPrxHolder diff --git a/java/src/Ice/PluginFactory.java b/java/src/Ice/PluginFactory.java index f340cb1af3f..00d826704a1 100644 --- a/java/src/Ice/PluginFactory.java +++ b/java/src/Ice/PluginFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public interface PluginFactory diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java index bca98922c8e..5956990c479 100644 --- a/java/src/Ice/PluginManagerI.java +++ b/java/src/Ice/PluginManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class PluginManagerI extends LocalObjectImpl implements PluginManager diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 7c4414c1d7c..4eb2900adac 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; final class PropertiesI extends LocalObjectImpl implements Properties diff --git a/java/src/Ice/ProxyIdentityFacetKey.java b/java/src/Ice/ProxyIdentityFacetKey.java index bd9ba5beb4b..140728f8cb5 100644 --- a/java/src/Ice/ProxyIdentityFacetKey.java +++ b/java/src/Ice/ProxyIdentityFacetKey.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; // diff --git a/java/src/Ice/ProxyIdentityKey.java b/java/src/Ice/ProxyIdentityKey.java index 654746d059b..fd8a14a3654 100644 --- a/java/src/Ice/ProxyIdentityKey.java +++ b/java/src/Ice/ProxyIdentityKey.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; // diff --git a/java/src/Ice/RoutingTable.java b/java/src/Ice/RoutingTable.java index 23dd95f5462..59a6eaf975e 100644 --- a/java/src/Ice/RoutingTable.java +++ b/java/src/Ice/RoutingTable.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class RoutingTable diff --git a/java/src/Ice/ShortHolder.java b/java/src/Ice/ShortHolder.java index 597c0ba296c..96820c80854 100644 --- a/java/src/Ice/ShortHolder.java +++ b/java/src/Ice/ShortHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class ShortHolder diff --git a/java/src/Ice/StringHolder.java b/java/src/Ice/StringHolder.java index 4daa6fd1fcd..3e20a154550 100644 --- a/java/src/Ice/StringHolder.java +++ b/java/src/Ice/StringHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public final class StringHolder diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java index c00303b7879..d5036c03809 100644 --- a/java/src/Ice/SysLoggerI.java +++ b/java/src/Ice/SysLoggerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; import java.net.DatagramPacket; diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java index 7e6672d45ec..b86df1a7189 100644 --- a/java/src/Ice/UserException.java +++ b/java/src/Ice/UserException.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public abstract class UserException extends Exception diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index 73fc679b775..fffc4a7c6b2 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 e82dbe87eac..36e72b05f67 100644 --- a/java/src/Ice/_AMD_Object_ice_invoke.java +++ b/java/src/Ice/_AMD_Object_ice_invoke.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 649d476af8e..71a2b04e8c6 100644 --- a/java/src/Ice/_ObjectDel.java +++ b/java/src/Ice/_ObjectDel.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public interface _ObjectDel diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java index a079cc41522..a72bd539004 100644 --- a/java/src/Ice/_ObjectDelD.java +++ b/java/src/Ice/_ObjectDelD.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public class _ObjectDelD implements _ObjectDel diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java index 8b195a9ab1a..285ebfb82d0 100644 --- a/java/src/Ice/_ObjectDelM.java +++ b/java/src/Ice/_ObjectDelM.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 Ice; public class _ObjectDelM implements _ObjectDel diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index 93318a09a85..d3cf189776a 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceBox; public final class Admin diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java index 5414b128753..87227ac442a 100644 --- a/java/src/IceBox/Server.java +++ b/java/src/IceBox/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceBox; public final class Server extends Ice.Application diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 50b55b9c0c0..36007ac15d9 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceBox; public final class ServiceManagerI extends _ServiceManagerDisp diff --git a/java/src/IceInternal/Acceptor.java b/java/src/IceInternal/Acceptor.java index 1029d296ae8..8d021c62c00 100644 --- a/java/src/IceInternal/Acceptor.java +++ b/java/src/IceInternal/Acceptor.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface Acceptor diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 037779bc559..67e9820b481 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class BasicStream diff --git a/java/src/IceInternal/BufferManager.java b/java/src/IceInternal/BufferManager.java index 453744807af..0f4f13e5d93 100644 --- a/java/src/IceInternal/BufferManager.java +++ b/java/src/IceInternal/BufferManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class BufferManager diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java index f5cac639c81..6affc7d8b58 100644 --- a/java/src/IceInternal/Connection.java +++ b/java/src/IceInternal/Connection.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class Connection extends EventHandler diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java index 60565e3ddbd..c2801b33f4c 100644 --- a/java/src/IceInternal/ConnectionMonitor.java +++ b/java/src/IceInternal/ConnectionMonitor.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ConnectionMonitor extends Thread diff --git a/java/src/IceInternal/Connector.java b/java/src/IceInternal/Connector.java index 85dbd9e5b56..40c0689764b 100644 --- a/java/src/IceInternal/Connector.java +++ b/java/src/IceInternal/Connector.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface Connector diff --git a/java/src/IceInternal/DefaultsAndOverrides.java b/java/src/IceInternal/DefaultsAndOverrides.java index 437064e8b89..636322b646f 100644 --- a/java/src/IceInternal/DefaultsAndOverrides.java +++ b/java/src/IceInternal/DefaultsAndOverrides.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class DefaultsAndOverrides diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java index 42b0bddedcd..436ba4206c6 100644 --- a/java/src/IceInternal/Direct.java +++ b/java/src/IceInternal/Direct.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class Direct diff --git a/java/src/IceInternal/DispatchStatus.java b/java/src/IceInternal/DispatchStatus.java index 151da6a9056..1253c518d72 100644 --- a/java/src/IceInternal/DispatchStatus.java +++ b/java/src/IceInternal/DispatchStatus.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class DispatchStatus diff --git a/java/src/IceInternal/Endpoint.java b/java/src/IceInternal/Endpoint.java index 6b9ba67f338..52ca4e14851 100644 --- a/java/src/IceInternal/Endpoint.java +++ b/java/src/IceInternal/Endpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface Endpoint extends java.lang.Comparable diff --git a/java/src/IceInternal/EndpointFactory.java b/java/src/IceInternal/EndpointFactory.java index b6779752292..ae164c1628d 100644 --- a/java/src/IceInternal/EndpointFactory.java +++ b/java/src/IceInternal/EndpointFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface EndpointFactory diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java index 0103b04a76f..50e0ee2c88d 100644 --- a/java/src/IceInternal/EndpointFactoryManager.java +++ b/java/src/IceInternal/EndpointFactoryManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class EndpointFactoryManager diff --git a/java/src/IceInternal/EndpointHolder.java b/java/src/IceInternal/EndpointHolder.java index fe212c23fb5..ca5306d2ec3 100644 --- a/java/src/IceInternal/EndpointHolder.java +++ b/java/src/IceInternal/EndpointHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class EndpointHolder diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java index 05003aac745..f932db21a02 100644 --- a/java/src/IceInternal/EventHandler.java +++ b/java/src/IceInternal/EventHandler.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; abstract class EventHandler diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java index 68d0d8a1f69..6f976f8563f 100644 --- a/java/src/IceInternal/Incoming.java +++ b/java/src/IceInternal/Incoming.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final public class Incoming extends IncomingBase diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java index 9fdd2850930..bfedb5bd7d3 100644 --- a/java/src/IceInternal/IncomingAsync.java +++ b/java/src/IceInternal/IncomingAsync.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class IncomingAsync extends IncomingBase diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java index 47c0b513c6f..b3ea1c7a8c3 100644 --- a/java/src/IceInternal/IncomingBase.java +++ b/java/src/IceInternal/IncomingBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class IncomingBase diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index 1765c6c9e0d..438ce729070 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class IncomingConnectionFactory extends EventHandler diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index bdc9dc3c368..640f7519ea6 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class Instance diff --git a/java/src/IceInternal/IntMap.java b/java/src/IceInternal/IntMap.java index 4918a552b62..197f680bdc8 100755 --- a/java/src/IceInternal/IntMap.java +++ b/java/src/IceInternal/IntMap.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class IntMap diff --git a/java/src/IceInternal/ListPatcher.java b/java/src/IceInternal/ListPatcher.java index 6b917538e22..56b4939642c 100644 --- a/java/src/IceInternal/ListPatcher.java +++ b/java/src/IceInternal/ListPatcher.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class ListPatcher implements Patcher diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 33b6a69bef5..5f08f25d12f 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class LocatorInfo diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/IceInternal/LocatorManager.java index c35843690bf..26af962ccfb 100644 --- a/java/src/IceInternal/LocatorManager.java +++ b/java/src/IceInternal/LocatorManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class LocatorManager diff --git a/java/src/IceInternal/LocatorTable.java b/java/src/IceInternal/LocatorTable.java index 94040ebdf89..4db1fda63fa 100644 --- a/java/src/IceInternal/LocatorTable.java +++ b/java/src/IceInternal/LocatorTable.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class LocatorTable diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index c033fe8d5e3..94577614268 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class Network diff --git a/java/src/IceInternal/NonRepeatable.java b/java/src/IceInternal/NonRepeatable.java index 541729e542f..5de06980cac 100644 --- a/java/src/IceInternal/NonRepeatable.java +++ b/java/src/IceInternal/NonRepeatable.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class NonRepeatable extends Exception diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index 635d2d57df6..b806dcdf6ca 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ObjectAdapterFactory diff --git a/java/src/IceInternal/ObjectFactoryManager.java b/java/src/IceInternal/ObjectFactoryManager.java index 008fa05f085..a79732a4fe8 100644 --- a/java/src/IceInternal/ObjectFactoryManager.java +++ b/java/src/IceInternal/ObjectFactoryManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ObjectFactoryManager diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index 9dbd228c71c..47c1a02dea1 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class Outgoing diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java index 3323f8cd53a..9769c18cdb6 100644 --- a/java/src/IceInternal/OutgoingAsync.java +++ b/java/src/IceInternal/OutgoingAsync.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public abstract class OutgoingAsync diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java index bd8826e6dc9..d164db42516 100644 --- a/java/src/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/IceInternal/OutgoingConnectionFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class OutgoingConnectionFactory diff --git a/java/src/IceInternal/Patcher.java b/java/src/IceInternal/Patcher.java index ec4ba5e932e..ba5ac74c9de 100644 --- a/java/src/IceInternal/Patcher.java +++ b/java/src/IceInternal/Patcher.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface Patcher diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java index 6fdd5207c71..7d2472fbcd6 100644 --- a/java/src/IceInternal/Protocol.java +++ b/java/src/IceInternal/Protocol.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class Protocol diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java index c10489eec6f..11a8e172e62 100644 --- a/java/src/IceInternal/ProxyFactory.java +++ b/java/src/IceInternal/ProxyFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ProxyFactory diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index 3758d987613..5f7c6d9b036 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class Reference diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java index 988c4d3b84d..32c0ae7a1d3 100644 --- a/java/src/IceInternal/ReferenceFactory.java +++ b/java/src/IceInternal/ReferenceFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ReferenceFactory diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java index 2c120f7a76f..8d3d28af230 100644 --- a/java/src/IceInternal/RouterInfo.java +++ b/java/src/IceInternal/RouterInfo.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class RouterInfo diff --git a/java/src/IceInternal/RouterManager.java b/java/src/IceInternal/RouterManager.java index 4a0ce4e3a80..f944ea8025d 100644 --- a/java/src/IceInternal/RouterManager.java +++ b/java/src/IceInternal/RouterManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class RouterManager diff --git a/java/src/IceInternal/SequencePatcher.java b/java/src/IceInternal/SequencePatcher.java index 5318f12fcd9..5e4820a17d9 100644 --- a/java/src/IceInternal/SequencePatcher.java +++ b/java/src/IceInternal/SequencePatcher.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public class SequencePatcher implements Patcher diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index e2b18635e30..e839ee8425f 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ServantManager extends Thread diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java index 121fa487151..ce564c76b1a 100644 --- a/java/src/IceInternal/TcpAcceptor.java +++ b/java/src/IceInternal/TcpAcceptor.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; class TcpAcceptor implements Acceptor diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index bea30075b53..b8f001b9648 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class TcpConnector implements Connector diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java index f3caef8e921..ec24c5a1824 100644 --- a/java/src/IceInternal/TcpEndpoint.java +++ b/java/src/IceInternal/TcpEndpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class TcpEndpoint implements Endpoint diff --git a/java/src/IceInternal/TcpEndpointFactory.java b/java/src/IceInternal/TcpEndpointFactory.java index e9e01abdd98..83e11b94aea 100644 --- a/java/src/IceInternal/TcpEndpointFactory.java +++ b/java/src/IceInternal/TcpEndpointFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class TcpEndpointFactory implements EndpointFactory diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java index 62d7c228588..9f1a3dbda3a 100644 --- a/java/src/IceInternal/TcpTransceiver.java +++ b/java/src/IceInternal/TcpTransceiver.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class TcpTransceiver implements Transceiver diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java index 815d9173a04..fd9012c18af 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/IceInternal/ThreadPool.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ThreadPool diff --git a/java/src/IceInternal/TraceLevels.java b/java/src/IceInternal/TraceLevels.java index 1a309b661c3..949a7920d98 100644 --- a/java/src/IceInternal/TraceLevels.java +++ b/java/src/IceInternal/TraceLevels.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class TraceLevels diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java index f728c8bd08f..bdd896bb572 100644 --- a/java/src/IceInternal/TraceUtil.java +++ b/java/src/IceInternal/TraceUtil.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class TraceUtil diff --git a/java/src/IceInternal/Transceiver.java b/java/src/IceInternal/Transceiver.java index 5fb6290ae26..194be7f1853 100644 --- a/java/src/IceInternal/Transceiver.java +++ b/java/src/IceInternal/Transceiver.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface Transceiver diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java index 7cc1df5e978..483429dde7e 100644 --- a/java/src/IceInternal/UdpEndpoint.java +++ b/java/src/IceInternal/UdpEndpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class UdpEndpoint implements Endpoint diff --git a/java/src/IceInternal/UdpEndpointFactory.java b/java/src/IceInternal/UdpEndpointFactory.java index ea1478aba19..1fea6c5233f 100644 --- a/java/src/IceInternal/UdpEndpointFactory.java +++ b/java/src/IceInternal/UdpEndpointFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class UdpEndpointFactory implements EndpointFactory diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 7831a2b1fd6..6a00c87dc52 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class UdpTransceiver implements Transceiver diff --git a/java/src/IceInternal/UnknownEndpoint.java b/java/src/IceInternal/UnknownEndpoint.java index c45baae349e..df2ee3f3910 100644 --- a/java/src/IceInternal/UnknownEndpoint.java +++ b/java/src/IceInternal/UnknownEndpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; final class UnknownEndpoint implements Endpoint diff --git a/java/src/IceInternal/UserExceptionFactory.java b/java/src/IceInternal/UserExceptionFactory.java index 0d4c13d4731..77ea8a3e1c4 100644 --- a/java/src/IceInternal/UserExceptionFactory.java +++ b/java/src/IceInternal/UserExceptionFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public interface UserExceptionFactory diff --git a/java/src/IceInternal/UserExceptionFactoryManager.java b/java/src/IceInternal/UserExceptionFactoryManager.java index 006b9fae940..3d3a330cf1d 100644 --- a/java/src/IceInternal/UserExceptionFactoryManager.java +++ b/java/src/IceInternal/UserExceptionFactoryManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class UserExceptionFactoryManager diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java index 3be569d1397..57d62944227 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/IceInternal/ValueWriter.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceInternal; public final class ValueWriter diff --git a/java/src/IceUtil/Cache.java b/java/src/IceUtil/Cache.java index 3a1a2e44823..1fb36b30fce 100644 --- a/java/src/IceUtil/Cache.java +++ b/java/src/IceUtil/Cache.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; // diff --git a/java/src/IceUtil/CountDownLatch.java b/java/src/IceUtil/CountDownLatch.java index 885d686afc5..6f88a69ecd4 100644 --- a/java/src/IceUtil/CountDownLatch.java +++ b/java/src/IceUtil/CountDownLatch.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; // diff --git a/java/src/IceUtil/OutputBase.java b/java/src/IceUtil/OutputBase.java index 6da37d1c036..4f9efb17f40 100644 --- a/java/src/IceUtil/OutputBase.java +++ b/java/src/IceUtil/OutputBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; public class OutputBase diff --git a/java/src/IceUtil/Store.java b/java/src/IceUtil/Store.java index 9536e47459a..44077db5bfa 100644 --- a/java/src/IceUtil/Store.java +++ b/java/src/IceUtil/Store.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; public interface Store diff --git a/java/src/IceUtil/StringUtil.java b/java/src/IceUtil/StringUtil.java index 7dbc39e6b52..838fe42df7c 100644 --- a/java/src/IceUtil/StringUtil.java +++ b/java/src/IceUtil/StringUtil.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; public final class StringUtil diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 6e13c0ff25c..eef26096ac1 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; public final class Version diff --git a/java/src/IceUtil/XMLOutput.java b/java/src/IceUtil/XMLOutput.java index f78f3193ae3..95072f5f332 100644 --- a/java/src/IceUtil/XMLOutput.java +++ b/java/src/IceUtil/XMLOutput.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 IceUtil; public class XMLOutput extends OutputBase diff --git a/java/test/Freeze/build.xml b/java/test/Freeze/build.xml index 0af368865c5..4319a0fbc0d 100644 --- a/java/test/Freeze/build.xml +++ b/java/test/Freeze/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java index d6d8c69d48a..5fabb310857 100644 --- a/java/test/Freeze/complex/Client.java +++ b/java/test/Freeze/complex/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 dd8448595ac..a704aca44c2 100644 --- a/java/test/Freeze/complex/Complex.ice +++ b/java/test/Freeze/complex/Complex.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 240d4d3937e..e80415a7c52 100644 --- a/java/test/Freeze/complex/Complex/AddNodeI.java +++ b/java/test/Freeze/complex/Complex/AddNodeI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 ec68013ee1a..b4a8af6ceb9 100644 --- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java +++ b/java/test/Freeze/complex/Complex/MultiplyNodeI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 0b41c072061..f4888b40cc7 100644 --- a/java/test/Freeze/complex/Complex/NumberNodeI.java +++ b/java/test/Freeze/complex/Complex/NumberNodeI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 a0a46947972..c579bf389f3 100644 --- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java +++ b/java/test/Freeze/complex/Complex/ObjectFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 cc4f159c474..41ceaf072ca 100644 --- a/java/test/Freeze/complex/ParseError.java +++ b/java/test/Freeze/complex/ParseError.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e4b1d79c87a..d7a453d8e0e 100644 --- a/java/test/Freeze/complex/Parser.java +++ b/java/test/Freeze/complex/Parser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 013f1e87480..28413612e87 100644 --- a/java/test/Freeze/complex/build.xml +++ b/java/test/Freeze/complex/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py index 1fe52202148..88b44489485 100755 --- a/java/test/Freeze/complex/run.py +++ b/java/test/Freeze/complex/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 1751dd09826..5f5978fce21 100644 --- a/java/test/Freeze/dbmap/Client.java +++ b/java/test/Freeze/dbmap/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 afae706f8de..aff3ee81d08 100644 --- a/java/test/Freeze/dbmap/build.xml +++ b/java/test/Freeze/dbmap/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py index aa332c34106..9b45501ea29 100755 --- a/java/test/Freeze/dbmap/run.py +++ b/java/test/Freeze/dbmap/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 5fc34074e51..7e0d301cbed 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/Freeze/evictor/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d9740868219..04592947731 100644 --- a/java/test/Freeze/evictor/FacetI.java +++ b/java/test/Freeze/evictor/FacetI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 36addc0a105..64d6ad9472d 100644 --- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java +++ b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7568e5b1d00..7237f1fca35 100644 --- a/java/test/Freeze/evictor/RemoteEvictorI.java +++ b/java/test/Freeze/evictor/RemoteEvictorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4bf93565ddf..65537e2482a 100644 --- a/java/test/Freeze/evictor/ServantI.java +++ b/java/test/Freeze/evictor/ServantI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 82ad6615155..a9befbd9023 100644 --- a/java/test/Freeze/evictor/Server.java +++ b/java/test/Freeze/evictor/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 728d0a4bf19..331a41184a7 100644 --- a/java/test/Freeze/evictor/Test.ice +++ b/java/test/Freeze/evictor/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Freeze/evictor/build.xml b/java/test/Freeze/evictor/build.xml index c63d2711954..557c7ece437 100644 --- a/java/test/Freeze/evictor/build.xml +++ b/java/test/Freeze/evictor/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py index 3374339646c..481bee22fdd 100755 --- a/java/test/Freeze/evictor/run.py +++ b/java/test/Freeze/evictor/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 97da3cd79bd..c2849bb9ab4 100644 --- a/java/test/Glacier/build.xml +++ b/java/test/Glacier/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Glacier/starter/Callback.ice b/java/test/Glacier/starter/Callback.ice index 5df246bbb52..fb56ee553d1 100644 --- a/java/test/Glacier/starter/Callback.ice +++ b/java/test/Glacier/starter/Callback.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CALLBACK_ICE #define CALLBACK_ICE diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java index bacebe2e783..e026b19805a 100644 --- a/java/test/Glacier/starter/CallbackClient.java +++ b/java/test/Glacier/starter/CallbackClient.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e8def7f6aa2..048f4c47aac 100644 --- a/java/test/Glacier/starter/CallbackI.java +++ b/java/test/Glacier/starter/CallbackI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9192a5d0242..5e5d8ff8dcc 100644 --- a/java/test/Glacier/starter/CallbackReceiverI.java +++ b/java/test/Glacier/starter/CallbackReceiverI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 abf3236ef8e..afe840fe1c0 100644 --- a/java/test/Glacier/starter/CallbackServer.java +++ b/java/test/Glacier/starter/CallbackServer.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 f1be3c1c68e..875e6ae5b56 100644 --- a/java/test/Glacier/starter/Client.java +++ b/java/test/Glacier/starter/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7690c89702a..06f4c0fa320 100644 --- a/java/test/Glacier/starter/Server.java +++ b/java/test/Glacier/starter/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d1042de23c0..97a3da067f4 100644 --- a/java/test/Glacier/starter/build.xml +++ b/java/test/Glacier/starter/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Glacier/starter/run.py b/java/test/Glacier/starter/run.py index 67a3c21c2de..e083ec39d67 100755 --- a/java/test/Glacier/starter/run.py +++ b/java/test/Glacier/starter/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 165ec90507f..9042048a1f1 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5cebeb641a6..745c8ef10ca 100644 --- a/java/test/Ice/adapterDeactivation/Client.java +++ b/java/test/Ice/adapterDeactivation/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 2bf8d5efe22..b390f25dd50 100644 --- a/java/test/Ice/adapterDeactivation/Collocated.java +++ b/java/test/Ice/adapterDeactivation/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 47b14a9389e..f2b653a37ab 100644 --- a/java/test/Ice/adapterDeactivation/CookieI.java +++ b/java/test/Ice/adapterDeactivation/CookieI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 827c7bb4e3e..aed23396c93 100644 --- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java +++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 41ff804ab95..4c23de07fc5 100644 --- a/java/test/Ice/adapterDeactivation/Server.java +++ b/java/test/Ice/adapterDeactivation/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a3b0d2a4cca..61e539de9be 100644 --- a/java/test/Ice/adapterDeactivation/Test.ice +++ b/java/test/Ice/adapterDeactivation/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/Ice/adapterDeactivation/TestI.java index 1328cb78884..d35599a1426 100644 --- a/java/test/Ice/adapterDeactivation/TestI.java +++ b/java/test/Ice/adapterDeactivation/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b2475b65c39..1d8e1df8545 100644 --- a/java/test/Ice/adapterDeactivation/build.xml +++ b/java/test/Ice/adapterDeactivation/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py index 9e3e3d96485..31c6d729222 100755 --- a/java/test/Ice/adapterDeactivation/run.py +++ b/java/test/Ice/adapterDeactivation/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 31a6422e7a3..cc4ec564ab4 100644 --- a/java/test/Ice/build.xml +++ b/java/test/Ice/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/custom/AllTests.java b/java/test/Ice/custom/AllTests.java index bd3dac47bf0..7caa9e220f4 100644 --- a/java/test/Ice/custom/AllTests.java +++ b/java/test/Ice/custom/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 954b44d349e..4bed35f2413 100644 --- a/java/test/Ice/custom/Client.java +++ b/java/test/Ice/custom/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 27686802cdb..f3e67256c10 100644 --- a/java/test/Ice/custom/Collocated.java +++ b/java/test/Ice/custom/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e68903a54df..2076fe3e9c5 100644 --- a/java/test/Ice/custom/Server.java +++ b/java/test/Ice/custom/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 803ff2ef3b0..ce5b7477a8b 100644 --- a/java/test/Ice/custom/Test.ice +++ b/java/test/Ice/custom/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java index 9154f69f102..841b9c9851b 100644 --- a/java/test/Ice/custom/TestI.java +++ b/java/test/Ice/custom/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 cb609fc07f9..683f2254a4b 100644 --- a/java/test/Ice/custom/build.xml +++ b/java/test/Ice/custom/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/custom/run.py b/java/test/Ice/custom/run.py index cda47681e9e..aa587820d26 100755 --- a/java/test/Ice/custom/run.py +++ b/java/test/Ice/custom/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 e7bb8997b23..b507b2d7f5c 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b50ca5e3314..9df1ff4576f 100644 --- a/java/test/Ice/exceptions/Client.java +++ b/java/test/Ice/exceptions/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d9b0916e3af..c77fe73d2f6 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/Ice/exceptions/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 293ae10e0c5..4fa1338345a 100644 --- a/java/test/Ice/exceptions/DummyLogger.java +++ b/java/test/Ice/exceptions/DummyLogger.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 f12fd40e649..29c04eaf89c 100644 --- a/java/test/Ice/exceptions/EmptyI.java +++ b/java/test/Ice/exceptions/EmptyI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d0cb99f9aa3..18c7572ba54 100644 --- a/java/test/Ice/exceptions/ObjectFactoryI.java +++ b/java/test/Ice/exceptions/ObjectFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5a9a6c695de..e9766c21a13 100644 --- a/java/test/Ice/exceptions/ServantLocatorI.java +++ b/java/test/Ice/exceptions/ServantLocatorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 64d4385cbce..4fc221b91c8 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/Ice/exceptions/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 8b0392f68fc..f6d13e9d1df 100644 --- a/java/test/Ice/exceptions/Test.ice +++ b/java/test/Ice/exceptions/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java index c28594690c2..4006e6a215f 100644 --- a/java/test/Ice/exceptions/ThrowerI.java +++ b/java/test/Ice/exceptions/ThrowerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 212f29f55d8..0cebc81a471 100644 --- a/java/test/Ice/exceptions/build.xml +++ b/java/test/Ice/exceptions/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index 12502f0922e..4a8b0473027 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 293ae10e0c5..4fa1338345a 100644 --- a/java/test/Ice/exceptionsAMD/DummyLogger.java +++ b/java/test/Ice/exceptionsAMD/DummyLogger.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 64d4385cbce..4fc221b91c8 100644 --- a/java/test/Ice/exceptionsAMD/Server.java +++ b/java/test/Ice/exceptionsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 498e7bb82c9..11719036fda 100644 --- a/java/test/Ice/exceptionsAMD/TestAMD.ice +++ b/java/test/Ice/exceptionsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/java/test/Ice/exceptionsAMD/ThrowerI.java b/java/test/Ice/exceptionsAMD/ThrowerI.java index 445a50ce062..be7a9f2e116 100644 --- a/java/test/Ice/exceptionsAMD/ThrowerI.java +++ b/java/test/Ice/exceptionsAMD/ThrowerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3d6aab25fec..cdb4b74e147 100644 --- a/java/test/Ice/exceptionsAMD/build.xml +++ b/java/test/Ice/exceptionsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java index 64cd54dbce3..84f93f2046b 100644 --- a/java/test/Ice/facets/AI.java +++ b/java/test/Ice/facets/AI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7b4fdaf9fda..1f83dedde45 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c2d619dca26..5dc13f18884 100644 --- a/java/test/Ice/facets/BI.java +++ b/java/test/Ice/facets/BI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c3dba382a7b..b7bc6a89396 100644 --- a/java/test/Ice/facets/CI.java +++ b/java/test/Ice/facets/CI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 055f84451af..3aa5592873d 100644 --- a/java/test/Ice/facets/Client.java +++ b/java/test/Ice/facets/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4e801b031ab..d01eaa5ac70 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/Ice/facets/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3054a753463..2d086fd708f 100644 --- a/java/test/Ice/facets/DI.java +++ b/java/test/Ice/facets/DI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ec7c451e2bb..f3b2e7af2e6 100644 --- a/java/test/Ice/facets/EI.java +++ b/java/test/Ice/facets/EI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 f12fd40e649..29c04eaf89c 100644 --- a/java/test/Ice/facets/EmptyI.java +++ b/java/test/Ice/facets/EmptyI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ade5826322b..68e766f6da2 100644 --- a/java/test/Ice/facets/FI.java +++ b/java/test/Ice/facets/FI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 084a164a54b..ea39ff00943 100644 --- a/java/test/Ice/facets/GI.java +++ b/java/test/Ice/facets/GI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4f7529fa5a1..df2e7636328 100644 --- a/java/test/Ice/facets/HI.java +++ b/java/test/Ice/facets/HI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 48b7f306dd3..a6d16f28ae8 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/Ice/facets/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e8f202bff53..adfcb0b9c31 100644 --- a/java/test/Ice/facets/Test.ice +++ b/java/test/Ice/facets/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/facets/build.xml b/java/test/Ice/facets/build.xml index 61ab067fce1..b563200ba5b 100644 --- a/java/test/Ice/facets/build.xml +++ b/java/test/Ice/facets/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py index dad67e968b6..bbff4e82b87 100755 --- a/java/test/Ice/facets/run.py +++ b/java/test/Ice/facets/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 b5475160824..10931d1e2a9 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/Ice/faultTolerance/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 1326a9f1bbc..86a37a18aba 100644 --- a/java/test/Ice/faultTolerance/Client.java +++ b/java/test/Ice/faultTolerance/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c88b84e57b1..840b08078dc 100644 --- a/java/test/Ice/faultTolerance/Server.java +++ b/java/test/Ice/faultTolerance/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 15fa8e63042..aa61a3d687f 100644 --- a/java/test/Ice/faultTolerance/Test.ice +++ b/java/test/Ice/faultTolerance/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java index 43cbb1d22ea..db6ba133d80 100644 --- a/java/test/Ice/faultTolerance/TestI.java +++ b/java/test/Ice/faultTolerance/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3b01898fcec..e6fafc0b9cc 100644 --- a/java/test/Ice/faultTolerance/build.xml +++ b/java/test/Ice/faultTolerance/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py index 43a50481417..5bb1088e915 100755 --- a/java/test/Ice/faultTolerance/run.py +++ b/java/test/Ice/faultTolerance/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 ee24445b535..2210d3ca1dc 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 12de0c6621e..8b5d9ef263c 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ccd742c9264..6ede8b568b1 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 abf657f811c..c04b5c3a8af 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4b9c987a28b..cd40db1856c 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 99d52f996d1..f44c53c0dc9 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 05caab99648..67f15dae82e 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 09231bb72c9..f5a3b85baf6 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 833e0a9ea57..536ac0336da 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9f319bd82fa..0c1d60c4a28 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 839c3da2ca8..d893438aeeb 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 6f426b2dc8f..a932de05350 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5434755389f..6d1bd367b18 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7829bc57b83..3c532e6e855 100644 --- a/java/test/Ice/inheritance/Test.ice +++ b/java/test/Ice/inheritance/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TESTICE #define TESTICE diff --git a/java/test/Ice/inheritance/build.xml b/java/test/Ice/inheritance/build.xml index c5034b363f5..9dd63cc984b 100644 --- a/java/test/Ice/inheritance/build.xml +++ b/java/test/Ice/inheritance/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py index aeb05771824..7798c4ad682 100755 --- a/java/test/Ice/inheritance/run.py +++ b/java/test/Ice/inheritance/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 20919bf717e..b5a63504cec 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/Ice/location/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 332e5ee5b0e..edafd563ecf 100644 --- a/java/test/Ice/location/Client.java +++ b/java/test/Ice/location/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4a71c751481..3436535d9d9 100644 --- a/java/test/Ice/location/HelloI.java +++ b/java/test/Ice/location/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 bfd370aeb84..421d8d03531 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/Ice/location/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a9c8b5920a8..b2fce8e523e 100644 --- a/java/test/Ice/location/ServerLocator.java +++ b/java/test/Ice/location/ServerLocator.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 016c8e88854..e584a3c7937 100644 --- a/java/test/Ice/location/ServerLocatorRegistry.java +++ b/java/test/Ice/location/ServerLocatorRegistry.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 0cc460c8c7d..c074d88b40f 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 df89980dfa3..03f7b371bf9 100644 --- a/java/test/Ice/location/Test.ice +++ b/java/test/Ice/location/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java index 0154bd33c84..373bb50b44b 100644 --- a/java/test/Ice/location/TestI.java +++ b/java/test/Ice/location/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c8f3bd9c15f..8a142140669 100644 --- a/java/test/Ice/location/build.xml +++ b/java/test/Ice/location/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py index 9199a748598..49e2ba71056 100755 --- a/java/test/Ice/location/run.py +++ b/java/test/Ice/location/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 f76e15e27cf..9f31311b775 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/Ice/objects/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a48bcb95686..378cc8ad2c5 100644 --- a/java/test/Ice/objects/BI.java +++ b/java/test/Ice/objects/BI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 434b1e0841a..5299b2218b8 100644 --- a/java/test/Ice/objects/CI.java +++ b/java/test/Ice/objects/CI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 da98b117697..bb5b3c0a4ea 100644 --- a/java/test/Ice/objects/Client.java +++ b/java/test/Ice/objects/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 81683746af1..df9594fb9e7 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a1607e9d3f2..0b2a8a5c117 100644 --- a/java/test/Ice/objects/DI.java +++ b/java/test/Ice/objects/DI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 886df7ee8ec..5c11b97f3a0 100644 --- a/java/test/Ice/objects/InitialI.java +++ b/java/test/Ice/objects/InitialI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5434755389f..6d1bd367b18 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/Ice/objects/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5e2c75bca60..3f57616f160 100644 --- a/java/test/Ice/objects/Test.ice +++ b/java/test/Ice/objects/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/objects/build.xml b/java/test/Ice/objects/build.xml index 728fea8a699..86f5cdb4577 100644 --- a/java/test/Ice/objects/build.xml +++ b/java/test/Ice/objects/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py index d8cc4eddfa4..2ebf12357c0 100755 --- a/java/test/Ice/objects/run.py +++ b/java/test/Ice/objects/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 82e9f7323c7..496b377b447 100644 --- a/java/test/Ice/operations/AllTests.java +++ b/java/test/Ice/operations/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 07a76b16955..2f3fd8a2e77 100644 --- a/java/test/Ice/operations/Client.java +++ b/java/test/Ice/operations/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7ba8c80f29e..a8de2b7cc8e 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5ba14c9a12f..f1ca02f6b97 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/Ice/operations/MyDerivedClassI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 dfcf65ae9a4..eb61addc6f5 100644 --- a/java/test/Ice/operations/Server.java +++ b/java/test/Ice/operations/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 0910350a530..a819ad845a5 100644 --- a/java/test/Ice/operations/Test.ice +++ b/java/test/Ice/operations/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java index 95a8416a0dd..a6baef35002 100644 --- a/java/test/Ice/operations/Twoways.java +++ b/java/test/Ice/operations/Twoways.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 2cf611b63a9..33bb518cef1 100644 --- a/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/Ice/operations/TwowaysAMI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b8906a83f07..821c551fc4e 100644 --- a/java/test/Ice/operations/build.xml +++ b/java/test/Ice/operations/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py index e952a9dda9d..c19c8b15ba4 100755 --- a/java/test/Ice/operations/run.py +++ b/java/test/Ice/operations/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 0fe90e77057..36f3bd1192b 100644 --- a/java/test/Ice/operationsAMD/MyDerivedClassI.java +++ b/java/test/Ice/operationsAMD/MyDerivedClassI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 dfcf65ae9a4..eb61addc6f5 100644 --- a/java/test/Ice/operationsAMD/Server.java +++ b/java/test/Ice/operationsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 31593f263a8..e6f7f4f205d 100644 --- a/java/test/Ice/operationsAMD/TestAMD.ice +++ b/java/test/Ice/operationsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/java/test/Ice/operationsAMD/build.xml b/java/test/Ice/operationsAMD/build.xml index 7f15ed0e045..4d09acbf06f 100644 --- a/java/test/Ice/operationsAMD/build.xml +++ b/java/test/Ice/operationsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/build.xml b/java/test/Ice/slicing/build.xml index 13b87d98146..6d881d4cc9d 100644 --- a/java/test/Ice/slicing/build.xml +++ b/java/test/Ice/slicing/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/exceptions/Test.ice b/java/test/Ice/slicing/exceptions/Test.ice index d2543d47aac..cc3e8b3f85f 100644 --- a/java/test/Ice/slicing/exceptions/Test.ice +++ b/java/test/Ice/slicing/exceptions/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/slicing/exceptions/build.xml b/java/test/Ice/slicing/exceptions/build.xml index c3ef0513f53..bc1c2f6d832 100644 --- a/java/test/Ice/slicing/exceptions/build.xml +++ b/java/test/Ice/slicing/exceptions/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/exceptions/csrc/AllTests.java b/java/test/Ice/slicing/exceptions/csrc/AllTests.java index cbf23707893..1460fa7c977 100644 --- a/java/test/Ice/slicing/exceptions/csrc/AllTests.java +++ b/java/test/Ice/slicing/exceptions/csrc/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3563ee2688c..85d80b81283 100644 --- a/java/test/Ice/slicing/exceptions/csrc/Client.java +++ b/java/test/Ice/slicing/exceptions/csrc/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 543d6c7e899..880a506cae7 100755 --- a/java/test/Ice/slicing/exceptions/run.py +++ b/java/test/Ice/slicing/exceptions/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/Server.java +++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 343dbce5f88..7fb5f592869 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice +++ b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8223a078a47..27d6a77a9a6 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/TestI.java +++ b/java/test/Ice/slicing/exceptions/ssrc/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/exceptionsAMD/Server.java +++ b/java/test/Ice/slicing/exceptionsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 dc702e822c2..6d9bc64514b 100644 --- a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice +++ b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 4cce716566c..54f3dca65ec 100644 --- a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice +++ b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 be6891a09cc..a1d35f15963 100644 --- a/java/test/Ice/slicing/exceptionsAMD/TestI.java +++ b/java/test/Ice/slicing/exceptionsAMD/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d934c5b93bb..9e41ce1eada 100644 --- a/java/test/Ice/slicing/exceptionsAMD/build.xml +++ b/java/test/Ice/slicing/exceptionsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/objects/Forward.ice b/java/test/Ice/slicing/objects/Forward.ice index 4db43058410..74ae4b8c7e0 100644 --- a/java/test/Ice/slicing/objects/Forward.ice +++ b/java/test/Ice/slicing/objects/Forward.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 FORWARD_ICE #define FORWARD_ICE diff --git a/java/test/Ice/slicing/objects/Test.ice b/java/test/Ice/slicing/objects/Test.ice index a20f048ad34..3817f608833 100644 --- a/java/test/Ice/slicing/objects/Test.ice +++ b/java/test/Ice/slicing/objects/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/slicing/objects/build.xml b/java/test/Ice/slicing/objects/build.xml index 6770ae48940..edbce967bf4 100644 --- a/java/test/Ice/slicing/objects/build.xml +++ b/java/test/Ice/slicing/objects/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/objects/csrc/AllTests.java b/java/test/Ice/slicing/objects/csrc/AllTests.java index 7b52736aca8..0e6dc83e685 100644 --- a/java/test/Ice/slicing/objects/csrc/AllTests.java +++ b/java/test/Ice/slicing/objects/csrc/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3563ee2688c..85d80b81283 100644 --- a/java/test/Ice/slicing/objects/csrc/Client.java +++ b/java/test/Ice/slicing/objects/csrc/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7e583dfe238..c32c2495f52 100644 --- a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice +++ b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 CLIENTPRIVATE_ICE #define CLIENTPRIVATE_ICE diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py index dbbcff3b061..70f2c0f728c 100755 --- a/java/test/Ice/slicing/objects/run.py +++ b/java/test/Ice/slicing/objects/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/objects/ssrc/Server.java +++ b/java/test/Ice/slicing/objects/ssrc/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d0ebdefbe16..b963d10122d 100644 --- a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice +++ b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 bb880ebcbde..4e194bc545e 100644 --- a/java/test/Ice/slicing/objects/ssrc/TestI.java +++ b/java/test/Ice/slicing/objects/ssrc/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4db43058410..74ae4b8c7e0 100644 --- a/java/test/Ice/slicing/objectsAMD/Forward.ice +++ b/java/test/Ice/slicing/objectsAMD/Forward.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 FORWARD_ICE #define FORWARD_ICE diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java index 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/objectsAMD/Server.java +++ b/java/test/Ice/slicing/objectsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d385e2849f0..07e05c6a76b 100644 --- a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice +++ b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 c4815a7cdaf..b68706f831e 100644 --- a/java/test/Ice/slicing/objectsAMD/TestAMD.ice +++ b/java/test/Ice/slicing/objectsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 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 8073873ea78..6ee301fab6e 100644 --- a/java/test/Ice/slicing/objectsAMD/TestI.java +++ b/java/test/Ice/slicing/objectsAMD/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d1c266a67a2..25e757ebcd6 100644 --- a/java/test/Ice/slicing/objectsAMD/build.xml +++ b/java/test/Ice/slicing/objectsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/translator/DoubleModuleNoPackage.ice b/java/test/Ice/translator/DoubleModuleNoPackage.ice index 723b35f9696..1b6fc580ce9 100644 --- a/java/test/Ice/translator/DoubleModuleNoPackage.ice +++ b/java/test/Ice/translator/DoubleModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5a7df201832..3056ff1b464 100644 --- a/java/test/Ice/translator/DoubleModuleWithPackage.ice +++ b/java/test/Ice/translator/DoubleModuleWithPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 1cf3fc36798..d39a58016f8 100644 --- a/java/test/Ice/translator/NoModuleNoPackage.ice +++ b/java/test/Ice/translator/NoModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d590aa739e5..da080b08673 100644 --- a/java/test/Ice/translator/NoModuleWithPackage.ice +++ b/java/test/Ice/translator/NoModuleWithPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c1dc3433ff7..5dbd44d1f90 100644 --- a/java/test/Ice/translator/SingleModuleNoPackage.ice +++ b/java/test/Ice/translator/SingleModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 23c103125bf..c663f0bb040 100644 --- a/java/test/Ice/translator/SingleModuleWithPackage.ice +++ b/java/test/Ice/translator/SingleModuleWithPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 15ac9621717..6b889c904fb 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 76bf79a9ccb..66f4c4c00ac 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a61e2d85cc6..dfd6295bc4f 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e1ae41f3fa9..7682f3168aa 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 89a92192ac9..119c53ddd6a 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 2c2e60bd5db..f0c5d700131 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d2a8c4cd5d3..a66324989dd 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 bba2776fd88..efec105c6e5 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 62843ec4d67..1b364da1a48 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 4f493ce6149..f768127cebc 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 bc5aace0000..a5cd85405c2 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 beec08a6270..1c638c54a08 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 7ad92bba2cc..5d283a9830f 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e494fc678bc..437302728ca 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 0d44e887be9..c63b788a807 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 330b6965cb8..1b40488ccbb 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 93a270b066b..d27eaca36ff 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9edaf560cbe..46411487200 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 562377a340c..0f4997bea02 100644 --- a/java/test/Ice/translator/TestNoModuleNoPackage.ice +++ b/java/test/Ice/translator/TestNoModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b9c77eefe25..c7c067b62a8 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage1.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 8b4afe434a0..c1135cd23b6 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage2.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 cd9f41eb3d6..abc14df7948 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage3.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 b6fa4ceca4c..3274e0ea440 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 13e48377445..492afc92314 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 90c9134dd09..7b0cdcbd463 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 01d0c5b122f..397660dbf14 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 369e4c69682..1a76e64a223 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 f9b77caa9df..feb9ad159d5 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage9.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a775f6bb35b..92ab08d3dd5 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9bd34021425..4f7320ad228 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 2876dd2190f..e5cb0f8391c 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 77ee74a2c5f..f72a913c27c 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3fb729c12c4..ca669372c2c 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c069b058ce8..9cbf384a919 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 718d13caa84..70ffa49466f 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 56911ab6520..e1bbd7f9fcc 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a71db34273f..3ac1ada5a31 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 6c3e5381d00..33caef67eaa 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3716c351814..6f02e212f72 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 3409d165a1b..909b35f31a2 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 9dc14073bb9..15db195cbc2 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d0ef349deae..306825dc3a9 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 42644543b34..87b2896d526 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ad23903e285..8ee2795d49c 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5714863b1a8..ef354e1c57c 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 854195a6a96..f6b1a3d3ff5 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 a224b1b368f..91849a99531 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e5798fe8b0a..16cc51993eb 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e3a735ae984..4cf0c8e88fd 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 5469f916621..a7faf6dce10 100644 --- a/java/test/Ice/translator/build.xml +++ b/java/test/Ice/translator/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/build.xml b/java/test/IcePack/build.xml index 358bf01b317..f1f68050b9a 100644 --- a/java/test/IcePack/build.xml +++ b/java/test/IcePack/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java index 32085d8764c..b73fd9e83b8 100644 --- a/java/test/IcePack/deployer/AllTests.java +++ b/java/test/IcePack/deployer/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 fec8c602c0c..29da225e4d5 100644 --- a/java/test/IcePack/deployer/Client.java +++ b/java/test/IcePack/deployer/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 6e18a4b8376..19ad3afb024 100644 --- a/java/test/IcePack/deployer/FreezeService.java +++ b/java/test/IcePack/deployer/FreezeService.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ff8c39a0a0b..d64eeef4582 100644 --- a/java/test/IcePack/deployer/Server.java +++ b/java/test/IcePack/deployer/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 c63af18de8f..19a216c30d7 100644 --- a/java/test/IcePack/deployer/Service.java +++ b/java/test/IcePack/deployer/Service.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 19578e1c328..04841b0d1db 100644 --- a/java/test/IcePack/deployer/Test.ice +++ b/java/test/IcePack/deployer/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/IcePack/deployer/TestI.java b/java/test/IcePack/deployer/TestI.java index 074830757ae..d5607a99684 100644 --- a/java/test/IcePack/deployer/TestI.java +++ b/java/test/IcePack/deployer/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 ce3236f5dbf..c00f7feec3a 100644 --- a/java/test/IcePack/deployer/build.xml +++ b/java/test/IcePack/deployer/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/deployer/run.py b/java/test/IcePack/deployer/run.py index d7d5609ee20..6a36e7aaec4 100755 --- a/java/test/IcePack/deployer/run.py +++ b/java/test/IcePack/deployer/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 b3a3ab836b2..ddfec7a3243 100644 --- a/java/test/IcePack/simple/AllTests.java +++ b/java/test/IcePack/simple/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 e5848a3eb43..9f33b45fb58 100644 --- a/java/test/IcePack/simple/Client.java +++ b/java/test/IcePack/simple/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 d42df4080d5..1cbc748ff9f 100644 --- a/java/test/IcePack/simple/Server.java +++ b/java/test/IcePack/simple/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 65fe5377ad3..54953223857 100644 --- a/java/test/IcePack/simple/Test.ice +++ b/java/test/IcePack/simple/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. 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 TEST_ICE #define TEST_ICE diff --git a/java/test/IcePack/simple/TestI.java b/java/test/IcePack/simple/TestI.java index 512f105b120..a9b4b293dd4 100644 --- a/java/test/IcePack/simple/TestI.java +++ b/java/test/IcePack/simple/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // 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 13eee488eb5..89d94456ab6 100644 --- a/java/test/IcePack/simple/build.xml +++ b/java/test/IcePack/simple/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/simple/run.py b/java/test/IcePack/simple/run.py index e25b2b50059..1aac5489546 100755 --- a/java/test/IcePack/simple/run.py +++ b/java/test/IcePack/simple/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # 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 dbbfce57f4b..ce21250d972 100644 --- a/java/test/build.xml +++ b/java/test/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. |