54 files changed, 374 insertions, 374 deletions
diff --git a/cpp/demo/Ice/MFC/client/Hello.ice b/cpp/demo/Ice/MFC/client/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/MFC/client/Hello.ice
+++ b/cpp/demo/Ice/MFC/client/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.cpp b/cpp/demo/Ice/MFC/client/HelloClient.cpp
index ceb2bdbe2c6..cc7e46308c0 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClient.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #include "stdafx.h"
 #include "HelloClient.h"
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.h b/cpp/demo/Ice/MFC/client/HelloClient.h
index b234ca6063e..46cac8a9d4e 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.h
+++ b/cpp/demo/Ice/MFC/client/HelloClient.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #ifndef HELLO_CLIENT_H
 #define HELLO_CLIENT_H
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
index f2873e6e1a6..b08986a3f3d 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #include "stdafx.h"
 #include "HelloClient.h"
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
index e61f8a286c7..75bc633b0c7 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #ifndef HELLO_CLIENT_DLG_H
 #define HELLO_CLIENT_DLG_H
diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp
index 01112a78de2..0f0125b30f8 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/client/stdafx.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 // stdafx.cpp : source file that includes just the standard includes
 // HelloClient.pch will be the pre-compiled header
diff --git a/cpp/demo/Ice/MFC/client/stdafx.h b/cpp/demo/Ice/MFC/client/stdafx.h
index ca0dd089a3d..22c4a5ecac9 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.h
+++ b/cpp/demo/Ice/MFC/client/stdafx.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 // stdafx.h : include file for standard system include files,
 // or project specific include files that are used frequently,
diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/MFC/server/Hello.ice
+++ b/cpp/demo/Ice/MFC/server/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Ice/MFC/server/HelloI.cpp b/cpp/demo/Ice/MFC/server/HelloI.cpp
index eff20bbc173..2e43f383d68 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include "stdafx.h"
 #include <HelloI.h>
 
diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h
index a8423d91f08..1361d688faf 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.h
+++ b/cpp/demo/Ice/MFC/server/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.cpp b/cpp/demo/Ice/MFC/server/HelloServer.cpp
index 6899eb18b47..148d2538a57 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloServer.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #include "stdafx.h"
 #include "HelloServer.h"
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.h b/cpp/demo/Ice/MFC/server/HelloServer.h
index ef7b4c511b5..8451e9dc382 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.h
+++ b/cpp/demo/Ice/MFC/server/HelloServer.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #ifndef HELLO_SERVER_H
 #define HELLO_SERVER_H
diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
index cb0ecd67682..2414737df43 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #include "stdafx.h"
 #include "HelloServer.h"
diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.h b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
index 253a2f30431..5072d4efc04 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.h
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 #ifndef HELLO_SERVER_DLG_H
 #define HELLO_SERVER_DLG_H
diff --git a/cpp/demo/Ice/MFC/server/LogI.cpp b/cpp/demo/Ice/MFC/server/LogI.cpp
index 58b6f3b7265..ace1b31db96 100644
--- a/cpp/demo/Ice/MFC/server/LogI.cpp
+++ b/cpp/demo/Ice/MFC/server/LogI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include "stdafx.h"
 #include "LogI.h"
 
diff --git a/cpp/demo/Ice/MFC/server/LogI.h b/cpp/demo/Ice/MFC/server/LogI.h
index 59f75de5c3d..e769da7cb22 100644
--- a/cpp/demo/Ice/MFC/server/LogI.h
+++ b/cpp/demo/Ice/MFC/server/LogI.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// 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 LOG_I_H
 #define LOG_I_H
diff --git a/cpp/demo/Ice/MFC/server/stdafx.cpp b/cpp/demo/Ice/MFC/server/stdafx.cpp
index 4222b45616b..dd3111c0bce 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/server/stdafx.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 // stdafx.cpp : source file that includes just the standard includes
 // HelloServer.pch will be the pre-compiled header
diff --git a/cpp/demo/Ice/MFC/server/stdafx.h b/cpp/demo/Ice/MFC/server/stdafx.h
index ca0dd089a3d..22c4a5ecac9 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.h
+++ b/cpp/demo/Ice/MFC/server/stdafx.h
@@ -1,16 +1,16 @@
-// **********************************************************************
-//
-// Copyright (c) 2003
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 
 // stdafx.h : include file for standard system include files,
 // or project specific include files that are used frequently,
diff --git a/cpp/demo/Ice/Makefile b/cpp/demo/Ice/Makefile
index 7cd2a3c101b..cfe6268bbcd 100644
--- a/cpp/demo/Ice/Makefile
+++ b/cpp/demo/Ice/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index 2686a46dc84..da64c2948e3 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp
index 935eee32c50..b9bdf2032bc 100644
--- a/cpp/demo/Ice/callback/CallbackI.cpp
+++ b/cpp/demo/Ice/callback/CallbackI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <CallbackI.h>
 
diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h
index 15abb3a04e3..1b3167c75e8 100644
--- a/cpp/demo/Ice/callback/CallbackI.h
+++ b/cpp/demo/Ice/callback/CallbackI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CALLBACK_I_H
 #define CALLBACK_I_H
 
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index e0b6c667465..0c1cc916cc0 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <CallbackI.h>
 
diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile
index 07aa1f7046b..6df65ae3589 100644
--- a/cpp/demo/Ice/callback/Makefile
+++ b/cpp/demo/Ice/callback/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index c76636468c8..74be3ab32d2 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <CallbackI.h>
 
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 1f63bf78ab0..1eddb644749 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Hello.h>
 
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Ice/hello/HelloI.cpp b/cpp/demo/Ice/hello/HelloI.cpp
index 880603c5f46..6f29d3b5332 100644
--- a/cpp/demo/Ice/hello/HelloI.cpp
+++ b/cpp/demo/Ice/hello/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h
index e57da289476..12ed5ba1f9b 100644
--- a/cpp/demo/Ice/hello/HelloI.h
+++ b/cpp/demo/Ice/hello/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile
index 7e7f62ec26f..33ce7dc9504 100644
--- a/cpp/demo/Ice/hello/Makefile
+++ b/cpp/demo/Ice/hello/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index 6d50c4ed612..de0870dd26c 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index bfd75f4debb..97ba57bb900 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Latency.h>
 
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 3bd70571733..b11e6cf4e94 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef LATENCY_ICE
 #define LATENCY_ICE
 
diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile
index ad9ce94abc8..d615fc43246 100644
--- a/cpp/demo/Ice/latency/Makefile
+++ b/cpp/demo/Ice/latency/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp
index ade737b0ee4..1c3495ce1f9 100644
--- a/cpp/demo/Ice/latency/Server.cpp
+++ b/cpp/demo/Ice/latency/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Latency.h>
 
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 2ea1f26cac9..bc9f3d6e4ae 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <NestedI.h>
 
diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile
index 775dc25d3b7..d6d3ce4c05b 100644
--- a/cpp/demo/Ice/nested/Makefile
+++ b/cpp/demo/Ice/nested/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index ba810a21d41..e629bbe88d2 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef NESTED_ICE
 #define NESTED_ICE
 
diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp
index 58cc395d7de..a8c094e2f6c 100644
--- a/cpp/demo/Ice/nested/NestedI.cpp
+++ b/cpp/demo/Ice/nested/NestedI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <NestedI.h>
 
diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h
index cf61f6fa5d4..c2c91b4a4af 100644
--- a/cpp/demo/Ice/nested/NestedI.h
+++ b/cpp/demo/Ice/nested/NestedI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef NESTED_I_H
 #define NESTED_I_H
 
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 2ab208d715b..67b4f2f2b53 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <NestedI.h>
 
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index c807e409300..fda3b586a58 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Throughput.h>
 
diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile
index 5edade485fc..26dbf057250 100644
--- a/cpp/demo/Ice/throughput/Makefile
+++ b/cpp/demo/Ice/throughput/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp
index 46f1d63d72c..3b1e23f1fe4 100644
--- a/cpp/demo/Ice/throughput/Server.cpp
+++ b/cpp/demo/Ice/throughput/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <ThroughputI.h>
 
 using namespace std;
diff --git a/cpp/demo/Ice/throughput/Throughput.ice b/cpp/demo/Ice/throughput/Throughput.ice
index e28cef29cf4..3b02a3861d9 100644
--- a/cpp/demo/Ice/throughput/Throughput.ice
+++ b/cpp/demo/Ice/throughput/Throughput.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef THROUGHPUT_ICE
 #define THROUGHPUT_ICE
 
diff --git a/cpp/demo/Ice/throughput/ThroughputI.h b/cpp/demo/Ice/throughput/ThroughputI.h
index 3326f6979b1..f7d34ca5ee1 100644
--- a/cpp/demo/Ice/throughput/ThroughputI.h
+++ b/cpp/demo/Ice/throughput/ThroughputI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef THROUGHPUT_I_H
 #define THROUGHPUT_I_H
 
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 9c875cb9eb3..e300c3933ca 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Value.h>
 #include <ObjectFactory.h>
diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile
index d6b3aff023c..05bf1c2f0a8 100644
--- a/cpp/demo/Ice/value/Makefile
+++ b/cpp/demo/Ice/value/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp
index cf6f501dcac..462cc1f0a39 100644
--- a/cpp/demo/Ice/value/ObjectFactory.cpp
+++ b/cpp/demo/Ice/value/ObjectFactory.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <ObjectFactory.h>
 #include <ValueI.h>
diff --git a/cpp/demo/Ice/value/ObjectFactory.h b/cpp/demo/Ice/value/ObjectFactory.h
index a19f8efcaf5..9cd2b21686d 100644
--- a/cpp/demo/Ice/value/ObjectFactory.h
+++ b/cpp/demo/Ice/value/ObjectFactory.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef SERVANT_FACTORY_H
 #define SERVANT_FACTORY_H
 
diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp
index d03ccef1126..62feea2ca91 100644
--- a/cpp/demo/Ice/value/Server.cpp
+++ b/cpp/demo/Ice/value/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <ValueI.h>
 
diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice
index 4a69d6b6a7d..b4196a7bee3 100644
--- a/cpp/demo/Ice/value/Value.ice
+++ b/cpp/demo/Ice/value/Value.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef VALUE_ICE
 #define VALUE_ICE
 
diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp
index 20c986db61f..782318aeb1c 100644
--- a/cpp/demo/Ice/value/ValueI.cpp
+++ b/cpp/demo/Ice/value/ValueI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <ValueI.h>
 
diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h
index 6dea83ec19b..03007466407 100644
--- a/cpp/demo/Ice/value/ValueI.h
+++ b/cpp/demo/Ice/value/ValueI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef VALUE_I_H
 #define VALUE_I_H