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/test | |
| parent | Updated Windows installer for Ice 1.4.0 (diff) | |
| download | ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.bz2 ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.xz ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.zip | |
Fixed copyright
Diffstat (limited to 'java/test')
248 files changed, 248 insertions, 1460 deletions
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. |