diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-05-18 03:15:02 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-05-18 03:15:02 +0000 |
| commit | ebe2d4dca31883e8d539654590f19c142ddd20ed (patch) | |
| tree | 41d3d309c42a761826e674537332fc5c0cf8be40 /cpp/test | |
| parent | Updated Windows installer for Ice 1.4.0 (diff) | |
| download | ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.bz2 ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.xz ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.zip | |
Fixed copyright
Diffstat (limited to 'cpp/test')
291 files changed, 471 insertions, 1701 deletions
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 |