summaryrefslogtreecommitdiff
path: root/cpp/test/IceStorm
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
committerJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
commit7a7d495fb0c5a63e404eb62a0461bbafb06d6175 (patch)
treee0877720ce67950b8b0eaaef410631013c3cf2a4 /cpp/test/IceStorm
parentRemove anonymous cipher usage in IceSSL/configuration (diff)
downloadice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.bz2
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.xz
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.zip
Copyright header simplication
Diffstat (limited to 'cpp/test/IceStorm')
-rw-r--r--cpp/test/IceStorm/federation/Event.ice4
-rw-r--r--cpp/test/IceStorm/federation/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/federation/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/federation/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/federation/test.py4
-rw-r--r--cpp/test/IceStorm/federation2/Event.ice4
-rw-r--r--cpp/test/IceStorm/federation2/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/federation2/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/federation2/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/federation2/test.py4
-rw-r--r--cpp/test/IceStorm/persistent/Client.cpp4
-rw-r--r--cpp/test/IceStorm/persistent/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/persistent/test.py4
-rw-r--r--cpp/test/IceStorm/rep1/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/rep1/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/rep1/Single.ice4
-rw-r--r--cpp/test/IceStorm/rep1/Sub.cpp4
-rw-r--r--cpp/test/IceStorm/rep1/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/rep1/test.py4
-rw-r--r--cpp/test/IceStorm/repgrid/Client.cpp4
-rw-r--r--cpp/test/IceStorm/repgrid/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/repgrid/Single.ice4
-rw-r--r--cpp/test/IceStorm/repgrid/application.xml8
-rw-r--r--cpp/test/IceStorm/repgrid/test.py4
-rw-r--r--cpp/test/IceStorm/repstress/Control.cpp4
-rw-r--r--cpp/test/IceStorm/repstress/Controller.ice4
-rw-r--r--cpp/test/IceStorm/repstress/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/repstress/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/repstress/Single.ice4
-rw-r--r--cpp/test/IceStorm/repstress/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/repstress/test.py4
-rw-r--r--cpp/test/IceStorm/single/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/single/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/single/Single.ice4
-rw-r--r--cpp/test/IceStorm/single/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/single/test.py4
-rw-r--r--cpp/test/IceStorm/stress/Event.ice4
-rw-r--r--cpp/test/IceStorm/stress/Makefile.mk4
-rw-r--r--cpp/test/IceStorm/stress/Publisher.cpp4
-rw-r--r--cpp/test/IceStorm/stress/Subscriber.cpp4
-rw-r--r--cpp/test/IceStorm/stress/test.py4
41 files changed, 41 insertions, 127 deletions
diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice
index f6ce4860c60..043c63bf533 100644
--- a/cpp/test/IceStorm/federation/Event.ice
+++ b/cpp/test/IceStorm/federation/Event.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk
index be1a57819b0..2e33a38faf1 100644
--- a/cpp/test/IceStorm/federation/Makefile.mk
+++ b/cpp/test/IceStorm/federation/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp
index 29df4219a1f..a08a327b0e5 100644
--- a/cpp/test/IceStorm/federation/Publisher.cpp
+++ b/cpp/test/IceStorm/federation/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index d0db5661b64..fabd871da38 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/federation/test.py b/cpp/test/IceStorm/federation/test.py
index e3a036599e1..df740b30aeb 100644
--- a/cpp/test/IceStorm/federation/test.py
+++ b/cpp/test/IceStorm/federation/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
class IceStormFederationTestCase(IceStormTestCase):
diff --git a/cpp/test/IceStorm/federation2/Event.ice b/cpp/test/IceStorm/federation2/Event.ice
index f6ce4860c60..043c63bf533 100644
--- a/cpp/test/IceStorm/federation2/Event.ice
+++ b/cpp/test/IceStorm/federation2/Event.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk
index 41ce787cef1..87196029c6a 100644
--- a/cpp/test/IceStorm/federation2/Makefile.mk
+++ b/cpp/test/IceStorm/federation2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/federation2/Publisher.cpp b/cpp/test/IceStorm/federation2/Publisher.cpp
index b966a4b2d75..8b2b853286e 100644
--- a/cpp/test/IceStorm/federation2/Publisher.cpp
+++ b/cpp/test/IceStorm/federation2/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/federation2/Subscriber.cpp b/cpp/test/IceStorm/federation2/Subscriber.cpp
index 110852c3296..510c3e61e13 100644
--- a/cpp/test/IceStorm/federation2/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation2/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/federation2/test.py b/cpp/test/IceStorm/federation2/test.py
index fdf2f39e9d1..396546cd211 100644
--- a/cpp/test/IceStorm/federation2/test.py
+++ b/cpp/test/IceStorm/federation2/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Publisher/subscriber test cases, publisher publishes on TestIceStorm1 instance(s) and
diff --git a/cpp/test/IceStorm/persistent/Client.cpp b/cpp/test/IceStorm/persistent/Client.cpp
index 4db529395c8..4f86d352c64 100644
--- a/cpp/test/IceStorm/persistent/Client.cpp
+++ b/cpp/test/IceStorm/persistent/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/persistent/Makefile.mk b/cpp/test/IceStorm/persistent/Makefile.mk
index 08b03ba4b7f..7058de9908d 100644
--- a/cpp/test/IceStorm/persistent/Makefile.mk
+++ b/cpp/test/IceStorm/persistent/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = client
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/persistent/test.py b/cpp/test/IceStorm/persistent/test.py
index 6e71b3ea0f8..6a7b5b7c243 100644
--- a/cpp/test/IceStorm/persistent/test.py
+++ b/cpp/test/IceStorm/persistent/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
icestorm1 = IceStorm(createDb=True, cleanDb=False)
icestorm2 = IceStorm(createDb=False, cleanDb=True)
diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk
index d58748369cf..1632bdcc4af 100644
--- a/cpp/test/IceStorm/rep1/Makefile.mk
+++ b/cpp/test/IceStorm/rep1/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber sub
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/rep1/Publisher.cpp b/cpp/test/IceStorm/rep1/Publisher.cpp
index 7cb95220dc9..67746af7429 100644
--- a/cpp/test/IceStorm/rep1/Publisher.cpp
+++ b/cpp/test/IceStorm/rep1/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/rep1/Single.ice b/cpp/test/IceStorm/rep1/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/rep1/Single.ice
+++ b/cpp/test/IceStorm/rep1/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/rep1/Sub.cpp b/cpp/test/IceStorm/rep1/Sub.cpp
index 33f5b0e73c5..f7a62cd15e8 100644
--- a/cpp/test/IceStorm/rep1/Sub.cpp
+++ b/cpp/test/IceStorm/rep1/Sub.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/rep1/Subscriber.cpp b/cpp/test/IceStorm/rep1/Subscriber.cpp
index a8046e59187..9f567c24b95 100644
--- a/cpp/test/IceStorm/rep1/Subscriber.cpp
+++ b/cpp/test/IceStorm/rep1/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/rep1/test.py b/cpp/test/IceStorm/rep1/test.py
index bcc3a585994..3ecf655909e 100644
--- a/cpp/test/IceStorm/rep1/test.py
+++ b/cpp/test/IceStorm/rep1/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Make sure IceStorm and the subscriber use the same buffer size for
diff --git a/cpp/test/IceStorm/repgrid/Client.cpp b/cpp/test/IceStorm/repgrid/Client.cpp
index 29dcaec120c..12d1c751138 100644
--- a/cpp/test/IceStorm/repgrid/Client.cpp
+++ b/cpp/test/IceStorm/repgrid/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk
index c2b772b4cb9..dab563d2b75 100644
--- a/cpp/test/IceStorm/repgrid/Makefile.mk
+++ b/cpp/test/IceStorm/repgrid/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/repgrid/Single.ice b/cpp/test/IceStorm/repgrid/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/repgrid/Single.ice
+++ b/cpp/test/IceStorm/repgrid/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index d959e8e3768..837772d0369 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -1,10 +1,4 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
-
- **********************************************************************
--->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
<icegrid>
diff --git a/cpp/test/IceStorm/repgrid/test.py b/cpp/test/IceStorm/repgrid/test.py
index 8be50dd6825..4843fa9c692 100644
--- a/cpp/test/IceStorm/repgrid/test.py
+++ b/cpp/test/IceStorm/repgrid/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
TestSuite(__file__, [ IceGridTestCase(icegridregistry=IceGridRegistryMaster(),
diff --git a/cpp/test/IceStorm/repstress/Control.cpp b/cpp/test/IceStorm/repstress/Control.cpp
index 32078d0b56c..1f63f5bf4dc 100644
--- a/cpp/test/IceStorm/repstress/Control.cpp
+++ b/cpp/test/IceStorm/repstress/Control.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Controller.h>
diff --git a/cpp/test/IceStorm/repstress/Controller.ice b/cpp/test/IceStorm/repstress/Controller.ice
index 629cd933e43..a06421c7225 100644
--- a/cpp/test/IceStorm/repstress/Controller.ice
+++ b/cpp/test/IceStorm/repstress/Controller.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk
index 69fc850f1f4..21ca75398e8 100644
--- a/cpp/test/IceStorm/repstress/Makefile.mk
+++ b/cpp/test/IceStorm/repstress/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber control
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/repstress/Publisher.cpp b/cpp/test/IceStorm/repstress/Publisher.cpp
index c92f74df08d..cd917758217 100644
--- a/cpp/test/IceStorm/repstress/Publisher.cpp
+++ b/cpp/test/IceStorm/repstress/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceStorm/repstress/Single.ice b/cpp/test/IceStorm/repstress/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/repstress/Single.ice
+++ b/cpp/test/IceStorm/repstress/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repstress/Subscriber.cpp b/cpp/test/IceStorm/repstress/Subscriber.cpp
index f226460f682..10f2a028014 100644
--- a/cpp/test/IceStorm/repstress/Subscriber.cpp
+++ b/cpp/test/IceStorm/repstress/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/repstress/test.py b/cpp/test/IceStorm/repstress/test.py
index 4dadc84164c..95014662a63 100644
--- a/cpp/test/IceStorm/repstress/test.py
+++ b/cpp/test/IceStorm/repstress/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Make sure IceStorm and the subscriber use the same buffer size for
diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk
index 91cabdca76c..969cc7117be 100644
--- a/cpp/test/IceStorm/single/Makefile.mk
+++ b/cpp/test/IceStorm/single/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp
index 85a71d076f4..abe715961b2 100644
--- a/cpp/test/IceStorm/single/Publisher.cpp
+++ b/cpp/test/IceStorm/single/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice
index aa258f27b12..9befe0307a1 100644
--- a/cpp/test/IceStorm/single/Single.ice
+++ b/cpp/test/IceStorm/single/Single.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index b419d77680c..f17a43abd6d 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/single/test.py b/cpp/test/IceStorm/single/test.py
index f05e65cd40d..a225315302f 100644
--- a/cpp/test/IceStorm/single/test.py
+++ b/cpp/test/IceStorm/single/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Make sure the subscriber uses a larger size receive buffer size then
diff --git a/cpp/test/IceStorm/stress/Event.ice b/cpp/test/IceStorm/stress/Event.ice
index aa60f6f7721..4762db01dd3 100644
--- a/cpp/test/IceStorm/stress/Event.ice
+++ b/cpp/test/IceStorm/stress/Event.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk
index 602b04ce532..8cb4c220497 100644
--- a/cpp/test/IceStorm/stress/Makefile.mk
+++ b/cpp/test/IceStorm/stress/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_programs = publisher subscriber
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/stress/Publisher.cpp b/cpp/test/IceStorm/stress/Publisher.cpp
index a948ce186d0..221d4c74d73 100644
--- a/cpp/test/IceStorm/stress/Publisher.cpp
+++ b/cpp/test/IceStorm/stress/Publisher.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceUtil/Options.h>
diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp
index d81f9b3a325..77d5dd9e029 100644
--- a/cpp/test/IceStorm/stress/Subscriber.cpp
+++ b/cpp/test/IceStorm/stress/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
diff --git a/cpp/test/IceStorm/stress/test.py b/cpp/test/IceStorm/stress/test.py
index 11ad4257486..8bfe4f6c3b1 100644
--- a/cpp/test/IceStorm/stress/test.py
+++ b/cpp/test/IceStorm/stress/test.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Publisher/subscriber test cases, publisher publishes on TestIceStorm1 instance(s) and