summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2004-05-18 03:15:02 +0000
committerBernard Normier <bernard@zeroc.com>2004-05-18 03:15:02 +0000
commitebe2d4dca31883e8d539654590f19c142ddd20ed (patch)
tree41d3d309c42a761826e674537332fc5c0cf8be40 /java/src
parentUpdated Windows installer for Ice 1.4.0 (diff)
downloadice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.bz2
ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.xz
ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.zip
Fixed copyright
Diffstat (limited to 'java/src')
-rwxr-xr-xjava/src/Freeze/ConnectionI.java6
-rw-r--r--java/src/Freeze/EvictorElement.java7
-rw-r--r--java/src/Freeze/EvictorI.java7
-rw-r--r--java/src/Freeze/EvictorIteratorI.java7
-rw-r--r--java/src/Freeze/FatalErrorCallback.java7
-rw-r--r--java/src/Freeze/Index.java7
-rw-r--r--java/src/Freeze/LinkedList.java7
-rw-r--r--java/src/Freeze/Map.java7
-rw-r--r--java/src/Freeze/ObjectStore.java7
-rwxr-xr-xjava/src/Freeze/SharedDb.java7
-rw-r--r--java/src/Freeze/SharedDbEnv.java7
-rwxr-xr-xjava/src/Freeze/TransactionI.java6
-rw-r--r--java/src/Freeze/Util.java7
-rw-r--r--java/src/Ice/AMD_Object_ice_invoke.java7
-rw-r--r--java/src/Ice/AMI_Object_ice_invoke.java7
-rw-r--r--java/src/Ice/Application.java7
-rw-r--r--java/src/Ice/Blobject.java7
-rw-r--r--java/src/Ice/BlobjectAsync.java7
-rw-r--r--java/src/Ice/BooleanHolder.java7
-rw-r--r--java/src/Ice/ByteHolder.java7
-rw-r--r--java/src/Ice/CommunicatorI.java7
-rw-r--r--java/src/Ice/DoubleHolder.java7
-rw-r--r--java/src/Ice/FloatHolder.java7
-rw-r--r--java/src/Ice/IntHolder.java7
-rw-r--r--java/src/Ice/LocalException.java7
-rw-r--r--java/src/Ice/LocalObject.java7
-rw-r--r--java/src/Ice/LocalObjectHolder.java7
-rw-r--r--java/src/Ice/LocalObjectImpl.java7
-rw-r--r--java/src/Ice/LoggerI.java7
-rw-r--r--java/src/Ice/LongHolder.java7
-rw-r--r--java/src/Ice/Object.java7
-rw-r--r--java/src/Ice/ObjectAdapterI.java7
-rw-r--r--java/src/Ice/ObjectHolder.java7
-rw-r--r--java/src/Ice/ObjectImpl.java7
-rw-r--r--java/src/Ice/ObjectPrx.java7
-rw-r--r--java/src/Ice/ObjectPrxHelper.java7
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java7
-rw-r--r--java/src/Ice/ObjectPrxHolder.java7
-rw-r--r--java/src/Ice/PluginFactory.java7
-rw-r--r--java/src/Ice/PluginManagerI.java7
-rw-r--r--java/src/Ice/PropertiesI.java7
-rw-r--r--java/src/Ice/ProxyIdentityFacetKey.java7
-rw-r--r--java/src/Ice/ProxyIdentityKey.java7
-rw-r--r--java/src/Ice/RoutingTable.java7
-rw-r--r--java/src/Ice/ShortHolder.java7
-rw-r--r--java/src/Ice/StringHolder.java7
-rw-r--r--java/src/Ice/SysLoggerI.java7
-rw-r--r--java/src/Ice/UserException.java7
-rw-r--r--java/src/Ice/Util.java7
-rw-r--r--java/src/Ice/_AMD_Object_ice_invoke.java7
-rw-r--r--java/src/Ice/_ObjectDel.java7
-rw-r--r--java/src/Ice/_ObjectDelD.java7
-rw-r--r--java/src/Ice/_ObjectDelM.java7
-rw-r--r--java/src/IceBox/Admin.java7
-rw-r--r--java/src/IceBox/Server.java7
-rw-r--r--java/src/IceBox/ServiceManagerI.java7
-rw-r--r--java/src/IceInternal/Acceptor.java7
-rw-r--r--java/src/IceInternal/BasicStream.java7
-rw-r--r--java/src/IceInternal/BufferManager.java7
-rw-r--r--java/src/IceInternal/Connection.java7
-rw-r--r--java/src/IceInternal/ConnectionMonitor.java7
-rw-r--r--java/src/IceInternal/Connector.java7
-rw-r--r--java/src/IceInternal/DefaultsAndOverrides.java7
-rw-r--r--java/src/IceInternal/Direct.java7
-rw-r--r--java/src/IceInternal/DispatchStatus.java7
-rw-r--r--java/src/IceInternal/Endpoint.java7
-rw-r--r--java/src/IceInternal/EndpointFactory.java7
-rw-r--r--java/src/IceInternal/EndpointFactoryManager.java7
-rw-r--r--java/src/IceInternal/EndpointHolder.java7
-rw-r--r--java/src/IceInternal/EventHandler.java7
-rw-r--r--java/src/IceInternal/Incoming.java7
-rw-r--r--java/src/IceInternal/IncomingAsync.java7
-rw-r--r--java/src/IceInternal/IncomingBase.java7
-rw-r--r--java/src/IceInternal/IncomingConnectionFactory.java7
-rw-r--r--java/src/IceInternal/Instance.java7
-rwxr-xr-xjava/src/IceInternal/IntMap.java7
-rw-r--r--java/src/IceInternal/ListPatcher.java7
-rw-r--r--java/src/IceInternal/LocatorInfo.java7
-rw-r--r--java/src/IceInternal/LocatorManager.java7
-rw-r--r--java/src/IceInternal/LocatorTable.java7
-rw-r--r--java/src/IceInternal/Network.java7
-rw-r--r--java/src/IceInternal/NonRepeatable.java7
-rw-r--r--java/src/IceInternal/ObjectAdapterFactory.java7
-rw-r--r--java/src/IceInternal/ObjectFactoryManager.java7
-rw-r--r--java/src/IceInternal/Outgoing.java7
-rw-r--r--java/src/IceInternal/OutgoingAsync.java7
-rw-r--r--java/src/IceInternal/OutgoingConnectionFactory.java7
-rw-r--r--java/src/IceInternal/Patcher.java7
-rw-r--r--java/src/IceInternal/Protocol.java7
-rw-r--r--java/src/IceInternal/ProxyFactory.java7
-rw-r--r--java/src/IceInternal/Reference.java7
-rw-r--r--java/src/IceInternal/ReferenceFactory.java7
-rw-r--r--java/src/IceInternal/RouterInfo.java7
-rw-r--r--java/src/IceInternal/RouterManager.java7
-rw-r--r--java/src/IceInternal/SequencePatcher.java7
-rw-r--r--java/src/IceInternal/ServantManager.java7
-rw-r--r--java/src/IceInternal/TcpAcceptor.java7
-rw-r--r--java/src/IceInternal/TcpConnector.java7
-rw-r--r--java/src/IceInternal/TcpEndpoint.java7
-rw-r--r--java/src/IceInternal/TcpEndpointFactory.java7
-rw-r--r--java/src/IceInternal/TcpTransceiver.java7
-rw-r--r--java/src/IceInternal/ThreadPool.java7
-rw-r--r--java/src/IceInternal/TraceLevels.java7
-rw-r--r--java/src/IceInternal/TraceUtil.java7
-rw-r--r--java/src/IceInternal/Transceiver.java7
-rw-r--r--java/src/IceInternal/UdpEndpoint.java7
-rw-r--r--java/src/IceInternal/UdpEndpointFactory.java7
-rw-r--r--java/src/IceInternal/UdpTransceiver.java7
-rw-r--r--java/src/IceInternal/UnknownEndpoint.java7
-rw-r--r--java/src/IceInternal/UserExceptionFactory.java7
-rw-r--r--java/src/IceInternal/UserExceptionFactoryManager.java7
-rw-r--r--java/src/IceInternal/ValueWriter.java7
-rw-r--r--java/src/IceUtil/Cache.java7
-rw-r--r--java/src/IceUtil/CountDownLatch.java7
-rw-r--r--java/src/IceUtil/OutputBase.java7
-rw-r--r--java/src/IceUtil/Store.java7
-rw-r--r--java/src/IceUtil/StringUtil.java7
-rw-r--r--java/src/IceUtil/Version.java7
-rw-r--r--java/src/IceUtil/XMLOutput.java7
119 files changed, 119 insertions, 712 deletions
diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java
index fdd5a13ae2e..37a8be7c062 100755
--- a/java/src/Freeze/ConnectionI.java
+++ b/java/src/Freeze/ConnectionI.java
@@ -1,10 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/EvictorElement.java
index bfaa9717074..5e3635b0615 100644
--- a/java/src/Freeze/EvictorElement.java
+++ b/java/src/Freeze/EvictorElement.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
class EvictorElement extends Ice.LocalObjectImpl
diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index 042b241f78f..dfb769c98a3 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java
index f0e4f0a362f..20bb5ecc29c 100644
--- a/java/src/Freeze/EvictorIteratorI.java
+++ b/java/src/Freeze/EvictorIteratorI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
class EvictorIteratorI extends Ice.LocalObjectImpl implements EvictorIterator
diff --git a/java/src/Freeze/FatalErrorCallback.java b/java/src/Freeze/FatalErrorCallback.java
index a5621e10600..9e615423b88 100644
--- a/java/src/Freeze/FatalErrorCallback.java
+++ b/java/src/Freeze/FatalErrorCallback.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
public interface FatalErrorCallback
diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/Index.java
index a47104f5f26..76e5df06f93 100644
--- a/java/src/Freeze/Index.java
+++ b/java/src/Freeze/Index.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
public abstract class Index implements com.sleepycat.db.DbSecondaryKeyCreate
diff --git a/java/src/Freeze/LinkedList.java b/java/src/Freeze/LinkedList.java
index c40e63cc68e..61765821463 100644
--- a/java/src/Freeze/LinkedList.java
+++ b/java/src/Freeze/LinkedList.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
//
diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/Map.java
index 91ee586325e..3759827af8c 100644
--- a/java/src/Freeze/Map.java
+++ b/java/src/Freeze/Map.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
public abstract class Map extends java.util.AbstractMap
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java
index 12a97a09fe7..b7aae62e46a 100644
--- a/java/src/Freeze/ObjectStore.java
+++ b/java/src/Freeze/ObjectStore.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
class ObjectStore implements IceUtil.Store
diff --git a/java/src/Freeze/SharedDb.java b/java/src/Freeze/SharedDb.java
index c74778464fe..60610d0859f 100755
--- a/java/src/Freeze/SharedDb.java
+++ b/java/src/Freeze/SharedDb.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
class SharedDb extends com.sleepycat.db.Db
diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/SharedDbEnv.java
index 53a521ca80f..c11fa68bc5c 100644
--- a/java/src/Freeze/SharedDbEnv.java
+++ b/java/src/Freeze/SharedDbEnv.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
class SharedDbEnv extends com.sleepycat.db.DbEnv implements com.sleepycat.db.DbErrcall, Runnable
diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/TransactionI.java
index d5a199e7359..49cc059823f 100755
--- a/java/src/Freeze/TransactionI.java
+++ b/java/src/Freeze/TransactionI.java
@@ -1,10 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/java/src/Freeze/Util.java b/java/src/Freeze/Util.java
index aa03497363d..712ba11ebc2 100644
--- a/java/src/Freeze/Util.java
+++ b/java/src/Freeze/Util.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Freeze;
public class Util
diff --git a/java/src/Ice/AMD_Object_ice_invoke.java b/java/src/Ice/AMD_Object_ice_invoke.java
index 28cff522627..5ff00e3095d 100644
--- a/java/src/Ice/AMD_Object_ice_invoke.java
+++ b/java/src/Ice/AMD_Object_ice_invoke.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public interface AMD_Object_ice_invoke
diff --git a/java/src/Ice/AMI_Object_ice_invoke.java b/java/src/Ice/AMI_Object_ice_invoke.java
index 0a9a20d72a6..1d49abbce98 100644
--- a/java/src/Ice/AMI_Object_ice_invoke.java
+++ b/java/src/Ice/AMI_Object_ice_invoke.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class AMI_Object_ice_invoke extends IceInternal.OutgoingAsync
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 692dc40bb5a..028250ee33d 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class Application
diff --git a/java/src/Ice/Blobject.java b/java/src/Ice/Blobject.java
index 9719786a76a..fa0e9df7055 100644
--- a/java/src/Ice/Blobject.java
+++ b/java/src/Ice/Blobject.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class Blobject extends Ice.ObjectImpl
diff --git a/java/src/Ice/BlobjectAsync.java b/java/src/Ice/BlobjectAsync.java
index 533a78d8470..c62e202cc87 100644
--- a/java/src/Ice/BlobjectAsync.java
+++ b/java/src/Ice/BlobjectAsync.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class BlobjectAsync extends Ice.ObjectImpl
diff --git a/java/src/Ice/BooleanHolder.java b/java/src/Ice/BooleanHolder.java
index 985f5868bb7..e69fdffea33 100644
--- a/java/src/Ice/BooleanHolder.java
+++ b/java/src/Ice/BooleanHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class BooleanHolder
diff --git a/java/src/Ice/ByteHolder.java b/java/src/Ice/ByteHolder.java
index 04889dd0d90..9d8860779a6 100644
--- a/java/src/Ice/ByteHolder.java
+++ b/java/src/Ice/ByteHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class ByteHolder
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index f4bf63466a0..3c5eb68b315 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
final class CommunicatorI extends LocalObjectImpl implements Communicator
diff --git a/java/src/Ice/DoubleHolder.java b/java/src/Ice/DoubleHolder.java
index 1c40c12e3d5..54ab63b44c8 100644
--- a/java/src/Ice/DoubleHolder.java
+++ b/java/src/Ice/DoubleHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class DoubleHolder
diff --git a/java/src/Ice/FloatHolder.java b/java/src/Ice/FloatHolder.java
index 33984e6f10b..6038d894c72 100644
--- a/java/src/Ice/FloatHolder.java
+++ b/java/src/Ice/FloatHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class FloatHolder
diff --git a/java/src/Ice/IntHolder.java b/java/src/Ice/IntHolder.java
index 96f75482881..363c6f2f686 100644
--- a/java/src/Ice/IntHolder.java
+++ b/java/src/Ice/IntHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class IntHolder
diff --git a/java/src/Ice/LocalException.java b/java/src/Ice/LocalException.java
index 974aea74706..a6c6e166bb4 100644
--- a/java/src/Ice/LocalException.java
+++ b/java/src/Ice/LocalException.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class LocalException extends RuntimeException
diff --git a/java/src/Ice/LocalObject.java b/java/src/Ice/LocalObject.java
index aca135b60b7..2b2e6cf6849 100644
--- a/java/src/Ice/LocalObject.java
+++ b/java/src/Ice/LocalObject.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public interface LocalObject
diff --git a/java/src/Ice/LocalObjectHolder.java b/java/src/Ice/LocalObjectHolder.java
index 479f7072135..78aad02b2d9 100644
--- a/java/src/Ice/LocalObjectHolder.java
+++ b/java/src/Ice/LocalObjectHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class LocalObjectHolder
diff --git a/java/src/Ice/LocalObjectImpl.java b/java/src/Ice/LocalObjectImpl.java
index d0981b022ee..1fedbc642e2 100644
--- a/java/src/Ice/LocalObjectImpl.java
+++ b/java/src/Ice/LocalObjectImpl.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class LocalObjectImpl implements LocalObject, java.lang.Cloneable
diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java
index f883f92f50f..24ed8f2b8d8 100644
--- a/java/src/Ice/LoggerI.java
+++ b/java/src/Ice/LoggerI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class LoggerI extends LocalObjectImpl implements Logger
diff --git a/java/src/Ice/LongHolder.java b/java/src/Ice/LongHolder.java
index ce143667ff9..5444c28ac6d 100644
--- a/java/src/Ice/LongHolder.java
+++ b/java/src/Ice/LongHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class LongHolder
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java
index 53652f11672..854324b273c 100644
--- a/java/src/Ice/Object.java
+++ b/java/src/Ice/Object.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public interface Object
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 57cdcb4e59f..6c4803268c1 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter
diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/ObjectHolder.java
index 08246e5b403..54f3303ed26 100644
--- a/java/src/Ice/ObjectHolder.java
+++ b/java/src/Ice/ObjectHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class ObjectHolder
diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java
index 9446bd1447b..179f9d5cf65 100644
--- a/java/src/Ice/ObjectImpl.java
+++ b/java/src/Ice/ObjectImpl.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public class ObjectImpl implements Object, java.lang.Cloneable
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 3ac00e76ce0..1aab12bea25 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public interface ObjectPrx
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index 2cf7ac5fae4..b87dcee662e 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public class ObjectPrxHelper extends ObjectPrxHelperBase
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index c54124090e9..4ffbe2003ea 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public class ObjectPrxHelperBase implements ObjectPrx
diff --git a/java/src/Ice/ObjectPrxHolder.java b/java/src/Ice/ObjectPrxHolder.java
index a0b474330ce..48343349452 100644
--- a/java/src/Ice/ObjectPrxHolder.java
+++ b/java/src/Ice/ObjectPrxHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class ObjectPrxHolder
diff --git a/java/src/Ice/PluginFactory.java b/java/src/Ice/PluginFactory.java
index f340cb1af3f..00d826704a1 100644
--- a/java/src/Ice/PluginFactory.java
+++ b/java/src/Ice/PluginFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public interface PluginFactory
diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java
index bca98922c8e..5956990c479 100644
--- a/java/src/Ice/PluginManagerI.java
+++ b/java/src/Ice/PluginManagerI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class PluginManagerI extends LocalObjectImpl implements PluginManager
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 7c4414c1d7c..4eb2900adac 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
final class PropertiesI extends LocalObjectImpl implements Properties
diff --git a/java/src/Ice/ProxyIdentityFacetKey.java b/java/src/Ice/ProxyIdentityFacetKey.java
index bd9ba5beb4b..140728f8cb5 100644
--- a/java/src/Ice/ProxyIdentityFacetKey.java
+++ b/java/src/Ice/ProxyIdentityFacetKey.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
//
diff --git a/java/src/Ice/ProxyIdentityKey.java b/java/src/Ice/ProxyIdentityKey.java
index 654746d059b..fd8a14a3654 100644
--- a/java/src/Ice/ProxyIdentityKey.java
+++ b/java/src/Ice/ProxyIdentityKey.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
//
diff --git a/java/src/Ice/RoutingTable.java b/java/src/Ice/RoutingTable.java
index 23dd95f5462..59a6eaf975e 100644
--- a/java/src/Ice/RoutingTable.java
+++ b/java/src/Ice/RoutingTable.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class RoutingTable
diff --git a/java/src/Ice/ShortHolder.java b/java/src/Ice/ShortHolder.java
index 597c0ba296c..96820c80854 100644
--- a/java/src/Ice/ShortHolder.java
+++ b/java/src/Ice/ShortHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class ShortHolder
diff --git a/java/src/Ice/StringHolder.java b/java/src/Ice/StringHolder.java
index 4daa6fd1fcd..3e20a154550 100644
--- a/java/src/Ice/StringHolder.java
+++ b/java/src/Ice/StringHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class StringHolder
diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java
index c00303b7879..d5036c03809 100644
--- a/java/src/Ice/SysLoggerI.java
+++ b/java/src/Ice/SysLoggerI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
import java.net.DatagramPacket;
diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java
index 7e6672d45ec..b86df1a7189 100644
--- a/java/src/Ice/UserException.java
+++ b/java/src/Ice/UserException.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public abstract class UserException extends Exception
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 73fc679b775..fffc4a7c6b2 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public final class Util
diff --git a/java/src/Ice/_AMD_Object_ice_invoke.java b/java/src/Ice/_AMD_Object_ice_invoke.java
index e82dbe87eac..36e72b05f67 100644
--- a/java/src/Ice/_AMD_Object_ice_invoke.java
+++ b/java/src/Ice/_AMD_Object_ice_invoke.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
final class _AMD_Object_ice_invoke extends IceInternal.IncomingAsync implements AMD_Object_ice_invoke
diff --git a/java/src/Ice/_ObjectDel.java b/java/src/Ice/_ObjectDel.java
index 649d476af8e..71a2b04e8c6 100644
--- a/java/src/Ice/_ObjectDel.java
+++ b/java/src/Ice/_ObjectDel.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public interface _ObjectDel
diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index a079cc41522..a72bd539004 100644
--- a/java/src/Ice/_ObjectDelD.java
+++ b/java/src/Ice/_ObjectDelD.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public class _ObjectDelD implements _ObjectDel
diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java
index 8b195a9ab1a..285ebfb82d0 100644
--- a/java/src/Ice/_ObjectDelM.java
+++ b/java/src/Ice/_ObjectDelM.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package Ice;
public class _ObjectDelM implements _ObjectDel
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index 93318a09a85..d3cf189776a 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceBox;
public final class Admin
diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java
index 5414b128753..87227ac442a 100644
--- a/java/src/IceBox/Server.java
+++ b/java/src/IceBox/Server.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceBox;
public final class Server extends Ice.Application
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 50b55b9c0c0..36007ac15d9 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceBox;
public final class ServiceManagerI extends _ServiceManagerDisp
diff --git a/java/src/IceInternal/Acceptor.java b/java/src/IceInternal/Acceptor.java
index 1029d296ae8..8d021c62c00 100644
--- a/java/src/IceInternal/Acceptor.java
+++ b/java/src/IceInternal/Acceptor.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface Acceptor
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 037779bc559..67e9820b481 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class BasicStream
diff --git a/java/src/IceInternal/BufferManager.java b/java/src/IceInternal/BufferManager.java
index 453744807af..0f4f13e5d93 100644
--- a/java/src/IceInternal/BufferManager.java
+++ b/java/src/IceInternal/BufferManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class BufferManager
diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index f5cac639c81..6affc7d8b58 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class Connection extends EventHandler
diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java
index 60565e3ddbd..c2801b33f4c 100644
--- a/java/src/IceInternal/ConnectionMonitor.java
+++ b/java/src/IceInternal/ConnectionMonitor.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ConnectionMonitor extends Thread
diff --git a/java/src/IceInternal/Connector.java b/java/src/IceInternal/Connector.java
index 85dbd9e5b56..40c0689764b 100644
--- a/java/src/IceInternal/Connector.java
+++ b/java/src/IceInternal/Connector.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface Connector
diff --git a/java/src/IceInternal/DefaultsAndOverrides.java b/java/src/IceInternal/DefaultsAndOverrides.java
index 437064e8b89..636322b646f 100644
--- a/java/src/IceInternal/DefaultsAndOverrides.java
+++ b/java/src/IceInternal/DefaultsAndOverrides.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class DefaultsAndOverrides
diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java
index 42b0bddedcd..436ba4206c6 100644
--- a/java/src/IceInternal/Direct.java
+++ b/java/src/IceInternal/Direct.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class Direct
diff --git a/java/src/IceInternal/DispatchStatus.java b/java/src/IceInternal/DispatchStatus.java
index 151da6a9056..1253c518d72 100644
--- a/java/src/IceInternal/DispatchStatus.java
+++ b/java/src/IceInternal/DispatchStatus.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class DispatchStatus
diff --git a/java/src/IceInternal/Endpoint.java b/java/src/IceInternal/Endpoint.java
index 6b9ba67f338..52ca4e14851 100644
--- a/java/src/IceInternal/Endpoint.java
+++ b/java/src/IceInternal/Endpoint.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface Endpoint extends java.lang.Comparable
diff --git a/java/src/IceInternal/EndpointFactory.java b/java/src/IceInternal/EndpointFactory.java
index b6779752292..ae164c1628d 100644
--- a/java/src/IceInternal/EndpointFactory.java
+++ b/java/src/IceInternal/EndpointFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface EndpointFactory
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java
index 0103b04a76f..50e0ee2c88d 100644
--- a/java/src/IceInternal/EndpointFactoryManager.java
+++ b/java/src/IceInternal/EndpointFactoryManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class EndpointFactoryManager
diff --git a/java/src/IceInternal/EndpointHolder.java b/java/src/IceInternal/EndpointHolder.java
index fe212c23fb5..ca5306d2ec3 100644
--- a/java/src/IceInternal/EndpointHolder.java
+++ b/java/src/IceInternal/EndpointHolder.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class EndpointHolder
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index 05003aac745..f932db21a02 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
abstract class EventHandler
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 68d0d8a1f69..6f976f8563f 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final public class Incoming extends IncomingBase
diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java
index 9fdd2850930..bfedb5bd7d3 100644
--- a/java/src/IceInternal/IncomingAsync.java
+++ b/java/src/IceInternal/IncomingAsync.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class IncomingAsync extends IncomingBase
diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java
index 47c0b513c6f..b3ea1c7a8c3 100644
--- a/java/src/IceInternal/IncomingBase.java
+++ b/java/src/IceInternal/IncomingBase.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class IncomingBase
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 1765c6c9e0d..438ce729070 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class IncomingConnectionFactory extends EventHandler
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index bdc9dc3c368..640f7519ea6 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class Instance
diff --git a/java/src/IceInternal/IntMap.java b/java/src/IceInternal/IntMap.java
index 4918a552b62..197f680bdc8 100755
--- a/java/src/IceInternal/IntMap.java
+++ b/java/src/IceInternal/IntMap.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class IntMap
diff --git a/java/src/IceInternal/ListPatcher.java b/java/src/IceInternal/ListPatcher.java
index 6b917538e22..56b4939642c 100644
--- a/java/src/IceInternal/ListPatcher.java
+++ b/java/src/IceInternal/ListPatcher.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class ListPatcher implements Patcher
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index 33b6a69bef5..5f08f25d12f 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class LocatorInfo
diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/IceInternal/LocatorManager.java
index c35843690bf..26af962ccfb 100644
--- a/java/src/IceInternal/LocatorManager.java
+++ b/java/src/IceInternal/LocatorManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class LocatorManager
diff --git a/java/src/IceInternal/LocatorTable.java b/java/src/IceInternal/LocatorTable.java
index 94040ebdf89..4db1fda63fa 100644
--- a/java/src/IceInternal/LocatorTable.java
+++ b/java/src/IceInternal/LocatorTable.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class LocatorTable
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index c033fe8d5e3..94577614268 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class Network
diff --git a/java/src/IceInternal/NonRepeatable.java b/java/src/IceInternal/NonRepeatable.java
index 541729e542f..5de06980cac 100644
--- a/java/src/IceInternal/NonRepeatable.java
+++ b/java/src/IceInternal/NonRepeatable.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class NonRepeatable extends Exception
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index 635d2d57df6..b806dcdf6ca 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ObjectAdapterFactory
diff --git a/java/src/IceInternal/ObjectFactoryManager.java b/java/src/IceInternal/ObjectFactoryManager.java
index 008fa05f085..a79732a4fe8 100644
--- a/java/src/IceInternal/ObjectFactoryManager.java
+++ b/java/src/IceInternal/ObjectFactoryManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ObjectFactoryManager
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 9dbd228c71c..47c1a02dea1 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class Outgoing
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index 3323f8cd53a..9769c18cdb6 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public abstract class OutgoingAsync
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index bd8826e6dc9..d164db42516 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class OutgoingConnectionFactory
diff --git a/java/src/IceInternal/Patcher.java b/java/src/IceInternal/Patcher.java
index ec4ba5e932e..ba5ac74c9de 100644
--- a/java/src/IceInternal/Patcher.java
+++ b/java/src/IceInternal/Patcher.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface Patcher
diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java
index 6fdd5207c71..7d2472fbcd6 100644
--- a/java/src/IceInternal/Protocol.java
+++ b/java/src/IceInternal/Protocol.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class Protocol
diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java
index c10489eec6f..11a8e172e62 100644
--- a/java/src/IceInternal/ProxyFactory.java
+++ b/java/src/IceInternal/ProxyFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ProxyFactory
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 3758d987613..5f7c6d9b036 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class Reference
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index 988c4d3b84d..32c0ae7a1d3 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ReferenceFactory
diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java
index 2c120f7a76f..8d3d28af230 100644
--- a/java/src/IceInternal/RouterInfo.java
+++ b/java/src/IceInternal/RouterInfo.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class RouterInfo
diff --git a/java/src/IceInternal/RouterManager.java b/java/src/IceInternal/RouterManager.java
index 4a0ce4e3a80..f944ea8025d 100644
--- a/java/src/IceInternal/RouterManager.java
+++ b/java/src/IceInternal/RouterManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class RouterManager
diff --git a/java/src/IceInternal/SequencePatcher.java b/java/src/IceInternal/SequencePatcher.java
index 5318f12fcd9..5e4820a17d9 100644
--- a/java/src/IceInternal/SequencePatcher.java
+++ b/java/src/IceInternal/SequencePatcher.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public class SequencePatcher implements Patcher
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index e2b18635e30..e839ee8425f 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ServantManager extends Thread
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 121fa487151..ce564c76b1a 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
class TcpAcceptor implements Acceptor
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index bea30075b53..b8f001b9648 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class TcpConnector implements Connector
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index f3caef8e921..ec24c5a1824 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class TcpEndpoint implements Endpoint
diff --git a/java/src/IceInternal/TcpEndpointFactory.java b/java/src/IceInternal/TcpEndpointFactory.java
index e9e01abdd98..83e11b94aea 100644
--- a/java/src/IceInternal/TcpEndpointFactory.java
+++ b/java/src/IceInternal/TcpEndpointFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class TcpEndpointFactory implements EndpointFactory
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index 62d7c228588..9f1a3dbda3a 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class TcpTransceiver implements Transceiver
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index 815d9173a04..fd9012c18af 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ThreadPool
diff --git a/java/src/IceInternal/TraceLevels.java b/java/src/IceInternal/TraceLevels.java
index 1a309b661c3..949a7920d98 100644
--- a/java/src/IceInternal/TraceLevels.java
+++ b/java/src/IceInternal/TraceLevels.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class TraceLevels
diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java
index f728c8bd08f..bdd896bb572 100644
--- a/java/src/IceInternal/TraceUtil.java
+++ b/java/src/IceInternal/TraceUtil.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class TraceUtil
diff --git a/java/src/IceInternal/Transceiver.java b/java/src/IceInternal/Transceiver.java
index 5fb6290ae26..194be7f1853 100644
--- a/java/src/IceInternal/Transceiver.java
+++ b/java/src/IceInternal/Transceiver.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface Transceiver
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index 7cc1df5e978..483429dde7e 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class UdpEndpoint implements Endpoint
diff --git a/java/src/IceInternal/UdpEndpointFactory.java b/java/src/IceInternal/UdpEndpointFactory.java
index ea1478aba19..1fea6c5233f 100644
--- a/java/src/IceInternal/UdpEndpointFactory.java
+++ b/java/src/IceInternal/UdpEndpointFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class UdpEndpointFactory implements EndpointFactory
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 7831a2b1fd6..6a00c87dc52 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class UdpTransceiver implements Transceiver
diff --git a/java/src/IceInternal/UnknownEndpoint.java b/java/src/IceInternal/UnknownEndpoint.java
index c45baae349e..df2ee3f3910 100644
--- a/java/src/IceInternal/UnknownEndpoint.java
+++ b/java/src/IceInternal/UnknownEndpoint.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
final class UnknownEndpoint implements Endpoint
diff --git a/java/src/IceInternal/UserExceptionFactory.java b/java/src/IceInternal/UserExceptionFactory.java
index 0d4c13d4731..77ea8a3e1c4 100644
--- a/java/src/IceInternal/UserExceptionFactory.java
+++ b/java/src/IceInternal/UserExceptionFactory.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public interface UserExceptionFactory
diff --git a/java/src/IceInternal/UserExceptionFactoryManager.java b/java/src/IceInternal/UserExceptionFactoryManager.java
index 006b9fae940..3d3a330cf1d 100644
--- a/java/src/IceInternal/UserExceptionFactoryManager.java
+++ b/java/src/IceInternal/UserExceptionFactoryManager.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class UserExceptionFactoryManager
diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java
index 3be569d1397..57d62944227 100644
--- a/java/src/IceInternal/ValueWriter.java
+++ b/java/src/IceInternal/ValueWriter.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceInternal;
public final class ValueWriter
diff --git a/java/src/IceUtil/Cache.java b/java/src/IceUtil/Cache.java
index 3a1a2e44823..1fb36b30fce 100644
--- a/java/src/IceUtil/Cache.java
+++ b/java/src/IceUtil/Cache.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
//
diff --git a/java/src/IceUtil/CountDownLatch.java b/java/src/IceUtil/CountDownLatch.java
index 885d686afc5..6f88a69ecd4 100644
--- a/java/src/IceUtil/CountDownLatch.java
+++ b/java/src/IceUtil/CountDownLatch.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
//
diff --git a/java/src/IceUtil/OutputBase.java b/java/src/IceUtil/OutputBase.java
index 6da37d1c036..4f9efb17f40 100644
--- a/java/src/IceUtil/OutputBase.java
+++ b/java/src/IceUtil/OutputBase.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
public class OutputBase
diff --git a/java/src/IceUtil/Store.java b/java/src/IceUtil/Store.java
index 9536e47459a..44077db5bfa 100644
--- a/java/src/IceUtil/Store.java
+++ b/java/src/IceUtil/Store.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
public interface Store
diff --git a/java/src/IceUtil/StringUtil.java b/java/src/IceUtil/StringUtil.java
index 7dbc39e6b52..838fe42df7c 100644
--- a/java/src/IceUtil/StringUtil.java
+++ b/java/src/IceUtil/StringUtil.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
public final class StringUtil
diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java
index 6e13c0ff25c..eef26096ac1 100644
--- a/java/src/IceUtil/Version.java
+++ b/java/src/IceUtil/Version.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
public final class Version
diff --git a/java/src/IceUtil/XMLOutput.java b/java/src/IceUtil/XMLOutput.java
index f78f3193ae3..95072f5f332 100644
--- a/java/src/IceUtil/XMLOutput.java
+++ b/java/src/IceUtil/XMLOutput.java
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
package IceUtil;
public class XMLOutput extends OutputBase