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 /java | |
| 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 'java')
478 files changed, 478 insertions, 2818 deletions
diff --git a/java/Makefile b/java/Makefile index 21bad43d52d..cc4dd7a83d5 100644 --- a/java/Makefile +++ b/java/Makefile @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - all: ant -emacs diff --git a/java/allTests.py b/java/allTests.py index fe7cf475e7a..b8575c4ed9f 100755 --- a/java/allTests.py +++ b/java/allTests.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys import getopt diff --git a/java/ant/Slice2FreezeJTask.java b/java/ant/Slice2FreezeJTask.java index 4b6964efadf..5153aded9a1 100644 --- a/java/ant/Slice2FreezeJTask.java +++ b/java/ant/Slice2FreezeJTask.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - //package Ice.Ant; import org.apache.tools.ant.Task; diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java index f98f12942c9..7ea34743a97 100644 --- a/java/ant/Slice2JavaTask.java +++ b/java/ant/Slice2JavaTask.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - //package Ice.Ant; import org.apache.tools.ant.Task; diff --git a/java/ant/SliceDefine.java b/java/ant/SliceDefine.java index cf72fba7142..4fca91050c5 100644 --- a/java/ant/SliceDefine.java +++ b/java/ant/SliceDefine.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - //package Ice.Ant; public class SliceDefine diff --git a/java/ant/SliceTask.java b/java/ant/SliceTask.java index 3c6dc94d518..11fac78ff8f 100644 --- a/java/ant/SliceTask.java +++ b/java/ant/SliceTask.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - //package Ice.Ant; import org.apache.tools.ant.Task; diff --git a/java/build.xml b/java/build.xml index 25c76d0e61f..c670f8f66e3 100644 --- a/java/build.xml +++ b/java/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/config/IcePackAdmin.py b/java/config/IcePackAdmin.py index c144c48bd5e..22b5fc4a8eb 100644 --- a/java/config/IcePackAdmin.py +++ b/java/config/IcePackAdmin.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import sys, os, TestUtil from threading import Thread diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index 76514e0c886..64a53d86a64 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - # # Set the host to the host name the test servers are running on. If # not set, Ice will try to find out the IP address for the diff --git a/java/config/build.properties b/java/config/build.properties index e857cf49696..cf2ee55ffb7 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -1,17 +1,12 @@ # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - # # Define optimize as on if you want to build with optimization. # diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java index a0cae7e60c2..f7aee6eb942 100644 --- a/java/demo/Freeze/bench/Client.java +++ b/java/demo/Freeze/bench/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class TestApp extends Ice.Application { TestApp(String envName) diff --git a/java/demo/Freeze/bench/StopWatch.java b/java/demo/Freeze/bench/StopWatch.java index c5b8689f362..96aa7807143 100644 --- a/java/demo/Freeze/bench/StopWatch.java +++ b/java/demo/Freeze/bench/StopWatch.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class StopWatch { StopWatch() diff --git a/java/demo/Freeze/bench/Test.ice b/java/demo/Freeze/bench/Test.ice index d32b95cb2f9..40dfef6a96e 100644 --- a/java/demo/Freeze/bench/Test.ice +++ b/java/demo/Freeze/bench/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - struct Struct1 { long l; diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml index b11bd0910c9..5fc12961ceb 100644 --- a/java/demo/Freeze/bench/build.xml +++ b/java/demo/Freeze/bench/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Freeze/build.xml b/java/demo/Freeze/build.xml index 73cbc60e3df..418ccc46e6e 100644 --- a/java/demo/Freeze/build.xml +++ b/java/demo/Freeze/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Freeze/library/BookFactory.java b/java/demo/Freeze/library/BookFactory.java index af620cb255b..85bc9cbb723 100644 --- a/java/demo/Freeze/library/BookFactory.java +++ b/java/demo/Freeze/library/BookFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class BookFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory { public Ice.Object diff --git a/java/demo/Freeze/library/BookI.java b/java/demo/Freeze/library/BookI.java index e6fc4b06065..5dacd3f4679 100644 --- a/java/demo/Freeze/library/BookI.java +++ b/java/demo/Freeze/library/BookI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class BookI extends Book { // diff --git a/java/demo/Freeze/library/Client.java b/java/demo/Freeze/library/Client.java index 2cdeb366f81..b45e33eb878 100644 --- a/java/demo/Freeze/library/Client.java +++ b/java/demo/Freeze/library/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client extends Ice.Application { public int diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java index 50ee2d70553..ef37915cd76 100644 --- a/java/demo/Freeze/library/Collocated.java +++ b/java/demo/Freeze/library/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class LibraryCollocated extends Ice.Application { public int diff --git a/java/demo/Freeze/library/Grammar.java b/java/demo/Freeze/library/Grammar.java index d28fbfca613..13ae77d7352 100644 --- a/java/demo/Freeze/library/Grammar.java +++ b/java/demo/Freeze/library/Grammar.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Grammar { Grammar(Parser p) diff --git a/java/demo/Freeze/library/Library.ice b/java/demo/Freeze/library/Library.ice index e437c235493..915aa6bff4c 100644 --- a/java/demo/Freeze/library/Library.ice +++ b/java/demo/Freeze/library/Library.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef LIBRARY_ICE #define LIBRARY_ICE diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java index f58e21f02d2..7ab176841c5 100644 --- a/java/demo/Freeze/library/LibraryI.java +++ b/java/demo/Freeze/library/LibraryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class LibraryI extends _LibraryDisp { public synchronized BookPrx diff --git a/java/demo/Freeze/library/Parser.java b/java/demo/Freeze/library/Parser.java index ae35dd7da5f..1dc7262e109 100644 --- a/java/demo/Freeze/library/Parser.java +++ b/java/demo/Freeze/library/Parser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Parser { Parser(Ice.Communicator communicator, LibraryPrx library) diff --git a/java/demo/Freeze/library/RunParser.java b/java/demo/Freeze/library/RunParser.java index 1572eea56e7..5fdcf782e4a 100644 --- a/java/demo/Freeze/library/RunParser.java +++ b/java/demo/Freeze/library/RunParser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class RunParser { static void diff --git a/java/demo/Freeze/library/Scanner.java b/java/demo/Freeze/library/Scanner.java index b481bb672cc..4910d29f565 100644 --- a/java/demo/Freeze/library/Scanner.java +++ b/java/demo/Freeze/library/Scanner.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Scanner { Scanner(Parser p) diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index 0508a85516d..6eca5f48aa6 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class LibraryServer extends Ice.Application { public int diff --git a/java/demo/Freeze/library/Token.java b/java/demo/Freeze/library/Token.java index ad4ea892805..b406551cf15 100644 --- a/java/demo/Freeze/library/Token.java +++ b/java/demo/Freeze/library/Token.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Token { public static final int TOK_HELP = 0; diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml index 8dcb8276307..60b088f3ad2 100644 --- a/java/demo/Freeze/library/build.xml +++ b/java/demo/Freeze/library/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Freeze/phonebook/Client.java b/java/demo/Freeze/phonebook/Client.java index dff82bff1a2..ca7d7a9eaf1 100644 --- a/java/demo/Freeze/phonebook/Client.java +++ b/java/demo/Freeze/phonebook/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client extends Ice.Application { public int diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java index 3eb0a8ae763..fcf8813580f 100644 --- a/java/demo/Freeze/phonebook/Collocated.java +++ b/java/demo/Freeze/phonebook/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class PhoneBookCollocated extends Ice.Application { public int diff --git a/java/demo/Freeze/phonebook/ContactFactory.java b/java/demo/Freeze/phonebook/ContactFactory.java index d62f52f5056..10a1b8a782b 100644 --- a/java/demo/Freeze/phonebook/ContactFactory.java +++ b/java/demo/Freeze/phonebook/ContactFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class ContactFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory { public Ice.Object diff --git a/java/demo/Freeze/phonebook/ContactI.java b/java/demo/Freeze/phonebook/ContactI.java index 6d5c66dc570..e1fb1662e04 100644 --- a/java/demo/Freeze/phonebook/ContactI.java +++ b/java/demo/Freeze/phonebook/ContactI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class ContactI extends Contact { // diff --git a/java/demo/Freeze/phonebook/Grammar.java b/java/demo/Freeze/phonebook/Grammar.java index fe01ed29a90..8c6ed5f8328 100644 --- a/java/demo/Freeze/phonebook/Grammar.java +++ b/java/demo/Freeze/phonebook/Grammar.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Grammar { Grammar(Parser p) diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java index 8d709140792..e4a745ddae3 100644 --- a/java/demo/Freeze/phonebook/Parser.java +++ b/java/demo/Freeze/phonebook/Parser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Parser { Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook) diff --git a/java/demo/Freeze/phonebook/PhoneBook.ice b/java/demo/Freeze/phonebook/PhoneBook.ice index 5b357258cbd..61c502f3c88 100644 --- a/java/demo/Freeze/phonebook/PhoneBook.ice +++ b/java/demo/Freeze/phonebook/PhoneBook.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef PHONE_BOOK_ICE #define PHONE_BOOK_ICE diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java index 374a05f8df2..b0f21c0d76d 100644 --- a/java/demo/Freeze/phonebook/PhoneBookI.java +++ b/java/demo/Freeze/phonebook/PhoneBookI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class PhoneBookI extends _PhoneBookDisp { public ContactPrx diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java index 9c5465335ef..4c564dbb671 100644 --- a/java/demo/Freeze/phonebook/RunParser.java +++ b/java/demo/Freeze/phonebook/RunParser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class RunParser { static void diff --git a/java/demo/Freeze/phonebook/Scanner.java b/java/demo/Freeze/phonebook/Scanner.java index a30ab8d8ec1..f61e03b7461 100644 --- a/java/demo/Freeze/phonebook/Scanner.java +++ b/java/demo/Freeze/phonebook/Scanner.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Scanner { Scanner(Parser p) diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 9c99272f42e..e6d647040c9 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class PhoneBookServer extends Ice.Application { public int diff --git a/java/demo/Freeze/phonebook/Token.java b/java/demo/Freeze/phonebook/Token.java index 10c9d75756b..7f86679d9d0 100644 --- a/java/demo/Freeze/phonebook/Token.java +++ b/java/demo/Freeze/phonebook/Token.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Token { public static final int TOK_HELP = 0; diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml index d0ec6247327..9f388a27df8 100644 --- a/java/demo/Freeze/phonebook/build.xml +++ b/java/demo/Freeze/phonebook/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Glacier/build.xml b/java/demo/Glacier/build.xml index cde310bbdf2..cd29896a5cb 100644 --- a/java/demo/Glacier/build.xml +++ b/java/demo/Glacier/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java index 109c647b0de..2ed45e994fc 100644 --- a/java/demo/Glacier/session/Client.java +++ b/java/demo/Glacier/session/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/Glacier/session/HelloSession.ice b/java/demo/Glacier/session/HelloSession.ice index 32f111b0783..250083428f5 100644 --- a/java/demo/Glacier/session/HelloSession.ice +++ b/java/demo/Glacier/session/HelloSession.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef HELLO_ICE #define HELLO_ICE diff --git a/java/demo/Glacier/session/HelloSessionI.java b/java/demo/Glacier/session/HelloSessionI.java index d9451643334..430c1f4e619 100644 --- a/java/demo/Glacier/session/HelloSessionI.java +++ b/java/demo/Glacier/session/HelloSessionI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - final class HelloSessionI extends HelloSession { public diff --git a/java/demo/Glacier/session/HelloSessionManagerI.java b/java/demo/Glacier/session/HelloSessionManagerI.java index 553c61e0c83..b6c14ad6ea0 100644 --- a/java/demo/Glacier/session/HelloSessionManagerI.java +++ b/java/demo/Glacier/session/HelloSessionManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - final class HelloSessionManagerI extends Glacier._SessionManagerDisp { HelloSessionManagerI(Ice.ObjectAdapter adapter) diff --git a/java/demo/Glacier/session/Server.java b/java/demo/Glacier/session/Server.java index 55e8275c3de..90852bfb895 100644 --- a/java/demo/Glacier/session/Server.java +++ b/java/demo/Glacier/session/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { static class PermissionsVerifierI extends Glacier._PermissionsVerifierDisp diff --git a/java/demo/Glacier/session/build.xml b/java/demo/Glacier/session/build.xml index ee8b1270012..9f001a832d5 100644 --- a/java/demo/Glacier/session/build.xml +++ b/java/demo/Glacier/session/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/build.xml b/java/demo/Ice/build.xml index 3d5e1d76494..f4b3746329b 100644 --- a/java/demo/Ice/build.xml +++ b/java/demo/Ice/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice index da64c2948e3..d275d358d91 100644 --- a/java/demo/Ice/callback/Callback.ice +++ b/java/demo/Ice/callback/Callback.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef CALLBACK_ICE #define CALLBACK_ICE diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java index 038d8e109c9..6009fdcab97 100644 --- a/java/demo/Ice/callback/CallbackClient.java +++ b/java/demo/Ice/callback/CallbackClient.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class CallbackClient extends Ice.Application { private static void diff --git a/java/demo/Ice/callback/CallbackI.java b/java/demo/Ice/callback/CallbackI.java index c46d189d143..2d5aa324ad0 100644 --- a/java/demo/Ice/callback/CallbackI.java +++ b/java/demo/Ice/callback/CallbackI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CallbackI extends Callback { public void diff --git a/java/demo/Ice/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java index 3850e55cdf7..c408da821c2 100644 --- a/java/demo/Ice/callback/CallbackReceiverI.java +++ b/java/demo/Ice/callback/CallbackReceiverI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CallbackReceiverI extends CallbackReceiver { public void diff --git a/java/demo/Ice/callback/CallbackServer.java b/java/demo/Ice/callback/CallbackServer.java index bbff1e815aa..ea007ed9a51 100644 --- a/java/demo/Ice/callback/CallbackServer.java +++ b/java/demo/Ice/callback/CallbackServer.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class CallbackServer extends Ice.Application { public int diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java index dd3a234e570..0c12f41ed47 100644 --- a/java/demo/Ice/callback/Client.java +++ b/java/demo/Ice/callback/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { public static void diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java index e676c6d302f..8238584f4a2 100644 --- a/java/demo/Ice/callback/Server.java +++ b/java/demo/Ice/callback/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { public static void diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml index b760dbb1bbe..1e2e2629b22 100644 --- a/java/demo/Ice/callback/build.xml +++ b/java/demo/Ice/callback/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java index 653dce189dc..11158a5b276 100644 --- a/java/demo/Ice/hello/Client.java +++ b/java/demo/Ice/hello/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/Ice/hello/Hello.ice b/java/demo/Ice/hello/Hello.ice index 882e96b8a55..10a98cc1ad3 100644 --- a/java/demo/Ice/hello/Hello.ice +++ b/java/demo/Ice/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef HELLO_ICE #define HELLO_ICE diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java index e9ac52c046d..02b174e8051 100644 --- a/java/demo/Ice/hello/HelloI.java +++ b/java/demo/Ice/hello/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloI extends Hello { public void diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java index 3dd477891be..73e77b92fa9 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/demo/Ice/hello/build.xml b/java/demo/Ice/hello/build.xml index 33c1d527a3f..6eef4ec76a3 100644 --- a/java/demo/Ice/hello/build.xml +++ b/java/demo/Ice/hello/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java index f26f4168477..aed3aba460b 100644 --- a/java/demo/Ice/latency/Client.java +++ b/java/demo/Ice/latency/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/demo/Ice/latency/Latency.ice b/java/demo/Ice/latency/Latency.ice index b11e6cf4e94..04c9673ec48 100644 --- a/java/demo/Ice/latency/Latency.ice +++ b/java/demo/Ice/latency/Latency.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef LATENCY_ICE #define LATENCY_ICE diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index d77f0986042..9ec218222b1 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/demo/Ice/latency/build.xml b/java/demo/Ice/latency/build.xml index 079ad40dbdb..edef21888fb 100644 --- a/java/demo/Ice/latency/build.xml +++ b/java/demo/Ice/latency/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java index 670c3455ac9..34987604e03 100644 --- a/java/demo/Ice/nested/Client.java +++ b/java/demo/Ice/nested/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { public static void diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice index e629bbe88d2..aaa52fd6780 100644 --- a/java/demo/Ice/nested/Nested.ice +++ b/java/demo/Ice/nested/Nested.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef NESTED_ICE #define NESTED_ICE diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java index 592d41a34d9..48e277e0bbe 100644 --- a/java/demo/Ice/nested/NestedClient.java +++ b/java/demo/Ice/nested/NestedClient.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class NestedClient extends Ice.Application { public int diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java index 53f4de87b2b..8f45576a92d 100644 --- a/java/demo/Ice/nested/NestedI.java +++ b/java/demo/Ice/nested/NestedI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class NestedI extends Nested { NestedI(NestedPrx self) diff --git a/java/demo/Ice/nested/NestedServer.java b/java/demo/Ice/nested/NestedServer.java index 1bf3b44e1de..3606a1a83eb 100644 --- a/java/demo/Ice/nested/NestedServer.java +++ b/java/demo/Ice/nested/NestedServer.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class NestedServer extends Ice.Application { public int diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java index a8723ba8760..8301d252e5f 100644 --- a/java/demo/Ice/nested/Server.java +++ b/java/demo/Ice/nested/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { public static void diff --git a/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml index 64eff32aa03..d081199b0a7 100644 --- a/java/demo/Ice/nested/build.xml +++ b/java/demo/Ice/nested/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java index b351851057e..37ea5d400e8 100644 --- a/java/demo/Ice/throughput/Client.java +++ b/java/demo/Ice/throughput/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java index 9208c55e19e..3a436876e3e 100644 --- a/java/demo/Ice/throughput/Server.java +++ b/java/demo/Ice/throughput/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/demo/Ice/throughput/Throughput.ice b/java/demo/Ice/throughput/Throughput.ice index 3b02a3861d9..20195e9924e 100644 --- a/java/demo/Ice/throughput/Throughput.ice +++ b/java/demo/Ice/throughput/Throughput.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef THROUGHPUT_ICE #define THROUGHPUT_ICE diff --git a/java/demo/Ice/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java index 51b1fe843c1..733033072fa 100644 --- a/java/demo/Ice/throughput/ThroughputI.java +++ b/java/demo/Ice/throughput/ThroughputI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ThroughputI extends _ThroughputDisp { public diff --git a/java/demo/Ice/throughput/build.xml b/java/demo/Ice/throughput/build.xml index 81b50a74b89..8cdf0a56fb4 100644 --- a/java/demo/Ice/throughput/build.xml +++ b/java/demo/Ice/throughput/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java index acd54eee8da..1a3c2b03ddc 100644 --- a/java/demo/Ice/value/Client.java +++ b/java/demo/Ice/value/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java index acb67aa8661..329047ca33e 100644 --- a/java/demo/Ice/value/DerivedPrinterI.java +++ b/java/demo/Ice/value/DerivedPrinterI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class DerivedPrinterI extends DerivedPrinter { public void diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java index 5aa50a2571d..e9bbfb79734 100644 --- a/java/demo/Ice/value/InitialI.java +++ b/java/demo/Ice/value/InitialI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class InitialI extends Initial { InitialI(Ice.ObjectAdapter adapter) diff --git a/java/demo/Ice/value/ObjectFactory.java b/java/demo/Ice/value/ObjectFactory.java index bd8e81a17a8..2bcae1fdece 100644 --- a/java/demo/Ice/value/ObjectFactory.java +++ b/java/demo/Ice/value/ObjectFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class ObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory { public Ice.Object diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java index 3ceff35cbf7..50e5a4f723b 100644 --- a/java/demo/Ice/value/PrinterI.java +++ b/java/demo/Ice/value/PrinterI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class PrinterI extends Printer { public void diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java index 572ae6c369e..3e3325b8a9e 100644 --- a/java/demo/Ice/value/Server.java +++ b/java/demo/Ice/value/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice index b4196a7bee3..b8f03f2448b 100644 --- a/java/demo/Ice/value/Value.ice +++ b/java/demo/Ice/value/Value.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef VALUE_ICE #define VALUE_ICE diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml index 0129d1c1844..f23fec5412e 100644 --- a/java/demo/Ice/value/build.xml +++ b/java/demo/Ice/value/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IceBox/build.xml b/java/demo/IceBox/build.xml index e9b524ad9bb..8868fa3350c 100644 --- a/java/demo/IceBox/build.xml +++ b/java/demo/IceBox/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java index 9e9ee6f0938..263cb446dfa 100644 --- a/java/demo/IceBox/hello/Client.java +++ b/java/demo/IceBox/hello/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice index 7fc2c380953..0ae5c36e63f 100644 --- a/java/demo/IceBox/hello/Hello.ice +++ b/java/demo/IceBox/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef HELLO_ICE #define HELLO_ICE diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java index e9ac52c046d..02b174e8051 100644 --- a/java/demo/IceBox/hello/HelloI.java +++ b/java/demo/IceBox/hello/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloI extends Hello { public void diff --git a/java/demo/IceBox/hello/HelloServiceI.java b/java/demo/IceBox/hello/HelloServiceI.java index 3cc2f24d26c..bb6d611f8eb 100644 --- a/java/demo/IceBox/hello/HelloServiceI.java +++ b/java/demo/IceBox/hello/HelloServiceI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service { public void diff --git a/java/demo/IceBox/hello/build.xml b/java/demo/IceBox/hello/build.xml index a0860dae79d..7766704576b 100644 --- a/java/demo/IceBox/hello/build.xml +++ b/java/demo/IceBox/hello/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IcePack/build.xml b/java/demo/IcePack/build.xml index 66b8896ecfb..9882e0f63dd 100644 --- a/java/demo/IcePack/build.xml +++ b/java/demo/IcePack/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IcePack/hello/Client.java b/java/demo/IcePack/hello/Client.java index 1b06bd619c4..b1bb01a86b0 100644 --- a/java/demo/IcePack/hello/Client.java +++ b/java/demo/IcePack/hello/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/IcePack/hello/Hello.ice b/java/demo/IcePack/hello/Hello.ice index 97af57216f4..1fa498dd67c 100644 --- a/java/demo/IcePack/hello/Hello.ice +++ b/java/demo/IcePack/hello/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef HELLO_ICE #define HELLO_ICE diff --git a/java/demo/IcePack/hello/HelloFactoryI.java b/java/demo/IcePack/hello/HelloFactoryI.java index 26483ed7913..4182726508f 100644 --- a/java/demo/IcePack/hello/HelloFactoryI.java +++ b/java/demo/IcePack/hello/HelloFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloFactoryI extends _HelloFactoryDisp { public HelloPrx diff --git a/java/demo/IcePack/hello/HelloI.java b/java/demo/IcePack/hello/HelloI.java index 77f32062eb3..faf5805610d 100644 --- a/java/demo/IcePack/hello/HelloI.java +++ b/java/demo/IcePack/hello/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloI extends Hello { HelloI(String n) diff --git a/java/demo/IcePack/hello/HelloServiceI.java b/java/demo/IcePack/hello/HelloServiceI.java index 416ab087cf5..66a0c52d217 100644 --- a/java/demo/IcePack/hello/HelloServiceI.java +++ b/java/demo/IcePack/hello/HelloServiceI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service { public void diff --git a/java/demo/IcePack/hello/Server.java b/java/demo/IcePack/hello/Server.java index 5d6816b8456..1d241a1584d 100644 --- a/java/demo/IcePack/hello/Server.java +++ b/java/demo/IcePack/hello/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server extends Ice.Application { public int diff --git a/java/demo/IcePack/hello/build.xml b/java/demo/IcePack/hello/build.xml index eadb9cc5171..7505ba9ef16 100644 --- a/java/demo/IcePack/hello/build.xml +++ b/java/demo/IcePack/hello/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/IcePack/simple/Client.java b/java/demo/IcePack/simple/Client.java index 112cfa802cc..030b050bbc9 100644 --- a/java/demo/IcePack/simple/Client.java +++ b/java/demo/IcePack/simple/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/demo/IcePack/simple/Hello.ice b/java/demo/IcePack/simple/Hello.ice index 882e96b8a55..10a98cc1ad3 100644 --- a/java/demo/IcePack/simple/Hello.ice +++ b/java/demo/IcePack/simple/Hello.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef HELLO_ICE #define HELLO_ICE diff --git a/java/demo/IcePack/simple/HelloI.java b/java/demo/IcePack/simple/HelloI.java index e9ac52c046d..02b174e8051 100644 --- a/java/demo/IcePack/simple/HelloI.java +++ b/java/demo/IcePack/simple/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloI extends Hello { public void diff --git a/java/demo/IcePack/simple/HelloServiceI.java b/java/demo/IcePack/simple/HelloServiceI.java index 1cbfa69fb5a..87ca1860443 100644 --- a/java/demo/IcePack/simple/HelloServiceI.java +++ b/java/demo/IcePack/simple/HelloServiceI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service { public void diff --git a/java/demo/IcePack/simple/Server.java b/java/demo/IcePack/simple/Server.java index 34a96a12f7b..663952dc9e0 100644 --- a/java/demo/IcePack/simple/Server.java +++ b/java/demo/IcePack/simple/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server extends Ice.Application { public int diff --git a/java/demo/IcePack/simple/build.xml b/java/demo/IcePack/simple/build.xml index 61ade4ff85c..24ec5e6f8fc 100644 --- a/java/demo/IcePack/simple/build.xml +++ b/java/demo/IcePack/simple/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/book/evictor/EvictorBase.java b/java/demo/book/evictor/EvictorBase.java index b33bf21d00e..3324aac363c 100644 --- a/java/demo/book/evictor/EvictorBase.java +++ b/java/demo/book/evictor/EvictorBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Evictor; public abstract class EvictorBase extends Ice.LocalObjectImpl implements Ice.ServantLocator diff --git a/java/demo/book/evictor/LinkedList.java b/java/demo/book/evictor/LinkedList.java index 2361b33337c..98e0e495312 100644 --- a/java/demo/book/evictor/LinkedList.java +++ b/java/demo/book/evictor/LinkedList.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Evictor; // diff --git a/java/demo/build.xml b/java/demo/build.xml index 9e2d9954138..f0b72cbde29 100644 --- a/java/demo/build.xml +++ b/java/demo/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/makebindist.py b/java/makebindist.py index a88364687b7..546d958e857 100755 --- a/java/makebindist.py +++ b/java/makebindist.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys, shutil, fnmatch, re, string # diff --git a/java/makedist.py b/java/makedist.py index 5e50a7a1153..bb265ef502c 100755 --- a/java/makedist.py +++ b/java/makedist.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys, shutil, fnmatch, re # diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java index fdd5a13ae2e..37a8be7c062 100755 --- a/java/src/Freeze/ConnectionI.java +++ b/java/src/Freeze/ConnectionI.java @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/EvictorElement.java index bfaa9717074..5e3635b0615 100644 --- a/java/src/Freeze/EvictorElement.java +++ b/java/src/Freeze/EvictorElement.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; class EvictorElement extends Ice.LocalObjectImpl diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java index 042b241f78f..dfb769c98a3 100644 --- a/java/src/Freeze/EvictorI.java +++ b/java/src/Freeze/EvictorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java index f0e4f0a362f..20bb5ecc29c 100644 --- a/java/src/Freeze/EvictorIteratorI.java +++ b/java/src/Freeze/EvictorIteratorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; class EvictorIteratorI extends Ice.LocalObjectImpl implements EvictorIterator diff --git a/java/src/Freeze/FatalErrorCallback.java b/java/src/Freeze/FatalErrorCallback.java index a5621e10600..9e615423b88 100644 --- a/java/src/Freeze/FatalErrorCallback.java +++ b/java/src/Freeze/FatalErrorCallback.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; public interface FatalErrorCallback diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/Index.java index a47104f5f26..76e5df06f93 100644 --- a/java/src/Freeze/Index.java +++ b/java/src/Freeze/Index.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; public abstract class Index implements com.sleepycat.db.DbSecondaryKeyCreate diff --git a/java/src/Freeze/LinkedList.java b/java/src/Freeze/LinkedList.java index c40e63cc68e..61765821463 100644 --- a/java/src/Freeze/LinkedList.java +++ b/java/src/Freeze/LinkedList.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; // diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/Map.java index 91ee586325e..3759827af8c 100644 --- a/java/src/Freeze/Map.java +++ b/java/src/Freeze/Map.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; public abstract class Map extends java.util.AbstractMap diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java index 12a97a09fe7..b7aae62e46a 100644 --- a/java/src/Freeze/ObjectStore.java +++ b/java/src/Freeze/ObjectStore.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; class ObjectStore implements IceUtil.Store diff --git a/java/src/Freeze/SharedDb.java b/java/src/Freeze/SharedDb.java index c74778464fe..60610d0859f 100755 --- a/java/src/Freeze/SharedDb.java +++ b/java/src/Freeze/SharedDb.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; class SharedDb extends com.sleepycat.db.Db diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/SharedDbEnv.java index 53a521ca80f..c11fa68bc5c 100644 --- a/java/src/Freeze/SharedDbEnv.java +++ b/java/src/Freeze/SharedDbEnv.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; class SharedDbEnv extends com.sleepycat.db.DbEnv implements com.sleepycat.db.DbErrcall, Runnable diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/TransactionI.java index d5a199e7359..49cc059823f 100755 --- a/java/src/Freeze/TransactionI.java +++ b/java/src/Freeze/TransactionI.java @@ -1,10 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/java/src/Freeze/Util.java b/java/src/Freeze/Util.java index aa03497363d..712ba11ebc2 100644 --- a/java/src/Freeze/Util.java +++ b/java/src/Freeze/Util.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Freeze; public class Util diff --git a/java/src/Ice/AMD_Object_ice_invoke.java b/java/src/Ice/AMD_Object_ice_invoke.java index 28cff522627..5ff00e3095d 100644 --- a/java/src/Ice/AMD_Object_ice_invoke.java +++ b/java/src/Ice/AMD_Object_ice_invoke.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public interface AMD_Object_ice_invoke diff --git a/java/src/Ice/AMI_Object_ice_invoke.java b/java/src/Ice/AMI_Object_ice_invoke.java index 0a9a20d72a6..1d49abbce98 100644 --- a/java/src/Ice/AMI_Object_ice_invoke.java +++ b/java/src/Ice/AMI_Object_ice_invoke.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class AMI_Object_ice_invoke extends IceInternal.OutgoingAsync diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java index 692dc40bb5a..028250ee33d 100644 --- a/java/src/Ice/Application.java +++ b/java/src/Ice/Application.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class Application diff --git a/java/src/Ice/Blobject.java b/java/src/Ice/Blobject.java index 9719786a76a..fa0e9df7055 100644 --- a/java/src/Ice/Blobject.java +++ b/java/src/Ice/Blobject.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class Blobject extends Ice.ObjectImpl diff --git a/java/src/Ice/BlobjectAsync.java b/java/src/Ice/BlobjectAsync.java index 533a78d8470..c62e202cc87 100644 --- a/java/src/Ice/BlobjectAsync.java +++ b/java/src/Ice/BlobjectAsync.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class BlobjectAsync extends Ice.ObjectImpl diff --git a/java/src/Ice/BooleanHolder.java b/java/src/Ice/BooleanHolder.java index 985f5868bb7..e69fdffea33 100644 --- a/java/src/Ice/BooleanHolder.java +++ b/java/src/Ice/BooleanHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class BooleanHolder diff --git a/java/src/Ice/ByteHolder.java b/java/src/Ice/ByteHolder.java index 04889dd0d90..9d8860779a6 100644 --- a/java/src/Ice/ByteHolder.java +++ b/java/src/Ice/ByteHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class ByteHolder diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java index f4bf63466a0..3c5eb68b315 100644 --- a/java/src/Ice/CommunicatorI.java +++ b/java/src/Ice/CommunicatorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; final class CommunicatorI extends LocalObjectImpl implements Communicator diff --git a/java/src/Ice/DoubleHolder.java b/java/src/Ice/DoubleHolder.java index 1c40c12e3d5..54ab63b44c8 100644 --- a/java/src/Ice/DoubleHolder.java +++ b/java/src/Ice/DoubleHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class DoubleHolder diff --git a/java/src/Ice/FloatHolder.java b/java/src/Ice/FloatHolder.java index 33984e6f10b..6038d894c72 100644 --- a/java/src/Ice/FloatHolder.java +++ b/java/src/Ice/FloatHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class FloatHolder diff --git a/java/src/Ice/IntHolder.java b/java/src/Ice/IntHolder.java index 96f75482881..363c6f2f686 100644 --- a/java/src/Ice/IntHolder.java +++ b/java/src/Ice/IntHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class IntHolder diff --git a/java/src/Ice/LocalException.java b/java/src/Ice/LocalException.java index 974aea74706..a6c6e166bb4 100644 --- a/java/src/Ice/LocalException.java +++ b/java/src/Ice/LocalException.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class LocalException extends RuntimeException diff --git a/java/src/Ice/LocalObject.java b/java/src/Ice/LocalObject.java index aca135b60b7..2b2e6cf6849 100644 --- a/java/src/Ice/LocalObject.java +++ b/java/src/Ice/LocalObject.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public interface LocalObject diff --git a/java/src/Ice/LocalObjectHolder.java b/java/src/Ice/LocalObjectHolder.java index 479f7072135..78aad02b2d9 100644 --- a/java/src/Ice/LocalObjectHolder.java +++ b/java/src/Ice/LocalObjectHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class LocalObjectHolder diff --git a/java/src/Ice/LocalObjectImpl.java b/java/src/Ice/LocalObjectImpl.java index d0981b022ee..1fedbc642e2 100644 --- a/java/src/Ice/LocalObjectImpl.java +++ b/java/src/Ice/LocalObjectImpl.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class LocalObjectImpl implements LocalObject, java.lang.Cloneable diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java index f883f92f50f..24ed8f2b8d8 100644 --- a/java/src/Ice/LoggerI.java +++ b/java/src/Ice/LoggerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class LoggerI extends LocalObjectImpl implements Logger diff --git a/java/src/Ice/LongHolder.java b/java/src/Ice/LongHolder.java index ce143667ff9..5444c28ac6d 100644 --- a/java/src/Ice/LongHolder.java +++ b/java/src/Ice/LongHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class LongHolder diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java index 53652f11672..854324b273c 100644 --- a/java/src/Ice/Object.java +++ b/java/src/Ice/Object.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public interface Object diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 57cdcb4e59f..6c4803268c1 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/ObjectHolder.java index 08246e5b403..54f3303ed26 100644 --- a/java/src/Ice/ObjectHolder.java +++ b/java/src/Ice/ObjectHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class ObjectHolder diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java index 9446bd1447b..179f9d5cf65 100644 --- a/java/src/Ice/ObjectImpl.java +++ b/java/src/Ice/ObjectImpl.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public class ObjectImpl implements Object, java.lang.Cloneable diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java index 3ac00e76ce0..1aab12bea25 100644 --- a/java/src/Ice/ObjectPrx.java +++ b/java/src/Ice/ObjectPrx.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public interface ObjectPrx diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java index 2cf7ac5fae4..b87dcee662e 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/ObjectPrxHelper.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public class ObjectPrxHelper extends ObjectPrxHelperBase diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index c54124090e9..4ffbe2003ea 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public class ObjectPrxHelperBase implements ObjectPrx diff --git a/java/src/Ice/ObjectPrxHolder.java b/java/src/Ice/ObjectPrxHolder.java index a0b474330ce..48343349452 100644 --- a/java/src/Ice/ObjectPrxHolder.java +++ b/java/src/Ice/ObjectPrxHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class ObjectPrxHolder diff --git a/java/src/Ice/PluginFactory.java b/java/src/Ice/PluginFactory.java index f340cb1af3f..00d826704a1 100644 --- a/java/src/Ice/PluginFactory.java +++ b/java/src/Ice/PluginFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public interface PluginFactory diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java index bca98922c8e..5956990c479 100644 --- a/java/src/Ice/PluginManagerI.java +++ b/java/src/Ice/PluginManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class PluginManagerI extends LocalObjectImpl implements PluginManager diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 7c4414c1d7c..4eb2900adac 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; final class PropertiesI extends LocalObjectImpl implements Properties diff --git a/java/src/Ice/ProxyIdentityFacetKey.java b/java/src/Ice/ProxyIdentityFacetKey.java index bd9ba5beb4b..140728f8cb5 100644 --- a/java/src/Ice/ProxyIdentityFacetKey.java +++ b/java/src/Ice/ProxyIdentityFacetKey.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; // diff --git a/java/src/Ice/ProxyIdentityKey.java b/java/src/Ice/ProxyIdentityKey.java index 654746d059b..fd8a14a3654 100644 --- a/java/src/Ice/ProxyIdentityKey.java +++ b/java/src/Ice/ProxyIdentityKey.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; // diff --git a/java/src/Ice/RoutingTable.java b/java/src/Ice/RoutingTable.java index 23dd95f5462..59a6eaf975e 100644 --- a/java/src/Ice/RoutingTable.java +++ b/java/src/Ice/RoutingTable.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class RoutingTable diff --git a/java/src/Ice/ShortHolder.java b/java/src/Ice/ShortHolder.java index 597c0ba296c..96820c80854 100644 --- a/java/src/Ice/ShortHolder.java +++ b/java/src/Ice/ShortHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class ShortHolder diff --git a/java/src/Ice/StringHolder.java b/java/src/Ice/StringHolder.java index 4daa6fd1fcd..3e20a154550 100644 --- a/java/src/Ice/StringHolder.java +++ b/java/src/Ice/StringHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class StringHolder diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java index c00303b7879..d5036c03809 100644 --- a/java/src/Ice/SysLoggerI.java +++ b/java/src/Ice/SysLoggerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; import java.net.DatagramPacket; diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java index 7e6672d45ec..b86df1a7189 100644 --- a/java/src/Ice/UserException.java +++ b/java/src/Ice/UserException.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public abstract class UserException extends Exception diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index 73fc679b775..fffc4a7c6b2 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public final class Util diff --git a/java/src/Ice/_AMD_Object_ice_invoke.java b/java/src/Ice/_AMD_Object_ice_invoke.java index e82dbe87eac..36e72b05f67 100644 --- a/java/src/Ice/_AMD_Object_ice_invoke.java +++ b/java/src/Ice/_AMD_Object_ice_invoke.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; final class _AMD_Object_ice_invoke extends IceInternal.IncomingAsync implements AMD_Object_ice_invoke diff --git a/java/src/Ice/_ObjectDel.java b/java/src/Ice/_ObjectDel.java index 649d476af8e..71a2b04e8c6 100644 --- a/java/src/Ice/_ObjectDel.java +++ b/java/src/Ice/_ObjectDel.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public interface _ObjectDel diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java index a079cc41522..a72bd539004 100644 --- a/java/src/Ice/_ObjectDelD.java +++ b/java/src/Ice/_ObjectDelD.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public class _ObjectDelD implements _ObjectDel diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java index 8b195a9ab1a..285ebfb82d0 100644 --- a/java/src/Ice/_ObjectDelM.java +++ b/java/src/Ice/_ObjectDelM.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Ice; public class _ObjectDelM implements _ObjectDel diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index 93318a09a85..d3cf189776a 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceBox; public final class Admin diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java index 5414b128753..87227ac442a 100644 --- a/java/src/IceBox/Server.java +++ b/java/src/IceBox/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceBox; public final class Server extends Ice.Application diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 50b55b9c0c0..36007ac15d9 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceBox; public final class ServiceManagerI extends _ServiceManagerDisp diff --git a/java/src/IceInternal/Acceptor.java b/java/src/IceInternal/Acceptor.java index 1029d296ae8..8d021c62c00 100644 --- a/java/src/IceInternal/Acceptor.java +++ b/java/src/IceInternal/Acceptor.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface Acceptor diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 037779bc559..67e9820b481 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class BasicStream diff --git a/java/src/IceInternal/BufferManager.java b/java/src/IceInternal/BufferManager.java index 453744807af..0f4f13e5d93 100644 --- a/java/src/IceInternal/BufferManager.java +++ b/java/src/IceInternal/BufferManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class BufferManager diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java index f5cac639c81..6affc7d8b58 100644 --- a/java/src/IceInternal/Connection.java +++ b/java/src/IceInternal/Connection.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class Connection extends EventHandler diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java index 60565e3ddbd..c2801b33f4c 100644 --- a/java/src/IceInternal/ConnectionMonitor.java +++ b/java/src/IceInternal/ConnectionMonitor.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ConnectionMonitor extends Thread diff --git a/java/src/IceInternal/Connector.java b/java/src/IceInternal/Connector.java index 85dbd9e5b56..40c0689764b 100644 --- a/java/src/IceInternal/Connector.java +++ b/java/src/IceInternal/Connector.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface Connector diff --git a/java/src/IceInternal/DefaultsAndOverrides.java b/java/src/IceInternal/DefaultsAndOverrides.java index 437064e8b89..636322b646f 100644 --- a/java/src/IceInternal/DefaultsAndOverrides.java +++ b/java/src/IceInternal/DefaultsAndOverrides.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class DefaultsAndOverrides diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java index 42b0bddedcd..436ba4206c6 100644 --- a/java/src/IceInternal/Direct.java +++ b/java/src/IceInternal/Direct.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class Direct diff --git a/java/src/IceInternal/DispatchStatus.java b/java/src/IceInternal/DispatchStatus.java index 151da6a9056..1253c518d72 100644 --- a/java/src/IceInternal/DispatchStatus.java +++ b/java/src/IceInternal/DispatchStatus.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class DispatchStatus diff --git a/java/src/IceInternal/Endpoint.java b/java/src/IceInternal/Endpoint.java index 6b9ba67f338..52ca4e14851 100644 --- a/java/src/IceInternal/Endpoint.java +++ b/java/src/IceInternal/Endpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface Endpoint extends java.lang.Comparable diff --git a/java/src/IceInternal/EndpointFactory.java b/java/src/IceInternal/EndpointFactory.java index b6779752292..ae164c1628d 100644 --- a/java/src/IceInternal/EndpointFactory.java +++ b/java/src/IceInternal/EndpointFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface EndpointFactory diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java index 0103b04a76f..50e0ee2c88d 100644 --- a/java/src/IceInternal/EndpointFactoryManager.java +++ b/java/src/IceInternal/EndpointFactoryManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class EndpointFactoryManager diff --git a/java/src/IceInternal/EndpointHolder.java b/java/src/IceInternal/EndpointHolder.java index fe212c23fb5..ca5306d2ec3 100644 --- a/java/src/IceInternal/EndpointHolder.java +++ b/java/src/IceInternal/EndpointHolder.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class EndpointHolder diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java index 05003aac745..f932db21a02 100644 --- a/java/src/IceInternal/EventHandler.java +++ b/java/src/IceInternal/EventHandler.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; abstract class EventHandler diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java index 68d0d8a1f69..6f976f8563f 100644 --- a/java/src/IceInternal/Incoming.java +++ b/java/src/IceInternal/Incoming.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final public class Incoming extends IncomingBase diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java index 9fdd2850930..bfedb5bd7d3 100644 --- a/java/src/IceInternal/IncomingAsync.java +++ b/java/src/IceInternal/IncomingAsync.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class IncomingAsync extends IncomingBase diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java index 47c0b513c6f..b3ea1c7a8c3 100644 --- a/java/src/IceInternal/IncomingBase.java +++ b/java/src/IceInternal/IncomingBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class IncomingBase diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index 1765c6c9e0d..438ce729070 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class IncomingConnectionFactory extends EventHandler diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index bdc9dc3c368..640f7519ea6 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class Instance diff --git a/java/src/IceInternal/IntMap.java b/java/src/IceInternal/IntMap.java index 4918a552b62..197f680bdc8 100755 --- a/java/src/IceInternal/IntMap.java +++ b/java/src/IceInternal/IntMap.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class IntMap diff --git a/java/src/IceInternal/ListPatcher.java b/java/src/IceInternal/ListPatcher.java index 6b917538e22..56b4939642c 100644 --- a/java/src/IceInternal/ListPatcher.java +++ b/java/src/IceInternal/ListPatcher.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class ListPatcher implements Patcher diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 33b6a69bef5..5f08f25d12f 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class LocatorInfo diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/IceInternal/LocatorManager.java index c35843690bf..26af962ccfb 100644 --- a/java/src/IceInternal/LocatorManager.java +++ b/java/src/IceInternal/LocatorManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class LocatorManager diff --git a/java/src/IceInternal/LocatorTable.java b/java/src/IceInternal/LocatorTable.java index 94040ebdf89..4db1fda63fa 100644 --- a/java/src/IceInternal/LocatorTable.java +++ b/java/src/IceInternal/LocatorTable.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class LocatorTable diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index c033fe8d5e3..94577614268 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class Network diff --git a/java/src/IceInternal/NonRepeatable.java b/java/src/IceInternal/NonRepeatable.java index 541729e542f..5de06980cac 100644 --- a/java/src/IceInternal/NonRepeatable.java +++ b/java/src/IceInternal/NonRepeatable.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class NonRepeatable extends Exception diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index 635d2d57df6..b806dcdf6ca 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ObjectAdapterFactory diff --git a/java/src/IceInternal/ObjectFactoryManager.java b/java/src/IceInternal/ObjectFactoryManager.java index 008fa05f085..a79732a4fe8 100644 --- a/java/src/IceInternal/ObjectFactoryManager.java +++ b/java/src/IceInternal/ObjectFactoryManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ObjectFactoryManager diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index 9dbd228c71c..47c1a02dea1 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class Outgoing diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java index 3323f8cd53a..9769c18cdb6 100644 --- a/java/src/IceInternal/OutgoingAsync.java +++ b/java/src/IceInternal/OutgoingAsync.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public abstract class OutgoingAsync diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java index bd8826e6dc9..d164db42516 100644 --- a/java/src/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/IceInternal/OutgoingConnectionFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class OutgoingConnectionFactory diff --git a/java/src/IceInternal/Patcher.java b/java/src/IceInternal/Patcher.java index ec4ba5e932e..ba5ac74c9de 100644 --- a/java/src/IceInternal/Patcher.java +++ b/java/src/IceInternal/Patcher.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface Patcher diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java index 6fdd5207c71..7d2472fbcd6 100644 --- a/java/src/IceInternal/Protocol.java +++ b/java/src/IceInternal/Protocol.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class Protocol diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java index c10489eec6f..11a8e172e62 100644 --- a/java/src/IceInternal/ProxyFactory.java +++ b/java/src/IceInternal/ProxyFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ProxyFactory diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index 3758d987613..5f7c6d9b036 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class Reference diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java index 988c4d3b84d..32c0ae7a1d3 100644 --- a/java/src/IceInternal/ReferenceFactory.java +++ b/java/src/IceInternal/ReferenceFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ReferenceFactory diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java index 2c120f7a76f..8d3d28af230 100644 --- a/java/src/IceInternal/RouterInfo.java +++ b/java/src/IceInternal/RouterInfo.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class RouterInfo diff --git a/java/src/IceInternal/RouterManager.java b/java/src/IceInternal/RouterManager.java index 4a0ce4e3a80..f944ea8025d 100644 --- a/java/src/IceInternal/RouterManager.java +++ b/java/src/IceInternal/RouterManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class RouterManager diff --git a/java/src/IceInternal/SequencePatcher.java b/java/src/IceInternal/SequencePatcher.java index 5318f12fcd9..5e4820a17d9 100644 --- a/java/src/IceInternal/SequencePatcher.java +++ b/java/src/IceInternal/SequencePatcher.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public class SequencePatcher implements Patcher diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index e2b18635e30..e839ee8425f 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ServantManager extends Thread diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java index 121fa487151..ce564c76b1a 100644 --- a/java/src/IceInternal/TcpAcceptor.java +++ b/java/src/IceInternal/TcpAcceptor.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; class TcpAcceptor implements Acceptor diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index bea30075b53..b8f001b9648 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class TcpConnector implements Connector diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java index f3caef8e921..ec24c5a1824 100644 --- a/java/src/IceInternal/TcpEndpoint.java +++ b/java/src/IceInternal/TcpEndpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class TcpEndpoint implements Endpoint diff --git a/java/src/IceInternal/TcpEndpointFactory.java b/java/src/IceInternal/TcpEndpointFactory.java index e9e01abdd98..83e11b94aea 100644 --- a/java/src/IceInternal/TcpEndpointFactory.java +++ b/java/src/IceInternal/TcpEndpointFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class TcpEndpointFactory implements EndpointFactory diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java index 62d7c228588..9f1a3dbda3a 100644 --- a/java/src/IceInternal/TcpTransceiver.java +++ b/java/src/IceInternal/TcpTransceiver.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class TcpTransceiver implements Transceiver diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java index 815d9173a04..fd9012c18af 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/IceInternal/ThreadPool.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ThreadPool diff --git a/java/src/IceInternal/TraceLevels.java b/java/src/IceInternal/TraceLevels.java index 1a309b661c3..949a7920d98 100644 --- a/java/src/IceInternal/TraceLevels.java +++ b/java/src/IceInternal/TraceLevels.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class TraceLevels diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java index f728c8bd08f..bdd896bb572 100644 --- a/java/src/IceInternal/TraceUtil.java +++ b/java/src/IceInternal/TraceUtil.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class TraceUtil diff --git a/java/src/IceInternal/Transceiver.java b/java/src/IceInternal/Transceiver.java index 5fb6290ae26..194be7f1853 100644 --- a/java/src/IceInternal/Transceiver.java +++ b/java/src/IceInternal/Transceiver.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface Transceiver diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java index 7cc1df5e978..483429dde7e 100644 --- a/java/src/IceInternal/UdpEndpoint.java +++ b/java/src/IceInternal/UdpEndpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class UdpEndpoint implements Endpoint diff --git a/java/src/IceInternal/UdpEndpointFactory.java b/java/src/IceInternal/UdpEndpointFactory.java index ea1478aba19..1fea6c5233f 100644 --- a/java/src/IceInternal/UdpEndpointFactory.java +++ b/java/src/IceInternal/UdpEndpointFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class UdpEndpointFactory implements EndpointFactory diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 7831a2b1fd6..6a00c87dc52 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class UdpTransceiver implements Transceiver diff --git a/java/src/IceInternal/UnknownEndpoint.java b/java/src/IceInternal/UnknownEndpoint.java index c45baae349e..df2ee3f3910 100644 --- a/java/src/IceInternal/UnknownEndpoint.java +++ b/java/src/IceInternal/UnknownEndpoint.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; final class UnknownEndpoint implements Endpoint diff --git a/java/src/IceInternal/UserExceptionFactory.java b/java/src/IceInternal/UserExceptionFactory.java index 0d4c13d4731..77ea8a3e1c4 100644 --- a/java/src/IceInternal/UserExceptionFactory.java +++ b/java/src/IceInternal/UserExceptionFactory.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public interface UserExceptionFactory diff --git a/java/src/IceInternal/UserExceptionFactoryManager.java b/java/src/IceInternal/UserExceptionFactoryManager.java index 006b9fae940..3d3a330cf1d 100644 --- a/java/src/IceInternal/UserExceptionFactoryManager.java +++ b/java/src/IceInternal/UserExceptionFactoryManager.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class UserExceptionFactoryManager diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java index 3be569d1397..57d62944227 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/IceInternal/ValueWriter.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceInternal; public final class ValueWriter diff --git a/java/src/IceUtil/Cache.java b/java/src/IceUtil/Cache.java index 3a1a2e44823..1fb36b30fce 100644 --- a/java/src/IceUtil/Cache.java +++ b/java/src/IceUtil/Cache.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; // diff --git a/java/src/IceUtil/CountDownLatch.java b/java/src/IceUtil/CountDownLatch.java index 885d686afc5..6f88a69ecd4 100644 --- a/java/src/IceUtil/CountDownLatch.java +++ b/java/src/IceUtil/CountDownLatch.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; // diff --git a/java/src/IceUtil/OutputBase.java b/java/src/IceUtil/OutputBase.java index 6da37d1c036..4f9efb17f40 100644 --- a/java/src/IceUtil/OutputBase.java +++ b/java/src/IceUtil/OutputBase.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; public class OutputBase diff --git a/java/src/IceUtil/Store.java b/java/src/IceUtil/Store.java index 9536e47459a..44077db5bfa 100644 --- a/java/src/IceUtil/Store.java +++ b/java/src/IceUtil/Store.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; public interface Store diff --git a/java/src/IceUtil/StringUtil.java b/java/src/IceUtil/StringUtil.java index 7dbc39e6b52..838fe42df7c 100644 --- a/java/src/IceUtil/StringUtil.java +++ b/java/src/IceUtil/StringUtil.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; public final class StringUtil diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 6e13c0ff25c..eef26096ac1 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; public final class Version diff --git a/java/src/IceUtil/XMLOutput.java b/java/src/IceUtil/XMLOutput.java index f78f3193ae3..95072f5f332 100644 --- a/java/src/IceUtil/XMLOutput.java +++ b/java/src/IceUtil/XMLOutput.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package IceUtil; public class XMLOutput extends OutputBase diff --git a/java/test/Freeze/build.xml b/java/test/Freeze/build.xml index 0af368865c5..4319a0fbc0d 100644 --- a/java/test/Freeze/build.xml +++ b/java/test/Freeze/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java index d6d8c69d48a..5fabb310857 100644 --- a/java/test/Freeze/complex/Client.java +++ b/java/test/Freeze/complex/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - import Freeze.*; public class Client diff --git a/java/test/Freeze/complex/Complex.ice b/java/test/Freeze/complex/Complex.ice index dd8448595ac..a704aca44c2 100644 --- a/java/test/Freeze/complex/Complex.ice +++ b/java/test/Freeze/complex/Complex.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - module Complex { diff --git a/java/test/Freeze/complex/Complex/AddNodeI.java b/java/test/Freeze/complex/Complex/AddNodeI.java index 240d4d3937e..e80415a7c52 100644 --- a/java/test/Freeze/complex/Complex/AddNodeI.java +++ b/java/test/Freeze/complex/Complex/AddNodeI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Complex; public class AddNodeI extends AddNode diff --git a/java/test/Freeze/complex/Complex/MultiplyNodeI.java b/java/test/Freeze/complex/Complex/MultiplyNodeI.java index ec68013ee1a..b4a8af6ceb9 100644 --- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java +++ b/java/test/Freeze/complex/Complex/MultiplyNodeI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Complex; public class MultiplyNodeI extends MultiplyNode diff --git a/java/test/Freeze/complex/Complex/NumberNodeI.java b/java/test/Freeze/complex/Complex/NumberNodeI.java index 0b41c072061..f4888b40cc7 100644 --- a/java/test/Freeze/complex/Complex/NumberNodeI.java +++ b/java/test/Freeze/complex/Complex/NumberNodeI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Complex; public class NumberNodeI extends NumberNode diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/Freeze/complex/Complex/ObjectFactoryI.java index a0a46947972..c579bf389f3 100644 --- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java +++ b/java/test/Freeze/complex/Complex/ObjectFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - package Complex; public class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory diff --git a/java/test/Freeze/complex/ParseError.java b/java/test/Freeze/complex/ParseError.java index cc4f159c474..41ceaf072ca 100644 --- a/java/test/Freeze/complex/ParseError.java +++ b/java/test/Freeze/complex/ParseError.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class ParseError extends Exception { public ParseError(String msg) diff --git a/java/test/Freeze/complex/Parser.java b/java/test/Freeze/complex/Parser.java index e4b1d79c87a..d7a453d8e0e 100644 --- a/java/test/Freeze/complex/Parser.java +++ b/java/test/Freeze/complex/Parser.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Parser { public Complex.Node diff --git a/java/test/Freeze/complex/build.xml b/java/test/Freeze/complex/build.xml index 013f1e87480..28413612e87 100644 --- a/java/test/Freeze/complex/build.xml +++ b/java/test/Freeze/complex/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py index 1fe52202148..88b44489485 100755 --- a/java/test/Freeze/complex/run.py +++ b/java/test/Freeze/complex/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/Freeze/dbmap/Client.java index 1751dd09826..5f5978fce21 100644 --- a/java/test/Freeze/dbmap/Client.java +++ b/java/test/Freeze/dbmap/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - import Freeze.*; public class Client diff --git a/java/test/Freeze/dbmap/build.xml b/java/test/Freeze/dbmap/build.xml index afae706f8de..aff3ee81d08 100644 --- a/java/test/Freeze/dbmap/build.xml +++ b/java/test/Freeze/dbmap/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py index aa332c34106..9b45501ea29 100755 --- a/java/test/Freeze/dbmap/run.py +++ b/java/test/Freeze/dbmap/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java index 5fc34074e51..7e0d301cbed 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/Freeze/evictor/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/test/Freeze/evictor/FacetI.java b/java/test/Freeze/evictor/FacetI.java index d9740868219..04592947731 100644 --- a/java/test/Freeze/evictor/FacetI.java +++ b/java/test/Freeze/evictor/FacetI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class FacetI extends ServantI implements Test._FacetOperations { FacetI(Test.Facet tie) diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java index 36addc0a105..64d6ad9472d 100644 --- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java +++ b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class RemoteEvictorFactoryI extends Test._RemoteEvictorFactoryDisp { RemoteEvictorFactoryI(Ice.ObjectAdapter adapter, String envName) diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java index 7568e5b1d00..7237f1fca35 100644 --- a/java/test/Freeze/evictor/RemoteEvictorI.java +++ b/java/test/Freeze/evictor/RemoteEvictorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class RemoteEvictorI extends Test._RemoteEvictorDisp { static class Initializer extends Ice.LocalObjectImpl implements Freeze.ServantInitializer diff --git a/java/test/Freeze/evictor/ServantI.java b/java/test/Freeze/evictor/ServantI.java index 4bf93565ddf..65537e2482a 100644 --- a/java/test/Freeze/evictor/ServantI.java +++ b/java/test/Freeze/evictor/ServantI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class ServantI implements Test._ServantOperations { static class DelayedResponse extends Thread diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java index 82ad6615155..a9befbd9023 100644 --- a/java/test/Freeze/evictor/Server.java +++ b/java/test/Freeze/evictor/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { static class ServantFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory diff --git a/java/test/Freeze/evictor/Test.ice b/java/test/Freeze/evictor/Test.ice index 728d0a4bf19..331a41184a7 100644 --- a/java/test/Freeze/evictor/Test.ice +++ b/java/test/Freeze/evictor/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Freeze/evictor/build.xml b/java/test/Freeze/evictor/build.xml index c63d2711954..557c7ece437 100644 --- a/java/test/Freeze/evictor/build.xml +++ b/java/test/Freeze/evictor/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py index 3374339646c..481bee22fdd 100755 --- a/java/test/Freeze/evictor/run.py +++ b/java/test/Freeze/evictor/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Glacier/build.xml b/java/test/Glacier/build.xml index 97da3cd79bd..c2849bb9ab4 100644 --- a/java/test/Glacier/build.xml +++ b/java/test/Glacier/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Glacier/starter/Callback.ice b/java/test/Glacier/starter/Callback.ice index 5df246bbb52..fb56ee553d1 100644 --- a/java/test/Glacier/starter/Callback.ice +++ b/java/test/Glacier/starter/Callback.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef CALLBACK_ICE #define CALLBACK_ICE diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java index bacebe2e783..e026b19805a 100644 --- a/java/test/Glacier/starter/CallbackClient.java +++ b/java/test/Glacier/starter/CallbackClient.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class CallbackClient extends Ice.Application { public int diff --git a/java/test/Glacier/starter/CallbackI.java b/java/test/Glacier/starter/CallbackI.java index e8def7f6aa2..048f4c47aac 100644 --- a/java/test/Glacier/starter/CallbackI.java +++ b/java/test/Glacier/starter/CallbackI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - final class CallbackI extends Callback { CallbackI(Ice.Communicator communicator) diff --git a/java/test/Glacier/starter/CallbackReceiverI.java b/java/test/Glacier/starter/CallbackReceiverI.java index 9192a5d0242..5e5d8ff8dcc 100644 --- a/java/test/Glacier/starter/CallbackReceiverI.java +++ b/java/test/Glacier/starter/CallbackReceiverI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - final class CallbackReceiverI extends CallbackReceiver { CallbackReceiverI() diff --git a/java/test/Glacier/starter/CallbackServer.java b/java/test/Glacier/starter/CallbackServer.java index abf3236ef8e..afe840fe1c0 100644 --- a/java/test/Glacier/starter/CallbackServer.java +++ b/java/test/Glacier/starter/CallbackServer.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class CallbackServer extends Ice.Application { public int diff --git a/java/test/Glacier/starter/Client.java b/java/test/Glacier/starter/Client.java index f1be3c1c68e..875e6ae5b56 100644 --- a/java/test/Glacier/starter/Client.java +++ b/java/test/Glacier/starter/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { public static void diff --git a/java/test/Glacier/starter/Server.java b/java/test/Glacier/starter/Server.java index 7690c89702a..06f4c0fa320 100644 --- a/java/test/Glacier/starter/Server.java +++ b/java/test/Glacier/starter/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { public static void diff --git a/java/test/Glacier/starter/build.xml b/java/test/Glacier/starter/build.xml index d1042de23c0..97a3da067f4 100644 --- a/java/test/Glacier/starter/build.xml +++ b/java/test/Glacier/starter/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Glacier/starter/run.py b/java/test/Glacier/starter/run.py index 67a3c21c2de..e083ec39d67 100755 --- a/java/test/Glacier/starter/run.py +++ b/java/test/Glacier/starter/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java index 165ec90507f..9042048a1f1 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/Ice/adapterDeactivation/Client.java index 5cebeb641a6..745c8ef10ca 100644 --- a/java/test/Ice/adapterDeactivation/Client.java +++ b/java/test/Ice/adapterDeactivation/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { static class TestClient extends Ice.Application diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java index 2bf8d5efe22..b390f25dd50 100644 --- a/java/test/Ice/adapterDeactivation/Collocated.java +++ b/java/test/Ice/adapterDeactivation/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { static class TestServer extends Ice.Application diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/Ice/adapterDeactivation/CookieI.java index 47b14a9389e..f2b653a37ab 100644 --- a/java/test/Ice/adapterDeactivation/CookieI.java +++ b/java/test/Ice/adapterDeactivation/CookieI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CookieI extends Cookie { public String diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/Ice/adapterDeactivation/ServantLocatorI.java index 827c7bb4e3e..aed23396c93 100644 --- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java +++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator { public diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java index 41ff804ab95..4c23de07fc5 100644 --- a/java/test/Ice/adapterDeactivation/Server.java +++ b/java/test/Ice/adapterDeactivation/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { static class TestServer extends Ice.Application diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/Ice/adapterDeactivation/Test.ice index a3b0d2a4cca..61e539de9be 100644 --- a/java/test/Ice/adapterDeactivation/Test.ice +++ b/java/test/Ice/adapterDeactivation/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/Ice/adapterDeactivation/TestI.java index 1328cb78884..d35599a1426 100644 --- a/java/test/Ice/adapterDeactivation/TestI.java +++ b/java/test/Ice/adapterDeactivation/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends _TestDisp { public void diff --git a/java/test/Ice/adapterDeactivation/build.xml b/java/test/Ice/adapterDeactivation/build.xml index b2475b65c39..1d8e1df8545 100644 --- a/java/test/Ice/adapterDeactivation/build.xml +++ b/java/test/Ice/adapterDeactivation/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py index 9e3e3d96485..31c6d729222 100755 --- a/java/test/Ice/adapterDeactivation/run.py +++ b/java/test/Ice/adapterDeactivation/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/build.xml b/java/test/Ice/build.xml index 31a6422e7a3..cc4ec564ab4 100644 --- a/java/test/Ice/build.xml +++ b/java/test/Ice/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/custom/AllTests.java b/java/test/Ice/custom/AllTests.java index bd3dac47bf0..7caa9e220f4 100644 --- a/java/test/Ice/custom/AllTests.java +++ b/java/test/Ice/custom/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java index 954b44d349e..4bed35f2413 100644 --- a/java/test/Ice/custom/Client.java +++ b/java/test/Ice/custom/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java index 27686802cdb..f3e67256c10 100644 --- a/java/test/Ice/custom/Collocated.java +++ b/java/test/Ice/custom/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { private static int diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java index e68903a54df..2076fe3e9c5 100644 --- a/java/test/Ice/custom/Server.java +++ b/java/test/Ice/custom/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/custom/Test.ice b/java/test/Ice/custom/Test.ice index 803ff2ef3b0..ce5b7477a8b 100644 --- a/java/test/Ice/custom/Test.ice +++ b/java/test/Ice/custom/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java index 9154f69f102..841b9c9851b 100644 --- a/java/test/Ice/custom/TestI.java +++ b/java/test/Ice/custom/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends Test { public diff --git a/java/test/Ice/custom/build.xml b/java/test/Ice/custom/build.xml index cb609fc07f9..683f2254a4b 100644 --- a/java/test/Ice/custom/build.xml +++ b/java/test/Ice/custom/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/custom/run.py b/java/test/Ice/custom/run.py index cda47681e9e..aa587820d26 100755 --- a/java/test/Ice/custom/run.py +++ b/java/test/Ice/custom/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index e7bb8997b23..b507b2d7f5c 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java index b50ca5e3314..9df1ff4576f 100644 --- a/java/test/Ice/exceptions/Client.java +++ b/java/test/Ice/exceptions/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java index d9b0916e3af..c77fe73d2f6 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/Ice/exceptions/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { private static int diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/Ice/exceptions/DummyLogger.java index 293ae10e0c5..4fa1338345a 100644 --- a/java/test/Ice/exceptions/DummyLogger.java +++ b/java/test/Ice/exceptions/DummyLogger.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger { public void diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/Ice/exceptions/EmptyI.java index f12fd40e649..29c04eaf89c 100644 --- a/java/test/Ice/exceptions/EmptyI.java +++ b/java/test/Ice/exceptions/EmptyI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class EmptyI extends _EmptyDisp { } diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/Ice/exceptions/ObjectFactoryI.java index d0cb99f9aa3..18c7572ba54 100644 --- a/java/test/Ice/exceptions/ObjectFactoryI.java +++ b/java/test/Ice/exceptions/ObjectFactoryI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory { public Ice.Object create(String s) diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/Ice/exceptions/ServantLocatorI.java index 5a9a6c695de..e9766c21a13 100644 --- a/java/test/Ice/exceptions/ServantLocatorI.java +++ b/java/test/Ice/exceptions/ServantLocatorI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator { public Ice.Object locate(Ice.Current curr, Ice.LocalObjectHolder cookie) diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java index 64d4385cbce..4fc221b91c8 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/Ice/exceptions/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice index 8b0392f68fc..f6d13e9d1df 100644 --- a/java/test/Ice/exceptions/Test.ice +++ b/java/test/Ice/exceptions/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java index c28594690c2..4006e6a215f 100644 --- a/java/test/Ice/exceptions/ThrowerI.java +++ b/java/test/Ice/exceptions/ThrowerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ThrowerI extends _ThrowerDisp { public diff --git a/java/test/Ice/exceptions/build.xml b/java/test/Ice/exceptions/build.xml index 212f29f55d8..0cebc81a471 100644 --- a/java/test/Ice/exceptions/build.xml +++ b/java/test/Ice/exceptions/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index 12502f0922e..4a8b0473027 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/exceptionsAMD/DummyLogger.java b/java/test/Ice/exceptionsAMD/DummyLogger.java index 293ae10e0c5..4fa1338345a 100644 --- a/java/test/Ice/exceptionsAMD/DummyLogger.java +++ b/java/test/Ice/exceptionsAMD/DummyLogger.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger { public void diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java index 64d4385cbce..4fc221b91c8 100644 --- a/java/test/Ice/exceptionsAMD/Server.java +++ b/java/test/Ice/exceptionsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/exceptionsAMD/TestAMD.ice b/java/test/Ice/exceptionsAMD/TestAMD.ice index 498e7bb82c9..11719036fda 100644 --- a/java/test/Ice/exceptionsAMD/TestAMD.ice +++ b/java/test/Ice/exceptionsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/java/test/Ice/exceptionsAMD/ThrowerI.java b/java/test/Ice/exceptionsAMD/ThrowerI.java index 445a50ce062..be7a9f2e116 100644 --- a/java/test/Ice/exceptionsAMD/ThrowerI.java +++ b/java/test/Ice/exceptionsAMD/ThrowerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ThrowerI extends _ThrowerDisp { public diff --git a/java/test/Ice/exceptionsAMD/build.xml b/java/test/Ice/exceptionsAMD/build.xml index 3d6aab25fec..cdb4b74e147 100644 --- a/java/test/Ice/exceptionsAMD/build.xml +++ b/java/test/Ice/exceptionsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java index 64cd54dbce3..84f93f2046b 100644 --- a/java/test/Ice/facets/AI.java +++ b/java/test/Ice/facets/AI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class AI extends _ADisp { public diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 7b4fdaf9fda..1f83dedde45 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/facets/BI.java b/java/test/Ice/facets/BI.java index c2d619dca26..5dc13f18884 100644 --- a/java/test/Ice/facets/BI.java +++ b/java/test/Ice/facets/BI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class BI extends _BDisp { public diff --git a/java/test/Ice/facets/CI.java b/java/test/Ice/facets/CI.java index c3dba382a7b..b7bc6a89396 100644 --- a/java/test/Ice/facets/CI.java +++ b/java/test/Ice/facets/CI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CI extends _CDisp { public diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java index 055f84451af..3aa5592873d 100644 --- a/java/test/Ice/facets/Client.java +++ b/java/test/Ice/facets/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java index 4e801b031ab..d01eaa5ac70 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/Ice/facets/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { private static int diff --git a/java/test/Ice/facets/DI.java b/java/test/Ice/facets/DI.java index 3054a753463..2d086fd708f 100644 --- a/java/test/Ice/facets/DI.java +++ b/java/test/Ice/facets/DI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class DI extends _DDisp { public diff --git a/java/test/Ice/facets/EI.java b/java/test/Ice/facets/EI.java index ec7c451e2bb..f3b2e7af2e6 100644 --- a/java/test/Ice/facets/EI.java +++ b/java/test/Ice/facets/EI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class EI extends _EDisp { public diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/Ice/facets/EmptyI.java index f12fd40e649..29c04eaf89c 100644 --- a/java/test/Ice/facets/EmptyI.java +++ b/java/test/Ice/facets/EmptyI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class EmptyI extends _EmptyDisp { } diff --git a/java/test/Ice/facets/FI.java b/java/test/Ice/facets/FI.java index ade5826322b..68e766f6da2 100644 --- a/java/test/Ice/facets/FI.java +++ b/java/test/Ice/facets/FI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class FI extends _FDisp { public diff --git a/java/test/Ice/facets/GI.java b/java/test/Ice/facets/GI.java index 084a164a54b..ea39ff00943 100644 --- a/java/test/Ice/facets/GI.java +++ b/java/test/Ice/facets/GI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class GI extends _GDisp { public diff --git a/java/test/Ice/facets/HI.java b/java/test/Ice/facets/HI.java index 4f7529fa5a1..df2e7636328 100644 --- a/java/test/Ice/facets/HI.java +++ b/java/test/Ice/facets/HI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class HI extends _HDisp { public diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java index 48b7f306dd3..a6d16f28ae8 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/Ice/facets/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/facets/Test.ice b/java/test/Ice/facets/Test.ice index e8f202bff53..adfcb0b9c31 100644 --- a/java/test/Ice/facets/Test.ice +++ b/java/test/Ice/facets/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/facets/build.xml b/java/test/Ice/facets/build.xml index 61ab067fce1..b563200ba5b 100644 --- a/java/test/Ice/facets/build.xml +++ b/java/test/Ice/facets/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py index dad67e968b6..bbff4e82b87 100755 --- a/java/test/Ice/facets/run.py +++ b/java/test/Ice/facets/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java index b5475160824..10931d1e2a9 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/Ice/faultTolerance/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { public static void diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java index 1326a9f1bbc..86a37a18aba 100644 --- a/java/test/Ice/faultTolerance/Client.java +++ b/java/test/Ice/faultTolerance/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static void diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java index c88b84e57b1..840b08078dc 100644 --- a/java/test/Ice/faultTolerance/Server.java +++ b/java/test/Ice/faultTolerance/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static void diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/Ice/faultTolerance/Test.ice index 15fa8e63042..aa61a3d687f 100644 --- a/java/test/Ice/faultTolerance/Test.ice +++ b/java/test/Ice/faultTolerance/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java index 43cbb1d22ea..db6ba133d80 100644 --- a/java/test/Ice/faultTolerance/TestI.java +++ b/java/test/Ice/faultTolerance/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends _TestDisp { public diff --git a/java/test/Ice/faultTolerance/build.xml b/java/test/Ice/faultTolerance/build.xml index 3b01898fcec..e6fafc0b9cc 100644 --- a/java/test/Ice/faultTolerance/build.xml +++ b/java/test/Ice/faultTolerance/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py index 43a50481417..5bb1088e915 100755 --- a/java/test/Ice/faultTolerance/run.py +++ b/java/test/Ice/faultTolerance/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index ee24445b535..2210d3ca1dc 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java index 12de0c6621e..8b5d9ef263c 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CAI extends MA.CA { public diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index ccd742c9264..6ede8b568b1 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CBI extends MB.CB { public diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java index abf657f811c..c04b5c3a8af 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CCI extends MA.CC { public diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java index 4b9c987a28b..cd40db1856c 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CDI extends MA.CD { public diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java index 99d52f996d1..f44c53c0dc9 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index 05caab99648..67f15dae82e 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { private static int diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java index 09231bb72c9..f5a3b85baf6 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class IAI extends MA._IADisp { public diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java index 833e0a9ea57..536ac0336da 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class IB1I extends MB._IB1Disp { public diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java index 9f319bd82fa..0c1d60c4a28 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class IB2I extends MB._IB2Disp { public diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index 839c3da2ca8..d893438aeeb 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class ICI extends MA._ICDisp { public diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java index 6f426b2dc8f..a932de05350 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class InitialI extends _InitialDisp { public diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index 5434755389f..6d1bd367b18 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice index 7829bc57b83..3c532e6e855 100644 --- a/java/test/Ice/inheritance/Test.ice +++ b/java/test/Ice/inheritance/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TESTICE #define TESTICE diff --git a/java/test/Ice/inheritance/build.xml b/java/test/Ice/inheritance/build.xml index c5034b363f5..9dd63cc984b 100644 --- a/java/test/Ice/inheritance/build.xml +++ b/java/test/Ice/inheritance/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py index aeb05771824..7798c4ad682 100755 --- a/java/test/Ice/inheritance/run.py +++ b/java/test/Ice/inheritance/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java index 20919bf717e..b5a63504cec 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/Ice/location/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java index 332e5ee5b0e..edafd563ecf 100644 --- a/java/test/Ice/location/Client.java +++ b/java/test/Ice/location/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/location/HelloI.java b/java/test/Ice/location/HelloI.java index 4a71c751481..3436535d9d9 100644 --- a/java/test/Ice/location/HelloI.java +++ b/java/test/Ice/location/HelloI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class HelloI extends _HelloDisp { public void diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java index bfd370aeb84..421d8d03531 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/Ice/location/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/Ice/location/ServerLocator.java index a9c8b5920a8..b2fce8e523e 100644 --- a/java/test/Ice/location/ServerLocator.java +++ b/java/test/Ice/location/ServerLocator.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class ServerLocator extends Ice._LocatorDisp { public diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/Ice/location/ServerLocatorRegistry.java index 016c8e88854..e584a3c7937 100644 --- a/java/test/Ice/location/ServerLocatorRegistry.java +++ b/java/test/Ice/location/ServerLocatorRegistry.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class ServerLocatorRegistry extends Ice._LocatorRegistryDisp { public void diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java index 0cc460c8c7d..c074d88b40f 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class ServerManagerI extends _ServerManagerDisp { ServerManagerI(Ice.ObjectAdapter adapter) diff --git a/java/test/Ice/location/Test.ice b/java/test/Ice/location/Test.ice index df89980dfa3..03f7b371bf9 100644 --- a/java/test/Ice/location/Test.ice +++ b/java/test/Ice/location/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java index 0154bd33c84..373bb50b44b 100644 --- a/java/test/Ice/location/TestI.java +++ b/java/test/Ice/location/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class TestI extends _TestDisp { TestI(Ice.ObjectAdapter adapter) diff --git a/java/test/Ice/location/build.xml b/java/test/Ice/location/build.xml index c8f3bd9c15f..8a142140669 100644 --- a/java/test/Ice/location/build.xml +++ b/java/test/Ice/location/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py index 9199a748598..49e2ba71056 100755 --- a/java/test/Ice/location/run.py +++ b/java/test/Ice/location/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java index f76e15e27cf..9f31311b775 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/Ice/objects/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/objects/BI.java b/java/test/Ice/objects/BI.java index a48bcb95686..378cc8ad2c5 100644 --- a/java/test/Ice/objects/BI.java +++ b/java/test/Ice/objects/BI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class BI extends B { public diff --git a/java/test/Ice/objects/CI.java b/java/test/Ice/objects/CI.java index 434b1e0841a..5299b2218b8 100644 --- a/java/test/Ice/objects/CI.java +++ b/java/test/Ice/objects/CI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class CI extends C { public diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java index da98b117697..bb5b3c0a4ea 100644 --- a/java/test/Ice/objects/Client.java +++ b/java/test/Ice/objects/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static class MyObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java index 81683746af1..df9594fb9e7 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { private static int diff --git a/java/test/Ice/objects/DI.java b/java/test/Ice/objects/DI.java index a1607e9d3f2..0b2a8a5c117 100644 --- a/java/test/Ice/objects/DI.java +++ b/java/test/Ice/objects/DI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class DI extends D { public diff --git a/java/test/Ice/objects/InitialI.java b/java/test/Ice/objects/InitialI.java index 886df7ee8ec..5c11b97f3a0 100644 --- a/java/test/Ice/objects/InitialI.java +++ b/java/test/Ice/objects/InitialI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class InitialI extends Initial { public diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java index 5434755389f..6d1bd367b18 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/Ice/objects/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/objects/Test.ice b/java/test/Ice/objects/Test.ice index 5e2c75bca60..3f57616f160 100644 --- a/java/test/Ice/objects/Test.ice +++ b/java/test/Ice/objects/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/objects/build.xml b/java/test/Ice/objects/build.xml index 728fea8a699..86f5cdb4577 100644 --- a/java/test/Ice/objects/build.xml +++ b/java/test/Ice/objects/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py index d8cc4eddfa4..2ebf12357c0 100755 --- a/java/test/Ice/objects/run.py +++ b/java/test/Ice/objects/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java index 82e9f7323c7..496b377b447 100644 --- a/java/test/Ice/operations/AllTests.java +++ b/java/test/Ice/operations/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java index 07a76b16955..2f3fd8a2e77 100644 --- a/java/test/Ice/operations/Client.java +++ b/java/test/Ice/operations/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index 7ba8c80f29e..a8de2b7cc8e 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Collocated { private static int diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java index 5ba14c9a12f..f1ca02f6b97 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/Ice/operations/MyDerivedClassI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class MyDerivedClassI extends Test.MyDerivedClass { public diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java index dfcf65ae9a4..eb61addc6f5 100644 --- a/java/test/Ice/operations/Server.java +++ b/java/test/Ice/operations/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/operations/Test.ice b/java/test/Ice/operations/Test.ice index 0910350a530..a819ad845a5 100644 --- a/java/test/Ice/operations/Test.ice +++ b/java/test/Ice/operations/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java index 95a8416a0dd..a6baef35002 100644 --- a/java/test/Ice/operations/Twoways.java +++ b/java/test/Ice/operations/Twoways.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class Twoways { private static void diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java index 2cf611b63a9..33bb518cef1 100644 --- a/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/Ice/operations/TwowaysAMI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - class TwowaysAMI { private static void diff --git a/java/test/Ice/operations/build.xml b/java/test/Ice/operations/build.xml index b8906a83f07..821c551fc4e 100644 --- a/java/test/Ice/operations/build.xml +++ b/java/test/Ice/operations/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py index e952a9dda9d..c19c8b15ba4 100755 --- a/java/test/Ice/operations/run.py +++ b/java/test/Ice/operations/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/operationsAMD/MyDerivedClassI.java b/java/test/Ice/operationsAMD/MyDerivedClassI.java index 0fe90e77057..36f3bd1192b 100644 --- a/java/test/Ice/operationsAMD/MyDerivedClassI.java +++ b/java/test/Ice/operationsAMD/MyDerivedClassI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class MyDerivedClassI extends Test.MyDerivedClass { static class Thread_opVoid extends Thread diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java index dfcf65ae9a4..eb61addc6f5 100644 --- a/java/test/Ice/operationsAMD/Server.java +++ b/java/test/Ice/operationsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/operationsAMD/TestAMD.ice b/java/test/Ice/operationsAMD/TestAMD.ice index 31593f263a8..e6f7f4f205d 100644 --- a/java/test/Ice/operationsAMD/TestAMD.ice +++ b/java/test/Ice/operationsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/java/test/Ice/operationsAMD/build.xml b/java/test/Ice/operationsAMD/build.xml index 7f15ed0e045..4d09acbf06f 100644 --- a/java/test/Ice/operationsAMD/build.xml +++ b/java/test/Ice/operationsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/build.xml b/java/test/Ice/slicing/build.xml index 13b87d98146..6d881d4cc9d 100644 --- a/java/test/Ice/slicing/build.xml +++ b/java/test/Ice/slicing/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/exceptions/Test.ice b/java/test/Ice/slicing/exceptions/Test.ice index d2543d47aac..cc3e8b3f85f 100644 --- a/java/test/Ice/slicing/exceptions/Test.ice +++ b/java/test/Ice/slicing/exceptions/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/slicing/exceptions/build.xml b/java/test/Ice/slicing/exceptions/build.xml index c3ef0513f53..bc1c2f6d832 100644 --- a/java/test/Ice/slicing/exceptions/build.xml +++ b/java/test/Ice/slicing/exceptions/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/exceptions/csrc/AllTests.java b/java/test/Ice/slicing/exceptions/csrc/AllTests.java index cbf23707893..1460fa7c977 100644 --- a/java/test/Ice/slicing/exceptions/csrc/AllTests.java +++ b/java/test/Ice/slicing/exceptions/csrc/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/slicing/exceptions/csrc/Client.java b/java/test/Ice/slicing/exceptions/csrc/Client.java index 3563ee2688c..85d80b81283 100644 --- a/java/test/Ice/slicing/exceptions/csrc/Client.java +++ b/java/test/Ice/slicing/exceptions/csrc/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py index 543d6c7e899..880a506cae7 100755 --- a/java/test/Ice/slicing/exceptions/run.py +++ b/java/test/Ice/slicing/exceptions/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/slicing/exceptions/ssrc/Server.java b/java/test/Ice/slicing/exceptions/ssrc/Server.java index 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/Server.java +++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice index 343dbce5f88..7fb5f592869 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice +++ b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef SERVERPRIVATE_ICE #define SERVERPRIVATE_ICE diff --git a/java/test/Ice/slicing/exceptions/ssrc/TestI.java b/java/test/Ice/slicing/exceptions/ssrc/TestI.java index 8223a078a47..27d6a77a9a6 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/TestI.java +++ b/java/test/Ice/slicing/exceptions/ssrc/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends _TestDisp { public diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java index 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/exceptionsAMD/Server.java +++ b/java/test/Ice/slicing/exceptionsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice index dc702e822c2..6d9bc64514b 100644 --- a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice +++ b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef SERVERPRIVATE_AMD_ICE #define SERVERPRIVATE_AMD_ICE diff --git a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice index 4cce716566c..54f3dca65ec 100644 --- a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice +++ b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/java/test/Ice/slicing/exceptionsAMD/TestI.java b/java/test/Ice/slicing/exceptionsAMD/TestI.java index be6891a09cc..a1d35f15963 100644 --- a/java/test/Ice/slicing/exceptionsAMD/TestI.java +++ b/java/test/Ice/slicing/exceptionsAMD/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends _TestDisp { public diff --git a/java/test/Ice/slicing/exceptionsAMD/build.xml b/java/test/Ice/slicing/exceptionsAMD/build.xml index d934c5b93bb..9e41ce1eada 100644 --- a/java/test/Ice/slicing/exceptionsAMD/build.xml +++ b/java/test/Ice/slicing/exceptionsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/objects/Forward.ice b/java/test/Ice/slicing/objects/Forward.ice index 4db43058410..74ae4b8c7e0 100644 --- a/java/test/Ice/slicing/objects/Forward.ice +++ b/java/test/Ice/slicing/objects/Forward.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef FORWARD_ICE #define FORWARD_ICE diff --git a/java/test/Ice/slicing/objects/Test.ice b/java/test/Ice/slicing/objects/Test.ice index a20f048ad34..3817f608833 100644 --- a/java/test/Ice/slicing/objects/Test.ice +++ b/java/test/Ice/slicing/objects/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/Ice/slicing/objects/build.xml b/java/test/Ice/slicing/objects/build.xml index 6770ae48940..edbce967bf4 100644 --- a/java/test/Ice/slicing/objects/build.xml +++ b/java/test/Ice/slicing/objects/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/slicing/objects/csrc/AllTests.java b/java/test/Ice/slicing/objects/csrc/AllTests.java index 7b52736aca8..0e6dc83e685 100644 --- a/java/test/Ice/slicing/objects/csrc/AllTests.java +++ b/java/test/Ice/slicing/objects/csrc/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/Ice/slicing/objects/csrc/Client.java b/java/test/Ice/slicing/objects/csrc/Client.java index 3563ee2688c..85d80b81283 100644 --- a/java/test/Ice/slicing/objects/csrc/Client.java +++ b/java/test/Ice/slicing/objects/csrc/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice index 7e583dfe238..c32c2495f52 100644 --- a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice +++ b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef CLIENTPRIVATE_ICE #define CLIENTPRIVATE_ICE diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py index dbbcff3b061..70f2c0f728c 100755 --- a/java/test/Ice/slicing/objects/run.py +++ b/java/test/Ice/slicing/objects/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/Ice/slicing/objects/ssrc/Server.java b/java/test/Ice/slicing/objects/ssrc/Server.java index 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/objects/ssrc/Server.java +++ b/java/test/Ice/slicing/objects/ssrc/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice index d0ebdefbe16..b963d10122d 100644 --- a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice +++ b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef SERVERPRIVATE_ICE #define SERVERPRIVATE_ICE diff --git a/java/test/Ice/slicing/objects/ssrc/TestI.java b/java/test/Ice/slicing/objects/ssrc/TestI.java index bb880ebcbde..4e194bc545e 100644 --- a/java/test/Ice/slicing/objects/ssrc/TestI.java +++ b/java/test/Ice/slicing/objects/ssrc/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends _TestDisp { public diff --git a/java/test/Ice/slicing/objectsAMD/Forward.ice b/java/test/Ice/slicing/objectsAMD/Forward.ice index 4db43058410..74ae4b8c7e0 100644 --- a/java/test/Ice/slicing/objectsAMD/Forward.ice +++ b/java/test/Ice/slicing/objectsAMD/Forward.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef FORWARD_ICE #define FORWARD_ICE diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java index 18800e9be55..e7748151476 100644 --- a/java/test/Ice/slicing/objectsAMD/Server.java +++ b/java/test/Ice/slicing/objectsAMD/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server { private static int diff --git a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice index d385e2849f0..07e05c6a76b 100644 --- a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice +++ b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef SERVERPRIVATE_AMD_ICE #define SERVERPRIVATE_AMD_ICE diff --git a/java/test/Ice/slicing/objectsAMD/TestAMD.ice b/java/test/Ice/slicing/objectsAMD/TestAMD.ice index c4815a7cdaf..b68706f831e 100644 --- a/java/test/Ice/slicing/objectsAMD/TestAMD.ice +++ b/java/test/Ice/slicing/objectsAMD/TestAMD.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_AMD_ICE #define TEST_AMD_ICE diff --git a/java/test/Ice/slicing/objectsAMD/TestI.java b/java/test/Ice/slicing/objectsAMD/TestI.java index 8073873ea78..6ee301fab6e 100644 --- a/java/test/Ice/slicing/objectsAMD/TestI.java +++ b/java/test/Ice/slicing/objectsAMD/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public final class TestI extends _TestDisp { public diff --git a/java/test/Ice/slicing/objectsAMD/build.xml b/java/test/Ice/slicing/objectsAMD/build.xml index d1c266a67a2..25e757ebcd6 100644 --- a/java/test/Ice/slicing/objectsAMD/build.xml +++ b/java/test/Ice/slicing/objectsAMD/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/Ice/translator/DoubleModuleNoPackage.ice b/java/test/Ice/translator/DoubleModuleNoPackage.ice index 723b35f9696..1b6fc580ce9 100644 --- a/java/test/Ice/translator/DoubleModuleNoPackage.ice +++ b/java/test/Ice/translator/DoubleModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // dmnp = double module no package module M1 diff --git a/java/test/Ice/translator/DoubleModuleWithPackage.ice b/java/test/Ice/translator/DoubleModuleWithPackage.ice index 5a7df201832..3056ff1b464 100644 --- a/java/test/Ice/translator/DoubleModuleWithPackage.ice +++ b/java/test/Ice/translator/DoubleModuleWithPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // dmwp = double module with package [["java:package:dmwp"]] diff --git a/java/test/Ice/translator/NoModuleNoPackage.ice b/java/test/Ice/translator/NoModuleNoPackage.ice index 1cf3fc36798..d39a58016f8 100644 --- a/java/test/Ice/translator/NoModuleNoPackage.ice +++ b/java/test/Ice/translator/NoModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // nmnp = no module no package enum nmnpEnum { nmnpE1, nmnpE2 }; diff --git a/java/test/Ice/translator/NoModuleWithPackage.ice b/java/test/Ice/translator/NoModuleWithPackage.ice index d590aa739e5..da080b08673 100644 --- a/java/test/Ice/translator/NoModuleWithPackage.ice +++ b/java/test/Ice/translator/NoModuleWithPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // nmwp = no module with package [["java:package:nmwp"]] diff --git a/java/test/Ice/translator/SingleModuleNoPackage.ice b/java/test/Ice/translator/SingleModuleNoPackage.ice index c1dc3433ff7..5dbd44d1f90 100644 --- a/java/test/Ice/translator/SingleModuleNoPackage.ice +++ b/java/test/Ice/translator/SingleModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // smnp = single module no package module M diff --git a/java/test/Ice/translator/SingleModuleWithPackage.ice b/java/test/Ice/translator/SingleModuleWithPackage.ice index 23c103125bf..c663f0bb040 100644 --- a/java/test/Ice/translator/SingleModuleWithPackage.ice +++ b/java/test/Ice/translator/SingleModuleWithPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // smwp = single module with package [["java:package:smwp"]] diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice index 15ac9621717..6b889c904fb 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from top-level definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice index 76bf79a9ccb..66f4c4c00ac 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from package definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice index a61e2d85cc6..dfd6295bc4f 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from (different) single module definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice index e1ae41f3fa9..7682f3168aa 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from (same) single module definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice index 89a92192ac9..119c53ddd6a 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from (different) double module definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice index 2c2e60bd5db..f0c5d700131 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from (same) double module definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice index d2a8c4cd5d3..a66324989dd 100644 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice +++ b/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleNoPackage types from (same) double module with package definitions #include <DoubleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice index bba2776fd88..efec105c6e5 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from top-level definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice index 62843ec4d67..1b364da1a48 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) double module with (different) package definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice index 4f493ce6149..f768127cebc 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) double module with (same) package definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice index bc5aace0000..a5cd85405c2 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (different) package definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice index beec08a6270..1c638c54a08 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) package definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice index 7ad92bba2cc..5d283a9830f 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (different) single module definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice index e494fc678bc..437302728ca 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) single module definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice index 0d44e887be9..c63b788a807 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) single module with (different) package definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice index 330b6965cb8..1b40488ccbb 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) single module with (same) package definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice index 93a270b066b..d27eaca36ff 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (different) double module definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice index 9edaf560cbe..46411487200 100644 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use DoubleModuleWithPackage types from (same) double module definitions #include <DoubleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleNoPackage.ice b/java/test/Ice/translator/TestNoModuleNoPackage.ice index 562377a340c..0f4997bea02 100644 --- a/java/test/Ice/translator/TestNoModuleNoPackage.ice +++ b/java/test/Ice/translator/TestNoModuleNoPackage.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleNoPackage types from top-level definitions. Note that // we can *only* test from top-level definitions, because it's not possible // to refer to top-level Java classes from within packaged types. diff --git a/java/test/Ice/translator/TestNoModuleWithPackage1.ice b/java/test/Ice/translator/TestNoModuleWithPackage1.ice index b9c77eefe25..c7c067b62a8 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage1.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from top-level definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage2.ice b/java/test/Ice/translator/TestNoModuleWithPackage2.ice index 8b4afe434a0..c1135cd23b6 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage2.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from (different) package definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage3.ice b/java/test/Ice/translator/TestNoModuleWithPackage3.ice index cd9f41eb3d6..abc14df7948 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage3.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from (same) package definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage4.ice b/java/test/Ice/translator/TestNoModuleWithPackage4.ice index b6fa4ceca4c..3274e0ea440 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from single module definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage5.ice b/java/test/Ice/translator/TestNoModuleWithPackage5.ice index 13e48377445..492afc92314 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from double module definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage6.ice b/java/test/Ice/translator/TestNoModuleWithPackage6.ice index 90c9134dd09..7b0cdcbd463 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from single module with (different) package definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage7.ice b/java/test/Ice/translator/TestNoModuleWithPackage7.ice index 01d0c5b122f..397660dbf14 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from single module with (same) package definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage8.ice b/java/test/Ice/translator/TestNoModuleWithPackage8.ice index 369e4c69682..1a76e64a223 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from double module with (different) package definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestNoModuleWithPackage9.ice b/java/test/Ice/translator/TestNoModuleWithPackage9.ice index f9b77caa9df..feb9ad159d5 100644 --- a/java/test/Ice/translator/TestNoModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestNoModuleWithPackage9.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use NoModuleWithPackage types from double module with (same) package definitions #include <NoModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice index a775f6bb35b..92ab08d3dd5 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from top-level definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice index 9bd34021425..4f7320ad228 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from package definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice index 2876dd2190f..e5cb0f8391c 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from (different) single module definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice index 77ee74a2c5f..f72a913c27c 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage4.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from (same) single module definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice index 3fb729c12c4..ca669372c2c 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from (same) single module with package definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice index c069b058ce8..9cbf384a919 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage6.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from (different) double module definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice index 718d13caa84..70ffa49466f 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage7.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from (same) double module definitions #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice index 56911ab6520..e1bbd7f9fcc 100644 --- a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice +++ b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleNoPackage types from (same) double module definitions with package #include <SingleModuleNoPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice index a71db34273f..3ac1ada5a31 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from top-level definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice index 6c3e5381d00..33caef67eaa 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage10.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage10.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (same) double module definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice index 3716c351814..6f02e212f72 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage11.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage11.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) double module with (different) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice index 3409d165a1b..909b35f31a2 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage12.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage12.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) double module with (same) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice index 9dc14073bb9..15db195cbc2 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage13.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage13.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (same) double module with (same) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice index d0ef349deae..306825dc3a9 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice index 42644543b34..87b2896d526 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (same) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice index ad23903e285..8ee2795d49c 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage4.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage4.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) single module definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice index 5714863b1a8..ef354e1c57c 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage5.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage5.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (same) single module definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice index 854195a6a96..f6b1a3d3ff5 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage6.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage6.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) single module with (different) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice index a224b1b368f..91849a99531 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage7.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage7.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) single module with (same) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice index e5798fe8b0a..16cc51993eb 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (same) single module with (same) package definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice index e3a735ae984..4cf0c8e88fd 100644 --- a/java/test/Ice/translator/TestSingleModuleWithPackage9.ice +++ b/java/test/Ice/translator/TestSingleModuleWithPackage9.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - // Test: use SingleModuleWithPackage types from (different) double module definitions #include <SingleModuleWithPackage.ice> diff --git a/java/test/Ice/translator/build.xml b/java/test/Ice/translator/build.xml index 5469f916621..a7faf6dce10 100644 --- a/java/test/Ice/translator/build.xml +++ b/java/test/Ice/translator/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/build.xml b/java/test/IcePack/build.xml index 358bf01b317..f1f68050b9a 100644 --- a/java/test/IcePack/build.xml +++ b/java/test/IcePack/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java index 32085d8764c..b73fd9e83b8 100644 --- a/java/test/IcePack/deployer/AllTests.java +++ b/java/test/IcePack/deployer/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/IcePack/deployer/Client.java b/java/test/IcePack/deployer/Client.java index fec8c602c0c..29da225e4d5 100644 --- a/java/test/IcePack/deployer/Client.java +++ b/java/test/IcePack/deployer/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/IcePack/deployer/FreezeService.java b/java/test/IcePack/deployer/FreezeService.java index 6e18a4b8376..19ad3afb024 100644 --- a/java/test/IcePack/deployer/FreezeService.java +++ b/java/test/IcePack/deployer/FreezeService.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class FreezeService extends Ice.LocalObjectImpl implements IceBox.FreezeService { public void diff --git a/java/test/IcePack/deployer/Server.java b/java/test/IcePack/deployer/Server.java index ff8c39a0a0b..d64eeef4582 100644 --- a/java/test/IcePack/deployer/Server.java +++ b/java/test/IcePack/deployer/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server extends Ice.Application { public int diff --git a/java/test/IcePack/deployer/Service.java b/java/test/IcePack/deployer/Service.java index c63af18de8f..19a216c30d7 100644 --- a/java/test/IcePack/deployer/Service.java +++ b/java/test/IcePack/deployer/Service.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Service extends Ice.LocalObjectImpl implements IceBox.Service { public void diff --git a/java/test/IcePack/deployer/Test.ice b/java/test/IcePack/deployer/Test.ice index 19578e1c328..04841b0d1db 100644 --- a/java/test/IcePack/deployer/Test.ice +++ b/java/test/IcePack/deployer/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/IcePack/deployer/TestI.java b/java/test/IcePack/deployer/TestI.java index 074830757ae..d5607a99684 100644 --- a/java/test/IcePack/deployer/TestI.java +++ b/java/test/IcePack/deployer/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class TestI extends _TestDisp { public diff --git a/java/test/IcePack/deployer/build.xml b/java/test/IcePack/deployer/build.xml index ce3236f5dbf..c00f7feec3a 100644 --- a/java/test/IcePack/deployer/build.xml +++ b/java/test/IcePack/deployer/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/deployer/run.py b/java/test/IcePack/deployer/run.py index d7d5609ee20..6a36e7aaec4 100755 --- a/java/test/IcePack/deployer/run.py +++ b/java/test/IcePack/deployer/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/IcePack/simple/AllTests.java b/java/test/IcePack/simple/AllTests.java index b3a3ab836b2..ddfec7a3243 100644 --- a/java/test/IcePack/simple/AllTests.java +++ b/java/test/IcePack/simple/AllTests.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class AllTests { private static void diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java index e5848a3eb43..9f33b45fb58 100644 --- a/java/test/IcePack/simple/Client.java +++ b/java/test/IcePack/simple/Client.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Client { private static int diff --git a/java/test/IcePack/simple/Server.java b/java/test/IcePack/simple/Server.java index d42df4080d5..1cbc748ff9f 100644 --- a/java/test/IcePack/simple/Server.java +++ b/java/test/IcePack/simple/Server.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class Server extends Ice.Application { public int diff --git a/java/test/IcePack/simple/Test.ice b/java/test/IcePack/simple/Test.ice index 65fe5377ad3..54953223857 100644 --- a/java/test/IcePack/simple/Test.ice +++ b/java/test/IcePack/simple/Test.ice @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - #ifndef TEST_ICE #define TEST_ICE diff --git a/java/test/IcePack/simple/TestI.java b/java/test/IcePack/simple/TestI.java index 512f105b120..a9b4b293dd4 100644 --- a/java/test/IcePack/simple/TestI.java +++ b/java/test/IcePack/simple/TestI.java @@ -1,17 +1,12 @@ // ********************************************************************** // -// Copyright (c) 2003 - 2004 -// ZeroC, Inc. -// North Palm Beach, FL, USA -// -// All Rights Reserved. +// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. // // ********************************************************************** - public class TestI extends _TestDisp { public diff --git a/java/test/IcePack/simple/build.xml b/java/test/IcePack/simple/build.xml index 13eee488eb5..89d94456ab6 100644 --- a/java/test/IcePack/simple/build.xml +++ b/java/test/IcePack/simple/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/test/IcePack/simple/run.py b/java/test/IcePack/simple/run.py index e25b2b50059..1aac5489546 100755 --- a/java/test/IcePack/simple/run.py +++ b/java/test/IcePack/simple/run.py @@ -1,18 +1,13 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003 - 2004 -# ZeroC, Inc. -# North Palm Beach, FL, USA -# -# All Rights Reserved. +# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** - import os, sys for toplevel in [".", "..", "../..", "../../..", "../../../.."]: diff --git a/java/test/build.xml b/java/test/build.xml index dbbfce57f4b..ce21250d972 100644 --- a/java/test/build.xml +++ b/java/test/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003 - 2004 - ZeroC, Inc. - North Palm Beach, FL, USA - - All Rights Reserved. + Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. |