8 files changed, 8 insertions, 47 deletions
diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice
index da64c2948e3..d275d358d91 100644
--- a/java/demo/Ice/callback/Callback.ice
+++ b/java/demo/Ice/callback/Callback.ice
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java
index 038d8e109c9..6009fdcab97 100644
--- a/java/demo/Ice/callback/CallbackClient.java
+++ b/java/demo/Ice/callback/CallbackClient.java
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 class CallbackClient extends Ice.Application
 {
     private static void
diff --git a/java/demo/Ice/callback/CallbackI.java b/java/demo/Ice/callback/CallbackI.java
index c46d189d143..2d5aa324ad0 100644
--- a/java/demo/Ice/callback/CallbackI.java
+++ b/java/demo/Ice/callback/CallbackI.java
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 public final class CallbackI extends Callback
 {
     public void
diff --git a/java/demo/Ice/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java
index 3850e55cdf7..c408da821c2 100644
--- a/java/demo/Ice/callback/CallbackReceiverI.java
+++ b/java/demo/Ice/callback/CallbackReceiverI.java
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 public final class CallbackReceiverI extends CallbackReceiver
 {
     public void
diff --git a/java/demo/Ice/callback/CallbackServer.java b/java/demo/Ice/callback/CallbackServer.java
index bbff1e815aa..ea007ed9a51 100644
--- a/java/demo/Ice/callback/CallbackServer.java
+++ b/java/demo/Ice/callback/CallbackServer.java
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 class CallbackServer extends Ice.Application
 {
     public int
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index dd3a234e570..0c12f41ed47 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 public class Client
 {
     public static void
diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java
index e676c6d302f..8238584f4a2 100644
--- a/java/demo/Ice/callback/Server.java
+++ b/java/demo/Ice/callback/Server.java
@@ -1,17 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-
 public class Server
 {
     public static void
diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml
index b760dbb1bbe..1e2e2629b22 100644
--- a/java/demo/Ice/callback/build.xml
+++ b/java/demo/Ice/callback/build.xml
@@ -1,11 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003 - 2004
- ZeroC, Inc.
- North Palm Beach, FL, USA
-
- All Rights Reserved.
+ Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 
  This copy of Ice is licensed to you under the terms described in the
  ICE_LICENSE file included in this distribution.