Merge HA IceStorm branch.

- http://bugzilla/bugzilla/show_bug.cgi?id=2706
- http://bugzilla/bugzilla/show_bug.cgi?id=2705

13 files changed, 191 insertions, 217 deletions

diff --git a/cpp/test/IceStorm/stress/.depend b/cpp/test/IceStorm/stress/.depend
index 6c657c8fa0b..ab6268fb315 100644
--- a/cpp/test/IceStorm/stress/.depend
+++ b/cpp/test/IceStorm/stress/.depend
@@ -1,5 +1,5 @@
-Event$(OBJEXT): Event.cpp Event.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Publisher$(OBJEXT): Publisher.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceStorm/IceStorm.h $(includedir)/Ice/SliceChecksumDict.h Event.h
-Subscriber$(OBJEXT): Subscriber.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceStorm/IceStorm.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Random.h Event.h ../../include/TestCommon.h
+Event$(OBJEXT): Event.cpp Event.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Publisher$(OBJEXT): Publisher.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceStorm/IceStorm.h $(includedir)/Ice/SliceChecksumDict.h Event.h
+Subscriber$(OBJEXT): Subscriber.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceStorm/IceStorm.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Random.h Event.h ../../include/TestCommon.h
 Event.cpp: Event.ice
 Event.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore
index f01afc6f930..1e15a552882 100644
--- a/cpp/test/IceStorm/stress/.gitignore
+++ b/cpp/test/IceStorm/stress/.gitignore
@@ -8,3 +8,9 @@ Event.h
 build.txt
 db/*
 db2/*
+0.db/*
+0.db2/*
+1.db/*
+1.db2/*
+2.db/*
+2.db2/*
diff --git a/cpp/test/IceStorm/stress/0.db/.gitignore b/cpp/test/IceStorm/stress/0.db/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/cpp/test/IceStorm/stress/0.db/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/cpp/test/IceStorm/stress/0.db2/.gitignore b/cpp/test/IceStorm/stress/0.db2/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/cpp/test/IceStorm/stress/0.db2/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/cpp/test/IceStorm/stress/1.db/.gitignore b/cpp/test/IceStorm/stress/1.db/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/cpp/test/IceStorm/stress/1.db/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/cpp/test/IceStorm/stress/1.db2/.gitignore b/cpp/test/IceStorm/stress/1.db2/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/cpp/test/IceStorm/stress/1.db2/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/cpp/test/IceStorm/stress/2.db/.gitignore b/cpp/test/IceStorm/stress/2.db/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/cpp/test/IceStorm/stress/2.db/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/cpp/test/IceStorm/stress/2.db2/.gitignore b/cpp/test/IceStorm/stress/2.db2/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/cpp/test/IceStorm/stress/2.db2/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile
index 3c3daff5e3e..decde782e42 100644
--- a/cpp/test/IceStorm/stress/Makefile
+++ b/cpp/test/IceStorm/stress/Makefile
@@ -42,5 +42,8 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
 clean::
 	-rm -f build.txt
 	-rm -f db/* db2/*
+	-rm -f 0.db/* 0.db2/*
+	-rm -f 1.db/* 1.db2/*
+	-rm -f 2.db/* 2.db2/*
 
 include .depend
diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak
index 84101991865..ddc23c4ef4d 100644
--- a/cpp/test/IceStorm/stress/Makefile.mak
+++ b/cpp/test/IceStorm/stress/Makefile.mak
@@ -60,6 +60,12 @@ clean::
 	del /q build.txt
 	del /q Event.cpp Event.h
 	for %f in (db\*) do if not %f == db\.gitignore del /q %f
+	for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+	for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+	for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
 	for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+	for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+	for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+	for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
 
 !include .depend
diff --git a/cpp/test/IceStorm/stress/Publisher.cpp b/cpp/test/IceStorm/stress/Publisher.cpp
index 716213474cf..371016b4465 100644
--- a/cpp/test/IceStorm/stress/Publisher.cpp
+++ b/cpp/test/IceStorm/stress/Publisher.cpp
@@ -49,7 +49,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
     bool oneway = opts.isSet("oneway");
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStorm.TopicManager.Proxy";
+    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
     string managerProxy = properties->getProperty(managerProxyProperty);
     if(managerProxy.empty())
     {
diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp
index 89e6febabcf..bab1e53b079 100644
--- a/cpp/test/IceStorm/stress/Subscriber.cpp
+++ b/cpp/test/IceStorm/stress/Subscriber.cpp
@@ -238,7 +238,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
     }
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStorm.TopicManager.Proxy";
+    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
     string managerProxy = properties->getProperty(managerProxyProperty);
     if(managerProxy.empty())
     {
diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py
index dacf98b7a2b..4e4a405e053 100755
--- a/cpp/test/IceStorm/stress/run.py
+++ b/cpp/test/IceStorm/stress/run.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2007 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.
@@ -23,41 +23,15 @@ TestUtil.processCmdLine()
 
 name = os.path.join("IceStorm", "stress")
 testdir = os.path.dirname(os.path.abspath(__file__))
-exedir = testdir
-
-iceBox = TestUtil.getIceBox(exedir)
-iceBoxAdmin = os.path.join(TestUtil.getBinDir(__file__), "iceboxadmin")
-iceStormAdmin = os.path.join(TestUtil.getBinDir(__file__), "icestormadmin")
-
-iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator='
-
-iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \
-                  ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \
-                  ' --IceStorm.Publish.Endpoints="default -p 12012"' + \
-                  ' --IceStorm.InstanceName=TestIceStorm1 ' + \
-                  ' --IceStorm.Discard.Interval=2' + \
-                  ' --IceBox.PrintServicesReady=IceStorm' + \
-                  " --IceBox.InheritProperties=1"
-iceStormReference = ' --IceStorm.TopicManager.Proxy="TestIceStorm1/TopicManager: default -p 12011"'
-
-iceBoxEndpoints2 = ' --IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator='
-
-iceStormService2 = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \
-                  ' --IceStorm.TopicManager.Endpoints="default -p 12021"' + \
-                  ' --IceStorm.Publish.Endpoints="default -p 12022"' + \
-                  ' --IceStorm.InstanceName=TestIceStorm2 ' + \
-                  ' --IceStorm.Discard.Interval=2' + \
-                  ' --IceBox.PrintServicesReady=IceStorm' + \
-                  " --IceBox.InheritProperties=1"
-iceStormReference2 = ' --IceStorm.TopicManager.Proxy="TestIceStorm2/TopicManager: default -p 12021"'
-
-adminIceStormReference = ' --IceStormAdmin.TopicManager.Proxy="TestIceStorm1/TopicManager: default -p 12011" ' + \
-    '--IceStormAdmin.TopicManager.Proxy2="TestIceStorm2/TopicManager: default -p 12021"'
-
-def doTest(subOpts, pubOpts):
+
+iceBox = TestUtil.getIceBox(testdir)
+iceBoxAdmin = os.path.join(TestUtil.getBinDir(testdir), "iceboxadmin")
+iceStormAdmin = os.path.join(TestUtil.getBinDir(testdir), "icestormadmin")
+
+import IceStormUtil
+
+def doTest(server1, server2, subOpts, pubOpts):
     global testdir
-    global iceStormReference
-    global iceStormReference2
 
     publisher = os.path.join(testdir, "publisher")
     subscriber = os.path.join(testdir, "subscriber")
@@ -67,12 +41,12 @@ def doTest(subOpts, pubOpts):
         subOpts = [ subOpts ]
     for opts in subOpts:
         # We don't want the subscribers to time out.
-        pipe = TestUtil.startServer(subscriber, r' --Ice.ServerIdleTime=0 ' + opts + " 2>&1")
+        pipe = TestUtil.startServer(subscriber, r' --Ice.ServerIdleTime=0 ' + opts)
         TestUtil.getServerPid(pipe)
         TestUtil.getAdapterReady(pipe)
         subscriberPipes.append(pipe)
 
-    publisherPipe = TestUtil.startClient(publisher, iceStormReference + ' ' + pubOpts + " 2>&1")
+    publisherPipe = TestUtil.startClient(publisher, server1.reference() + r' ' + pubOpts)
 
     TestUtil.printOutputFromPipe(publisherPipe)
 
@@ -93,197 +67,176 @@ def doTest(subOpts, pubOpts):
 
     return 0
 
-def startServers(additionalArgs=""):
-    global iceBox
-    global iceBoxEndpoints
-    global iceBoxEndpoints2
-    global iceStormService
-    global iceStormService2
-    global iceStormDBEnv
-    global iceStormDBEnv2
+def runAdmin(cmd, desc = None):
+    global iceStormAdmin
+    global iceStormAdminReference
+    if desc:
+        print desc,
+        sys.stdout.flush()
+    pipe = TestUtil.startClient(iceStormAdmin, adminIceStormReference + r' -e "' + cmd + '"')
+    status = TestUtil.closePipe(pipe)
+    if status:
+        TestUtil.killServers()
+        sys.exit(1)
+    if desc:
+        print "ok"
+
+def runtest(type):
+    # Clear the idle timeout otherwise the IceBox ThreadPool will timeout.
+    server1 = IceStormUtil.init(toplevel, testdir, type, additional = '--Ice.ServerIdleTime=0',
+                                  dbDir = "db", instanceName = "TestIceStorm1", port = 12000)
+    server2 = IceStormUtil.init(toplevel, testdir, type, additional = '--Ice.ServerIdleTime=0',
+                                  dbDir = "db2", instanceName = "TestIceStorm2", port = 12500)
+    global adminIceStormReference
+    adminIceStormReference = ' --IceStormAdmin.TopicManager.Proxy="%s" --IceStormAdmin.TopicManager.Proxy2="%s"' % (
+        server1.proxy(), server2.proxy())
+
     print "starting icestorm services...",
     sys.stdout.flush()
-    # Clear the idle timeout otherwise the IceBox ThreadPool will timeout.wA
-    command = iceBoxEndpoints + iceStormService + iceStormDBEnv + ' --Ice.ServerIdleTime=0' + additionalArgs
-    iceBoxPipe = TestUtil.startServer(iceBox, command + " 2>&1")
-    TestUtil.getServerPid(iceBoxPipe)
-    TestUtil.waitServiceReady(iceBoxPipe, "IceStorm")
-    command =  iceBoxEndpoints2 + iceStormService2 + iceStormDBEnv2 + ' --Ice.ServerIdleTime=0' + additionalArgs
-    iceBoxPipe2 = TestUtil.startServer(iceBox, command + " 2>&1")
-    TestUtil.getServerPid(iceBoxPipe2)
-    TestUtil.waitServiceReady(iceBoxPipe2, "IceStorm")
+    server1.start(echo=False)
+    server2.start(echo=False)
+    print "ok"
+
+    runAdmin("create TestIceStorm1/fed1 TestIceStorm2/fed1", "setting up the topics...")
+
+    print "Sending 5000 ordered events... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, '--events 5000 --qos "reliability,ordered" ' + server1.reference(), '--events 5000')
+    if status:
+	print "failed!"
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 5000 ordered events across a link... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, '--events 5000 --qos "reliability,ordered" ' + server2.reference(), '--events 5000')
+    if status:
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered events... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, '--events 20000 ' + server1.reference(), '--events 20000 --oneway')
+    if status:
+	print "failed!"
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered events across a link... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, '--events 20000 ' + server2.reference(), '--events 20000 --oneway')
+    if status:
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered batch events... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, '--events 20000 --qos "reliability,batch" ' + server1.reference(), '--events 20000 --oneway')
+    if status:
+	print "failed!"
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered batch events across a link... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, '--events 20000 --qos "reliability,batch" ' + server2.reference(), '--events 20000 --oneway')
+    if status:
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered events with slow subscriber... ",
+    status = doTest(server1, server2, ['--events 2 --slow ' + server1.reference(), '--events 20000 ' + server1.reference()], '--events 20000 --oneway')
+    if status:
+	print "failed!"
+	TestUtil.killServers()
+	sys.exit(1)
+    print "ok"
+
+    runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered events with slow subscriber & link... ",
+    status = doTest(server1, server2, ['--events 2 --slow' + server1.reference(), '--events 20000' + server1.reference(), '--events 2 --slow' + server2.reference(), '--events 20000' + server2.reference()], '--events 20000 --oneway')
+    if status:
+	print "failed!"
+	TestUtil.killServers()
+	sys.exit(1)
     print "ok"
 
-    return iceBoxPipe, iceBoxPipe2
 
-def stopServers(p1, p2 = None):
-    global iceBox
-    global iceBoxAdmin
-    global iceBoxEndpoints
-    global iceBoxEndpoints2
     print "shutting down icestorm services...",
     sys.stdout.flush()
-    command =  iceBoxEndpoints + r' shutdown'
-    pipe = TestUtil.startClient(iceBoxAdmin, command + " 2>&1")
-    status = TestUtil.closePipe(pipe)
-    if status or TestUtil.specificServerStatus(p1):
+    server1.stop()
+    server2.stop()
+    print "ok"
+
+    print "starting icestorm services...",
+    sys.stdout.flush()
+    #
+    # The erratic tests emit lots of connection warnings so they are
+    # disabled here. The IceStorm servers are stopped and restarted so the
+    # settings will take effect.
+    #
+    server1.start(echo=False, additionalOptions = ' --Ice.Warn.Connections=0')
+    server2.start(echo=False, additionalOptions = ' --Ice.Warn.Connections=0')
+    print "ok"
+
+    runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
+
+    print "Sending 20000 unordered events with erratic subscriber... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2, \
+        [ '--erratic 5 --qos "reliability,ordered" --events 20000' + server1.reference(), \
+          '--erratic 5 --events 20000' + server1.reference(), \
+          '--events 20000' + server1.reference()], \
+          '--events 20000 --oneway')
+    if status:
+        print "failed!"
         TestUtil.killServers()
         sys.exit(1)
-    if p2:
-        command =  iceBoxEndpoints2 + r' shutdown'
-        pipe = TestUtil.startClient(iceBoxAdmin, command + " 2>&1")
-        status = TestUtil.closePipe(pipe)
-        if status or TestUtil.specificServerStatus(p2):
-            TestUtil.killServers()
-            sys.exit(1)
     print "ok"
 
-def runAdmin(cmd, desc = None):
-    global iceStormAdmin
-    global iceStormAdminReference
-    if desc:
-        print desc,
-        sys.stdout.flush()
-    command = adminIceStormReference + r' -e "' + cmd + '"'
-    pipe = TestUtil.startClient(iceStormAdmin, command + " 2>&1")
-    status = TestUtil.closePipe(pipe)
+    runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
+    print "Sending 20000 unordered events with erratic subscriber across a link... ",
+    sys.stdout.flush()
+    status = doTest(server1, server2,  \
+         [ '--events 20000' + server1.reference(), \
+           '--erratic 5 --qos "reliability,ordered" --events 20000 ' + server1.reference(), \
+           '--erratic 5 --events 20000 ' + server1.reference(), \
+           '--events 20000' + server2.reference(), \
+           '--erratic 5 --qos "reliability,ordered" --events 20000 ' + server2.reference(), \
+           '--erratic 5 --events 20000 ' + server2.reference()], \
+           '--events 20000 --oneway ')
     if status:
+        print "failed!"
         TestUtil.killServers()
         sys.exit(1)
-    if desc:
-        print "ok"
+    print "ok"
 
-dbHome = os.path.join(testdir, "db")
-TestUtil.cleanDbDir(dbHome)
-iceStormDBEnv=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome
-
-dbHome2 = os.path.join(testdir, "db2")
-TestUtil.cleanDbDir(dbHome2)
-iceStormDBEnv2=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome2
-
-server1, server2 = startServers()
-
-runAdmin("create TestIceStorm1/fed1 TestIceStorm2/fed1", "setting up the topics...")
-
-print "Sending 5000 ordered events... ",
-sys.stdout.flush()
-status = doTest('--events 5000 --qos "reliability,ordered" ' + iceStormReference, '--events 5000')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 5000 ordered events across a link... ",
-sys.stdout.flush()
-status = doTest('--events 5000 --qos "reliability,ordered" ' + iceStormReference2, '--events 5000')
-if status:
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered events... ",
-sys.stdout.flush()
-status = doTest('--events 20000 ' + iceStormReference, '--events 20000 --oneway')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered events across a link... ",
-sys.stdout.flush()
-status = doTest('--events 20000 ' + iceStormReference2, '--events 20000 --oneway')
-if status:
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered batch events... ",
-sys.stdout.flush()
-status = doTest('--events 20000 --qos "reliability,batch" ' + iceStormReference, '--events 20000 --oneway')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered batch events across a link... ",
-sys.stdout.flush()
-status = doTest('--events 20000 --qos "reliability,batch" ' + iceStormReference2, '--events 20000 --oneway')
-if status:
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered events with slow subscriber... ",
-status = doTest(['--events 2 --slow ' + iceStormReference, '--events 20000 ' + iceStormReference], '--events 20000 --oneway')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered events with slow subscriber & link... ",
-status = doTest(['--events 2 --slow' + iceStormReference, '--events 20000' + iceStormReference, '--events 2 --slow' + iceStormReference2, '--events 20000' + iceStormReference2], '--events 20000 --oneway')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
+    #
+    # Shutdown icestorm.
+    #
+    print "shutting down icestorm services...",
+    sys.stdout.flush()
+    server1.stop()
+    server2.stop()
+    print "ok"
 
-#
-# The erratic tests emit lots of connection warnings so they are
-# disabled here. The IceStorm servers are stopped and restarted so the
-# settings will take effect.
-#
-stopServers(server1, server2)
-server1, server2 = startServers(" --Ice.Warn.Connections=0")
-
-runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered events with erratic subscriber... ",
-sys.stdout.flush()
-status = doTest(\
-    [ '--erratic 5 --qos "reliability,ordered" --events 20000' + iceStormReference, \
-      '--erratic 5 --events 20000' + iceStormReference, \
-      '--events 20000' + iceStormReference], \
-      '--events 20000 --oneway')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
-print "Sending 20000 unordered events with erratic subscriber across a link... ",
-sys.stdout.flush()
-status = doTest( \
-     [ '--events 20000' + iceStormReference, \
-       '--erratic 5 --qos "reliability,ordered" --events 20000 ' + iceStormReference, \
-       '--erratic 5 --events 20000 ' + iceStormReference, \
-       '--events 20000' + iceStormReference2, \
-       '--erratic 5 --qos "reliability,ordered" --events 20000 ' + iceStormReference2, \
-       '--erratic 5 --events 20000 ' + iceStormReference2], \
-       '--events 20000 --oneway ')
-if status:
-    print "failed!"
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
+    if TestUtil.serverStatus():
+        TestUtil.killServers()
+        sys.exit(1)
 
-#
-# Shutdown icestorm.
-#
-stopServers(server1, server2)
-if TestUtil.serverStatus():
-    TestUtil.killServers()
-    sys.exit(1)
+runtest("persistent")
+runtest("replicated")
 
 sys.exit(0)