summaryrefslogtreecommitdiff
path: root/cppe/test
diff options
context:
space:
mode:
Diffstat (limited to 'cppe/test')
-rw-r--r--cppe/test/Common/Makefile2
-rwxr-xr-xcppe/test/Common/TestCommon.cpp2
-rw-r--r--cppe/test/IceE/Makefile4
-rw-r--r--cppe/test/IceE/adapterDeactivation/AllTests.cpp2
-rw-r--r--cppe/test/IceE/adapterDeactivation/Client.cpp2
-rw-r--r--cppe/test/IceE/adapterDeactivation/Collocated.cpp2
-rw-r--r--cppe/test/IceE/adapterDeactivation/Makefile2
-rw-r--r--cppe/test/IceE/adapterDeactivation/Server.cpp2
-rw-r--r--cppe/test/IceE/adapterDeactivation/Test.ice2
-rw-r--r--cppe/test/IceE/adapterDeactivation/TestI.cpp2
-rw-r--r--cppe/test/IceE/adapterDeactivation/TestI.h2
-rwxr-xr-xcppe/test/IceE/adapterDeactivation/run.py2
-rw-r--r--cppe/test/IceE/exceptions/AllTests.cpp2
-rw-r--r--cppe/test/IceE/exceptions/Client.cpp2
-rw-r--r--cppe/test/IceE/exceptions/Collocated.cpp2
-rw-r--r--cppe/test/IceE/exceptions/Makefile2
-rw-r--r--cppe/test/IceE/exceptions/Server.cpp2
-rw-r--r--cppe/test/IceE/exceptions/Test.ice2
-rw-r--r--cppe/test/IceE/exceptions/TestI.cpp2
-rw-r--r--cppe/test/IceE/exceptions/TestI.h2
-rwxr-xr-xcppe/test/IceE/exceptions/run.py2
-rw-r--r--cppe/test/IceE/facets/AllTests.cpp2
-rw-r--r--cppe/test/IceE/facets/Client.cpp2
-rw-r--r--cppe/test/IceE/facets/Collocated.cpp2
-rw-r--r--cppe/test/IceE/facets/Makefile2
-rw-r--r--cppe/test/IceE/facets/Server.cpp2
-rw-r--r--cppe/test/IceE/facets/Test.ice2
-rw-r--r--cppe/test/IceE/facets/TestI.cpp2
-rw-r--r--cppe/test/IceE/facets/TestI.h2
-rwxr-xr-xcppe/test/IceE/facets/run.py2
-rw-r--r--cppe/test/IceE/faultTolerance/AllTests.cpp2
-rw-r--r--cppe/test/IceE/faultTolerance/Client.cpp2
-rw-r--r--cppe/test/IceE/faultTolerance/Makefile2
-rw-r--r--cppe/test/IceE/faultTolerance/Server.cpp2
-rw-r--r--cppe/test/IceE/faultTolerance/Test.ice2
-rw-r--r--cppe/test/IceE/faultTolerance/TestI.cpp2
-rw-r--r--cppe/test/IceE/faultTolerance/TestI.h2
-rwxr-xr-xcppe/test/IceE/faultTolerance/run.py2
-rw-r--r--cppe/test/IceE/inheritance/AllTests.cpp2
-rw-r--r--cppe/test/IceE/inheritance/Client.cpp2
-rw-r--r--cppe/test/IceE/inheritance/Collocated.cpp2
-rw-r--r--cppe/test/IceE/inheritance/Makefile2
-rw-r--r--cppe/test/IceE/inheritance/Server.cpp2
-rw-r--r--cppe/test/IceE/inheritance/Test.ice2
-rw-r--r--cppe/test/IceE/inheritance/TestI.cpp2
-rw-r--r--cppe/test/IceE/inheritance/TestI.h2
-rwxr-xr-xcppe/test/IceE/inheritance/run.py2
-rw-r--r--cppe/test/IceE/location/AllTests.cpp2
-rw-r--r--cppe/test/IceE/location/Client.cpp2
-rw-r--r--cppe/test/IceE/location/Makefile2
-rw-r--r--cppe/test/IceE/location/Server.cpp2
-rw-r--r--cppe/test/IceE/location/ServerLocator.cpp2
-rw-r--r--cppe/test/IceE/location/ServerLocator.h2
-rw-r--r--cppe/test/IceE/location/Test.ice2
-rw-r--r--cppe/test/IceE/location/TestI.cpp2
-rw-r--r--cppe/test/IceE/location/TestI.h2
-rwxr-xr-xcppe/test/IceE/location/run.py2
-rw-r--r--cppe/test/IceE/operations/AllTests.cpp2
-rw-r--r--cppe/test/IceE/operations/BatchOneways.cpp2
-rw-r--r--cppe/test/IceE/operations/Client.cpp2
-rw-r--r--cppe/test/IceE/operations/Collocated.cpp2
-rw-r--r--cppe/test/IceE/operations/Makefile2
-rw-r--r--cppe/test/IceE/operations/Server.cpp2
-rw-r--r--cppe/test/IceE/operations/Test.ice2
-rw-r--r--cppe/test/IceE/operations/TestI.cpp2
-rw-r--r--cppe/test/IceE/operations/TestI.h2
-rw-r--r--cppe/test/IceE/operations/Twoways.cpp2
-rwxr-xr-xcppe/test/IceE/operations/run.py2
-rw-r--r--cppe/test/IceE/slicing/AllTests.cpp2
-rw-r--r--cppe/test/IceE/slicing/Client.cpp2
-rw-r--r--cppe/test/IceE/slicing/Makefile2
-rw-r--r--cppe/test/IceE/slicing/Server.cpp2
-rw-r--r--cppe/test/IceE/slicing/ServerPrivate.ice2
-rw-r--r--cppe/test/IceE/slicing/Test.ice2
-rw-r--r--cppe/test/IceE/slicing/TestI.cpp2
-rw-r--r--cppe/test/IceE/slicing/TestI.h2
-rwxr-xr-xcppe/test/IceE/slicing/run.py2
-rw-r--r--cppe/test/IceE/thread/AliveTest.cpp2
-rw-r--r--cppe/test/IceE/thread/AliveTest.h2
-rw-r--r--cppe/test/IceE/thread/Client.cpp2
-rw-r--r--cppe/test/IceE/thread/CreateTest.cpp2
-rw-r--r--cppe/test/IceE/thread/CreateTest.h2
-rw-r--r--cppe/test/IceE/thread/Makefile2
-rw-r--r--cppe/test/IceE/thread/MonitorMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/MonitorMutexTest.h2
-rw-r--r--cppe/test/IceE/thread/MonitorRecMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/MonitorRecMutexTest.h2
-rw-r--r--cppe/test/IceE/thread/MutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/MutexTest.h2
-rw-r--r--cppe/test/IceE/thread/RWRecMutexTest.h2
-rw-r--r--cppe/test/IceE/thread/RecMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/RecMutexTest.h2
-rw-r--r--cppe/test/IceE/thread/StartTest.cpp2
-rw-r--r--cppe/test/IceE/thread/StartTest.h2
-rw-r--r--cppe/test/IceE/thread/StaticMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/StaticMutexTest.h2
-rw-r--r--cppe/test/IceE/thread/TestBase.cpp2
-rw-r--r--cppe/test/IceE/thread/TestBase.h2
-rw-r--r--cppe/test/IceE/thread/TestSuite.cpp2
-rw-r--r--cppe/test/IceE/thread/TestSuite.h2
-rwxr-xr-xcppe/test/IceE/thread/run.py2
-rw-r--r--cppe/test/IceE/uuid/Client.cpp2
-rw-r--r--cppe/test/IceE/uuid/Makefile2
-rwxr-xr-xcppe/test/IceE/uuid/run.py2
-rw-r--r--cppe/test/Makefile4
-rw-r--r--cppe/test/include/TestApplication.h2
-rw-r--r--cppe/test/include/TestCommon.h2
107 files changed, 109 insertions, 109 deletions
diff --git a/cppe/test/Common/Makefile b/cppe/test/Common/Makefile
index 9077107759f..fddf1648d71 100644
--- a/cppe/test/Common/Makefile
+++ b/cppe/test/Common/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICEE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp
index 86574df08ce..2d1809dc91f 100755
--- a/cppe/test/Common/TestCommon.cpp
+++ b/cppe/test/Common/TestCommon.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICEE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/Makefile b/cppe/test/IceE/Makefile
index 92c57b35ffb..b8f90419f72 100644
--- a/cppe/test/IceE/Makefile
+++ b/cppe/test/IceE/Makefile
@@ -2,8 +2,8 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
+# This copy of Ice-E is licensed to you under the terms described in the
+# ICEE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/AllTests.cpp b/cppe/test/IceE/adapterDeactivation/AllTests.cpp
index eb30df77038..769cce14d8b 100644
--- a/cppe/test/IceE/adapterDeactivation/AllTests.cpp
+++ b/cppe/test/IceE/adapterDeactivation/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/Client.cpp b/cppe/test/IceE/adapterDeactivation/Client.cpp
index 4bfa5580428..579f68d043e 100644
--- a/cppe/test/IceE/adapterDeactivation/Client.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/Collocated.cpp b/cppe/test/IceE/adapterDeactivation/Collocated.cpp
index a8b7f13d70d..553fe03c935 100644
--- a/cppe/test/IceE/adapterDeactivation/Collocated.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Collocated.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/Makefile b/cppe/test/IceE/adapterDeactivation/Makefile
index 42aee5c0bf9..3ed2cc0993c 100644
--- a/cppe/test/IceE/adapterDeactivation/Makefile
+++ b/cppe/test/IceE/adapterDeactivation/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/Server.cpp b/cppe/test/IceE/adapterDeactivation/Server.cpp
index 8c4ceba5cd3..33a90fc0a59 100644
--- a/cppe/test/IceE/adapterDeactivation/Server.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/Test.ice b/cppe/test/IceE/adapterDeactivation/Test.ice
index d844c256cbe..bc00df59c41 100644
--- a/cppe/test/IceE/adapterDeactivation/Test.ice
+++ b/cppe/test/IceE/adapterDeactivation/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/TestI.cpp b/cppe/test/IceE/adapterDeactivation/TestI.cpp
index 4d8ee7030bf..7edb52f1bdb 100644
--- a/cppe/test/IceE/adapterDeactivation/TestI.cpp
+++ b/cppe/test/IceE/adapterDeactivation/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/TestI.h b/cppe/test/IceE/adapterDeactivation/TestI.h
index a1c88048133..5aedd10e79e 100644
--- a/cppe/test/IceE/adapterDeactivation/TestI.h
+++ b/cppe/test/IceE/adapterDeactivation/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/adapterDeactivation/run.py b/cppe/test/IceE/adapterDeactivation/run.py
index 69bb4442fc5..a9b36d7d475 100755
--- a/cppe/test/IceE/adapterDeactivation/run.py
+++ b/cppe/test/IceE/adapterDeactivation/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/exceptions/AllTests.cpp b/cppe/test/IceE/exceptions/AllTests.cpp
index 23635dcfe8b..df609690851 100644
--- a/cppe/test/IceE/exceptions/AllTests.cpp
+++ b/cppe/test/IceE/exceptions/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/Client.cpp b/cppe/test/IceE/exceptions/Client.cpp
index f6eba2d49c8..eff1efcb3ed 100644
--- a/cppe/test/IceE/exceptions/Client.cpp
+++ b/cppe/test/IceE/exceptions/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/Collocated.cpp b/cppe/test/IceE/exceptions/Collocated.cpp
index 2322be95baa..b03558de5d5 100644
--- a/cppe/test/IceE/exceptions/Collocated.cpp
+++ b/cppe/test/IceE/exceptions/Collocated.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/Makefile b/cppe/test/IceE/exceptions/Makefile
index 38568b15f68..c727b93eb1c 100644
--- a/cppe/test/IceE/exceptions/Makefile
+++ b/cppe/test/IceE/exceptions/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/exceptions/Server.cpp b/cppe/test/IceE/exceptions/Server.cpp
index 465b0bb0096..2248b0074ee 100644
--- a/cppe/test/IceE/exceptions/Server.cpp
+++ b/cppe/test/IceE/exceptions/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/Test.ice b/cppe/test/IceE/exceptions/Test.ice
index 0d29ef85eaa..219fef1d17c 100644
--- a/cppe/test/IceE/exceptions/Test.ice
+++ b/cppe/test/IceE/exceptions/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/TestI.cpp b/cppe/test/IceE/exceptions/TestI.cpp
index 03f77f1e1ee..e561a536ae8 100644
--- a/cppe/test/IceE/exceptions/TestI.cpp
+++ b/cppe/test/IceE/exceptions/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/TestI.h b/cppe/test/IceE/exceptions/TestI.h
index ca859806411..417a62e6018 100644
--- a/cppe/test/IceE/exceptions/TestI.h
+++ b/cppe/test/IceE/exceptions/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/exceptions/run.py b/cppe/test/IceE/exceptions/run.py
index 7672deae28c..7a00cc94fa7 100755
--- a/cppe/test/IceE/exceptions/run.py
+++ b/cppe/test/IceE/exceptions/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/facets/AllTests.cpp b/cppe/test/IceE/facets/AllTests.cpp
index 834c50ce150..4573ff31f3c 100644
--- a/cppe/test/IceE/facets/AllTests.cpp
+++ b/cppe/test/IceE/facets/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/Client.cpp b/cppe/test/IceE/facets/Client.cpp
index bf0e3338741..25971bffba4 100644
--- a/cppe/test/IceE/facets/Client.cpp
+++ b/cppe/test/IceE/facets/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/Collocated.cpp b/cppe/test/IceE/facets/Collocated.cpp
index 4b382cb1bc7..78a55942c97 100644
--- a/cppe/test/IceE/facets/Collocated.cpp
+++ b/cppe/test/IceE/facets/Collocated.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/Makefile b/cppe/test/IceE/facets/Makefile
index 42aee5c0bf9..3ed2cc0993c 100644
--- a/cppe/test/IceE/facets/Makefile
+++ b/cppe/test/IceE/facets/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/facets/Server.cpp b/cppe/test/IceE/facets/Server.cpp
index 22bec852583..da28a08f3b2 100644
--- a/cppe/test/IceE/facets/Server.cpp
+++ b/cppe/test/IceE/facets/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/Test.ice b/cppe/test/IceE/facets/Test.ice
index 445aabb2419..2b98b70ba6b 100644
--- a/cppe/test/IceE/facets/Test.ice
+++ b/cppe/test/IceE/facets/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/TestI.cpp b/cppe/test/IceE/facets/TestI.cpp
index a0f46a71f26..89b3317eaa3 100644
--- a/cppe/test/IceE/facets/TestI.cpp
+++ b/cppe/test/IceE/facets/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/TestI.h b/cppe/test/IceE/facets/TestI.h
index b1306a1e0f9..187dc891d6f 100644
--- a/cppe/test/IceE/facets/TestI.h
+++ b/cppe/test/IceE/facets/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/facets/run.py b/cppe/test/IceE/facets/run.py
index 9f88e09dc03..fec5c74423e 100755
--- a/cppe/test/IceE/facets/run.py
+++ b/cppe/test/IceE/facets/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/AllTests.cpp b/cppe/test/IceE/faultTolerance/AllTests.cpp
index 6280d509af5..d705391c03a 100644
--- a/cppe/test/IceE/faultTolerance/AllTests.cpp
+++ b/cppe/test/IceE/faultTolerance/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/Client.cpp b/cppe/test/IceE/faultTolerance/Client.cpp
index 45e5d24f350..ae45ecdaa0e 100644
--- a/cppe/test/IceE/faultTolerance/Client.cpp
+++ b/cppe/test/IceE/faultTolerance/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/Makefile b/cppe/test/IceE/faultTolerance/Makefile
index bbe3239735b..09635ae2852 100644
--- a/cppe/test/IceE/faultTolerance/Makefile
+++ b/cppe/test/IceE/faultTolerance/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/Server.cpp b/cppe/test/IceE/faultTolerance/Server.cpp
index 368273f14d5..5d406f0d2e6 100644
--- a/cppe/test/IceE/faultTolerance/Server.cpp
+++ b/cppe/test/IceE/faultTolerance/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/Test.ice b/cppe/test/IceE/faultTolerance/Test.ice
index c8fb558df9a..6e8c0ddd447 100644
--- a/cppe/test/IceE/faultTolerance/Test.ice
+++ b/cppe/test/IceE/faultTolerance/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/TestI.cpp b/cppe/test/IceE/faultTolerance/TestI.cpp
index f434c8951d6..de6f4cbc27d 100644
--- a/cppe/test/IceE/faultTolerance/TestI.cpp
+++ b/cppe/test/IceE/faultTolerance/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/TestI.h b/cppe/test/IceE/faultTolerance/TestI.h
index e9b1e1fc796..5f74be8e5e3 100644
--- a/cppe/test/IceE/faultTolerance/TestI.h
+++ b/cppe/test/IceE/faultTolerance/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/faultTolerance/run.py b/cppe/test/IceE/faultTolerance/run.py
index ad11ea56222..5b778da7e10 100755
--- a/cppe/test/IceE/faultTolerance/run.py
+++ b/cppe/test/IceE/faultTolerance/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/inheritance/AllTests.cpp b/cppe/test/IceE/inheritance/AllTests.cpp
index eae2e628b76..a5f8e627a60 100644
--- a/cppe/test/IceE/inheritance/AllTests.cpp
+++ b/cppe/test/IceE/inheritance/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/Client.cpp b/cppe/test/IceE/inheritance/Client.cpp
index 7a733eadb9f..7b5be2e7d48 100644
--- a/cppe/test/IceE/inheritance/Client.cpp
+++ b/cppe/test/IceE/inheritance/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/Collocated.cpp b/cppe/test/IceE/inheritance/Collocated.cpp
index d906b1bab17..22ac9a6336c 100644
--- a/cppe/test/IceE/inheritance/Collocated.cpp
+++ b/cppe/test/IceE/inheritance/Collocated.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/Makefile b/cppe/test/IceE/inheritance/Makefile
index 42aee5c0bf9..3ed2cc0993c 100644
--- a/cppe/test/IceE/inheritance/Makefile
+++ b/cppe/test/IceE/inheritance/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/inheritance/Server.cpp b/cppe/test/IceE/inheritance/Server.cpp
index 84b20f50b4f..864e2af6e16 100644
--- a/cppe/test/IceE/inheritance/Server.cpp
+++ b/cppe/test/IceE/inheritance/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/Test.ice b/cppe/test/IceE/inheritance/Test.ice
index 76b962cd61f..c768a2b9528 100644
--- a/cppe/test/IceE/inheritance/Test.ice
+++ b/cppe/test/IceE/inheritance/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/TestI.cpp b/cppe/test/IceE/inheritance/TestI.cpp
index cecc1cce2ec..018c70926e7 100644
--- a/cppe/test/IceE/inheritance/TestI.cpp
+++ b/cppe/test/IceE/inheritance/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/TestI.h b/cppe/test/IceE/inheritance/TestI.h
index c6dca09e81a..823b8c76766 100644
--- a/cppe/test/IceE/inheritance/TestI.h
+++ b/cppe/test/IceE/inheritance/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/inheritance/run.py b/cppe/test/IceE/inheritance/run.py
index a56e00c9cc8..6760ec6e17d 100755
--- a/cppe/test/IceE/inheritance/run.py
+++ b/cppe/test/IceE/inheritance/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/location/AllTests.cpp b/cppe/test/IceE/location/AllTests.cpp
index 3f0836e142a..f9c018b5e28 100644
--- a/cppe/test/IceE/location/AllTests.cpp
+++ b/cppe/test/IceE/location/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/Client.cpp b/cppe/test/IceE/location/Client.cpp
index 3de6bdf8785..0c51f652628 100644
--- a/cppe/test/IceE/location/Client.cpp
+++ b/cppe/test/IceE/location/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/Makefile b/cppe/test/IceE/location/Makefile
index f0fb2fb82a6..a7b53de48ef 100644
--- a/cppe/test/IceE/location/Makefile
+++ b/cppe/test/IceE/location/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/location/Server.cpp b/cppe/test/IceE/location/Server.cpp
index f0ce5365243..fa5420b6123 100644
--- a/cppe/test/IceE/location/Server.cpp
+++ b/cppe/test/IceE/location/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/ServerLocator.cpp b/cppe/test/IceE/location/ServerLocator.cpp
index e6f0158cb3e..dca6bd49d8d 100644
--- a/cppe/test/IceE/location/ServerLocator.cpp
+++ b/cppe/test/IceE/location/ServerLocator.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/ServerLocator.h b/cppe/test/IceE/location/ServerLocator.h
index 5b1cab8be57..e374fa76f9b 100644
--- a/cppe/test/IceE/location/ServerLocator.h
+++ b/cppe/test/IceE/location/ServerLocator.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/Test.ice b/cppe/test/IceE/location/Test.ice
index 630a3067b09..3dd1c9be235 100644
--- a/cppe/test/IceE/location/Test.ice
+++ b/cppe/test/IceE/location/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/TestI.cpp b/cppe/test/IceE/location/TestI.cpp
index 48db49f75ae..993a8f1496e 100644
--- a/cppe/test/IceE/location/TestI.cpp
+++ b/cppe/test/IceE/location/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/TestI.h b/cppe/test/IceE/location/TestI.h
index 0d4c61adc0e..cc1d8047b62 100644
--- a/cppe/test/IceE/location/TestI.h
+++ b/cppe/test/IceE/location/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/location/run.py b/cppe/test/IceE/location/run.py
index aa22202346d..26c682a3b83 100755
--- a/cppe/test/IceE/location/run.py
+++ b/cppe/test/IceE/location/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/operations/AllTests.cpp b/cppe/test/IceE/operations/AllTests.cpp
index 527ca230038..075830179a9 100644
--- a/cppe/test/IceE/operations/AllTests.cpp
+++ b/cppe/test/IceE/operations/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/BatchOneways.cpp b/cppe/test/IceE/operations/BatchOneways.cpp
index 0d091df8885..8ab9e199dc1 100644
--- a/cppe/test/IceE/operations/BatchOneways.cpp
+++ b/cppe/test/IceE/operations/BatchOneways.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/Client.cpp b/cppe/test/IceE/operations/Client.cpp
index 96f16bc27e3..ce00271d48c 100644
--- a/cppe/test/IceE/operations/Client.cpp
+++ b/cppe/test/IceE/operations/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/Collocated.cpp b/cppe/test/IceE/operations/Collocated.cpp
index 7aa133f8b8e..cc126756f41 100644
--- a/cppe/test/IceE/operations/Collocated.cpp
+++ b/cppe/test/IceE/operations/Collocated.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/Makefile b/cppe/test/IceE/operations/Makefile
index d190f9a2d4e..24ba95cf54b 100644
--- a/cppe/test/IceE/operations/Makefile
+++ b/cppe/test/IceE/operations/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/operations/Server.cpp b/cppe/test/IceE/operations/Server.cpp
index 8d8c5fa6be2..87649cacd35 100644
--- a/cppe/test/IceE/operations/Server.cpp
+++ b/cppe/test/IceE/operations/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/Test.ice b/cppe/test/IceE/operations/Test.ice
index 1bf9af5b9fe..5e05aa29b58 100644
--- a/cppe/test/IceE/operations/Test.ice
+++ b/cppe/test/IceE/operations/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/TestI.cpp b/cppe/test/IceE/operations/TestI.cpp
index 7f1a13d551d..de81c275617 100644
--- a/cppe/test/IceE/operations/TestI.cpp
+++ b/cppe/test/IceE/operations/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/TestI.h b/cppe/test/IceE/operations/TestI.h
index 184002e2ce2..aecc5a14a6b 100644
--- a/cppe/test/IceE/operations/TestI.h
+++ b/cppe/test/IceE/operations/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/Twoways.cpp b/cppe/test/IceE/operations/Twoways.cpp
index 5202772a7bd..fc702e8de79 100644
--- a/cppe/test/IceE/operations/Twoways.cpp
+++ b/cppe/test/IceE/operations/Twoways.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/operations/run.py b/cppe/test/IceE/operations/run.py
index 80ad9ffb912..92aebb85298 100755
--- a/cppe/test/IceE/operations/run.py
+++ b/cppe/test/IceE/operations/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/slicing/AllTests.cpp b/cppe/test/IceE/slicing/AllTests.cpp
index 4044a49f7dd..6ea3b3c7517 100644
--- a/cppe/test/IceE/slicing/AllTests.cpp
+++ b/cppe/test/IceE/slicing/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/Client.cpp b/cppe/test/IceE/slicing/Client.cpp
index 1bfd03e724e..b387237ad9f 100644
--- a/cppe/test/IceE/slicing/Client.cpp
+++ b/cppe/test/IceE/slicing/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/Makefile b/cppe/test/IceE/slicing/Makefile
index 250af952248..5b6ed449df4 100644
--- a/cppe/test/IceE/slicing/Makefile
+++ b/cppe/test/IceE/slicing/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/slicing/Server.cpp b/cppe/test/IceE/slicing/Server.cpp
index 9176496ae70..a45c4e037a2 100644
--- a/cppe/test/IceE/slicing/Server.cpp
+++ b/cppe/test/IceE/slicing/Server.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/ServerPrivate.ice b/cppe/test/IceE/slicing/ServerPrivate.ice
index 8811bfee8f1..2164c68fd76 100644
--- a/cppe/test/IceE/slicing/ServerPrivate.ice
+++ b/cppe/test/IceE/slicing/ServerPrivate.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/Test.ice b/cppe/test/IceE/slicing/Test.ice
index b3b6105fd44..dcbfc5facb5 100644
--- a/cppe/test/IceE/slicing/Test.ice
+++ b/cppe/test/IceE/slicing/Test.ice
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/TestI.cpp b/cppe/test/IceE/slicing/TestI.cpp
index 9f5c1148bb0..0b9185912b7 100644
--- a/cppe/test/IceE/slicing/TestI.cpp
+++ b/cppe/test/IceE/slicing/TestI.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/TestI.h b/cppe/test/IceE/slicing/TestI.h
index 639f152ba50..652b3af7a55 100644
--- a/cppe/test/IceE/slicing/TestI.h
+++ b/cppe/test/IceE/slicing/TestI.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/slicing/run.py b/cppe/test/IceE/slicing/run.py
index b939722d23a..7bc13358e30 100755
--- a/cppe/test/IceE/slicing/run.py
+++ b/cppe/test/IceE/slicing/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/thread/AliveTest.cpp b/cppe/test/IceE/thread/AliveTest.cpp
index 0c3840ab4b4..5b4a348a702 100644
--- a/cppe/test/IceE/thread/AliveTest.cpp
+++ b/cppe/test/IceE/thread/AliveTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/AliveTest.h b/cppe/test/IceE/thread/AliveTest.h
index 5a329793a13..cceb1407714 100644
--- a/cppe/test/IceE/thread/AliveTest.h
+++ b/cppe/test/IceE/thread/AliveTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/Client.cpp b/cppe/test/IceE/thread/Client.cpp
index d1e5a30c45e..a09b4c537fa 100644
--- a/cppe/test/IceE/thread/Client.cpp
+++ b/cppe/test/IceE/thread/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/CreateTest.cpp b/cppe/test/IceE/thread/CreateTest.cpp
index 82376343352..dda567d0f90 100644
--- a/cppe/test/IceE/thread/CreateTest.cpp
+++ b/cppe/test/IceE/thread/CreateTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/CreateTest.h b/cppe/test/IceE/thread/CreateTest.h
index d43cd037cbf..4750b7b46b5 100644
--- a/cppe/test/IceE/thread/CreateTest.h
+++ b/cppe/test/IceE/thread/CreateTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/Makefile b/cppe/test/IceE/thread/Makefile
index 10423ba1b22..02c285a99d8 100644
--- a/cppe/test/IceE/thread/Makefile
+++ b/cppe/test/IceE/thread/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/thread/MonitorMutexTest.cpp b/cppe/test/IceE/thread/MonitorMutexTest.cpp
index 38332d61df5..7deb56e2a13 100644
--- a/cppe/test/IceE/thread/MonitorMutexTest.cpp
+++ b/cppe/test/IceE/thread/MonitorMutexTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/MonitorMutexTest.h b/cppe/test/IceE/thread/MonitorMutexTest.h
index 0da7660d70a..7667f8dbf8c 100644
--- a/cppe/test/IceE/thread/MonitorMutexTest.h
+++ b/cppe/test/IceE/thread/MonitorMutexTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/MonitorRecMutexTest.cpp b/cppe/test/IceE/thread/MonitorRecMutexTest.cpp
index 198a39837f1..b0543944213 100644
--- a/cppe/test/IceE/thread/MonitorRecMutexTest.cpp
+++ b/cppe/test/IceE/thread/MonitorRecMutexTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/MonitorRecMutexTest.h b/cppe/test/IceE/thread/MonitorRecMutexTest.h
index d3fc0913c7d..63715d617c0 100644
--- a/cppe/test/IceE/thread/MonitorRecMutexTest.h
+++ b/cppe/test/IceE/thread/MonitorRecMutexTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/MutexTest.cpp b/cppe/test/IceE/thread/MutexTest.cpp
index 7d3cc784fc8..8fe4ef4d4ae 100644
--- a/cppe/test/IceE/thread/MutexTest.cpp
+++ b/cppe/test/IceE/thread/MutexTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/MutexTest.h b/cppe/test/IceE/thread/MutexTest.h
index 202028f1acd..25e128658ef 100644
--- a/cppe/test/IceE/thread/MutexTest.h
+++ b/cppe/test/IceE/thread/MutexTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/RWRecMutexTest.h b/cppe/test/IceE/thread/RWRecMutexTest.h
index f588d42bbe6..dd31756d785 100644
--- a/cppe/test/IceE/thread/RWRecMutexTest.h
+++ b/cppe/test/IceE/thread/RWRecMutexTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/RecMutexTest.cpp b/cppe/test/IceE/thread/RecMutexTest.cpp
index 996e7d90f82..dbda549d123 100644
--- a/cppe/test/IceE/thread/RecMutexTest.cpp
+++ b/cppe/test/IceE/thread/RecMutexTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/RecMutexTest.h b/cppe/test/IceE/thread/RecMutexTest.h
index 3760581f226..8798e723892 100644
--- a/cppe/test/IceE/thread/RecMutexTest.h
+++ b/cppe/test/IceE/thread/RecMutexTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/StartTest.cpp b/cppe/test/IceE/thread/StartTest.cpp
index c64e72ae0c5..a3e3122bdcf 100644
--- a/cppe/test/IceE/thread/StartTest.cpp
+++ b/cppe/test/IceE/thread/StartTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/StartTest.h b/cppe/test/IceE/thread/StartTest.h
index 6b8d3a10198..f61e7a53e7f 100644
--- a/cppe/test/IceE/thread/StartTest.h
+++ b/cppe/test/IceE/thread/StartTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/StaticMutexTest.cpp b/cppe/test/IceE/thread/StaticMutexTest.cpp
index 712c2057004..e13c5f9df23 100644
--- a/cppe/test/IceE/thread/StaticMutexTest.cpp
+++ b/cppe/test/IceE/thread/StaticMutexTest.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/StaticMutexTest.h b/cppe/test/IceE/thread/StaticMutexTest.h
index fcb7bb62c80..77449d3bfa4 100644
--- a/cppe/test/IceE/thread/StaticMutexTest.h
+++ b/cppe/test/IceE/thread/StaticMutexTest.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/TestBase.cpp b/cppe/test/IceE/thread/TestBase.cpp
index af7973ca019..fe034155cd1 100644
--- a/cppe/test/IceE/thread/TestBase.cpp
+++ b/cppe/test/IceE/thread/TestBase.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/TestBase.h b/cppe/test/IceE/thread/TestBase.h
index 7cb89266685..1fd3ae6d778 100644
--- a/cppe/test/IceE/thread/TestBase.h
+++ b/cppe/test/IceE/thread/TestBase.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/TestSuite.cpp b/cppe/test/IceE/thread/TestSuite.cpp
index a7e30b362f4..bfc931cd2a7 100644
--- a/cppe/test/IceE/thread/TestSuite.cpp
+++ b/cppe/test/IceE/thread/TestSuite.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/TestSuite.h b/cppe/test/IceE/thread/TestSuite.h
index d6cb6a56942..5d914a44c45 100644
--- a/cppe/test/IceE/thread/TestSuite.h
+++ b/cppe/test/IceE/thread/TestSuite.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/thread/run.py b/cppe/test/IceE/thread/run.py
index 9017f485414..d9039107168 100755
--- a/cppe/test/IceE/thread/run.py
+++ b/cppe/test/IceE/thread/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/uuid/Client.cpp b/cppe/test/IceE/uuid/Client.cpp
index 3461f252afe..8c3f6e38e5e 100644
--- a/cppe/test/IceE/uuid/Client.cpp
+++ b/cppe/test/IceE/uuid/Client.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/IceE/uuid/Makefile b/cppe/test/IceE/uuid/Makefile
index 3577096bdb9..0f0513ccbaa 100644
--- a/cppe/test/IceE/uuid/Makefile
+++ b/cppe/test/IceE/uuid/Makefile
@@ -2,7 +2,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/IceE/uuid/run.py b/cppe/test/IceE/uuid/run.py
index 9b921dfb3d2..0664fd70511 100755
--- a/cppe/test/IceE/uuid/run.py
+++ b/cppe/test/IceE/uuid/run.py
@@ -3,7 +3,7 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
+# This copy of Ice-E is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/Makefile b/cppe/test/Makefile
index b973d603b31..30aa8f9be19 100644
--- a/cppe/test/Makefile
+++ b/cppe/test/Makefile
@@ -2,8 +2,8 @@
#
# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
+# This copy of Ice-E is licensed to you under the terms described in the
+# ICEE_LICENSE file included in this distribution.
#
# **********************************************************************
diff --git a/cppe/test/include/TestApplication.h b/cppe/test/include/TestApplication.h
index bbaa7188c86..38bd5d0eb48 100644
--- a/cppe/test/include/TestApplication.h
+++ b/cppe/test/include/TestApplication.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICEE_LICENSE file included in this distribution.
//
// **********************************************************************
diff --git a/cppe/test/include/TestCommon.h b/cppe/test/include/TestCommon.h
index 62c1f14c4bc..e18b07882b0 100644
--- a/cppe/test/include/TestCommon.h
+++ b/cppe/test/include/TestCommon.h
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
+// This copy of Ice-E is licensed to you under the terms described in the
// ICEE_LICENSE file included in this distribution.
//
// **********************************************************************