17 files changed, 3 insertions, 472 deletions
diff --git a/cpp/test/IcePack/deployer/.depend b/cpp/test/IcePack/deployer/.depend
index f99330da0a4..cb5deafdf05 100644
--- a/cpp/test/IcePack/deployer/.depend
+++ b/cpp/test/IcePack/deployer/.depend
@@ -1,6 +1,6 @@
 Test.o: Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/Stream.h ../../../include/Ice/BuiltinSequences.h
 Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../include/TestCommon.h Test.h
-AllTests.o: AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Query.h ../../../include/IcePack/Exception.h ../../../include/IcePack/Admin.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Yellow/Yellow.h ../../include/TestCommon.h Test.h
+AllTests.o: AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Query.h ../../../include/IcePack/Exception.h ../../../include/IcePack/Admin.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../include/TestCommon.h Test.h
 TestI.o: TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h
 Server.o: Server.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h
 TestI.o: TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h
diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp
index d3d7140a9d6..39d419945c5 100644
--- a/cpp/test/IcePack/deployer/AllTests.cpp
+++ b/cpp/test/IcePack/deployer/AllTests.cpp
@@ -17,7 +17,6 @@
 #include <Ice/IdentityUtil.h>
 #include <IcePack/Query.h>
 #include <IcePack/Admin.h>
-#include <Yellow/Yellow.h>
 #include <TestCommon.h>
 #include <Test.h>
 
diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile
index 29602ff2b20..591d6ebb15d 100644
--- a/cpp/test/IcePack/deployer/Makefile
+++ b/cpp/test/IcePack/deployer/Makefile
@@ -46,7 +46,7 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIcePack -lIceBox -lYellow $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIcePack -lIceBox $(LIBS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
diff --git a/cpp/test/IcePack/deployer/application.xml b/cpp/test/IcePack/deployer/application.xml
index df5f97efc13..56505aa0bf3 100644
--- a/cpp/test/IcePack/deployer/application.xml
+++ b/cpp/test/IcePack/deployer/application.xml
@@ -1,8 +1,8 @@
+
 <application>
 
    <node name="localnode" basedir="${basedir}">
 
-     <server name="Yellow"  binpath="../../../bin/icebox" descriptor="yellow_icebox.xml"/>
      <server name="IceBox1" binpath="../../../bin/icebox" descriptor="icebox.xml"/>
      <server name="IceBox2" binpath="../../../bin/icebox" descriptor="icebox.xml"/>
      <server name="Server1" binpath="./server" descriptor="server.xml"/>
diff --git a/cpp/test/IcePack/deployer/yellow_icebox.xml b/cpp/test/IcePack/deployer/yellow_icebox.xml
deleted file mode 100644
index b5d6dcee294..00000000000
--- a/cpp/test/IcePack/deployer/yellow_icebox.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<server kind="cpp-icebox" endpoints="default">
- 
-  <services>
-    <service name="Yellow" descriptor="yellow_service.xml"/>
-  </services>
-
-</server>
diff --git a/cpp/test/IcePack/deployer/yellow_service.xml b/cpp/test/IcePack/deployer/yellow_service.xml
deleted file mode 100644
index dd78c1667ab..00000000000
--- a/cpp/test/IcePack/deployer/yellow_service.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<service kind="freeze" entry="YellowService:create" endpoints="default">
-
-  <adapters>
-    <adapter name="${name}.Query" endpoints="default" id="Yellow.Query"/>
-    <adapter name="${name}.Admin" endpoints="default" id="Yellow.Admin"/>
-  </adapters>
-
-</service>
diff --git a/cpp/test/Makefile b/cpp/test/Makefile
index 5ea06badbe0..61f119c2b3f 100644
--- a/cpp/test/Makefile
+++ b/cpp/test/Makefile
@@ -21,7 +21,6 @@ SUBDIRS		= IceUtil \
                   IceSSL \
 		  IceXML \
 		  IceStorm \
-		  Yellow \
 		  IcePack \
 		  Freeze \
 		  Glacier \
diff --git a/cpp/test/Yellow/Makefile b/cpp/test/Yellow/Makefile
deleted file mode 100644
index 21668248576..00000000000
--- a/cpp/test/Yellow/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2002
-# ZeroC, Inc.
-# Billerica, MA, USA
-#
-# All Rights Reserved.
-#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-include $(top_srcdir)/config/Make.rules
-
-SUBDIRS		= basicYellow
-
-$(EVERYTHING)::
-	@for subdir in $(SUBDIRS); \
-	do \
-	    echo "making $@ in $$subdir"; \
-	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
-	done
diff --git a/cpp/test/Yellow/basicYellow/.depend b/cpp/test/Yellow/basicYellow/.depend
deleted file mode 100644
index e6eb8841d06..00000000000
--- a/cpp/test/Yellow/basicYellow/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Communicator.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Yellow/Yellow.h ../../include/TestCommon.h
diff --git a/cpp/test/Yellow/basicYellow/Client.cpp b/cpp/test/Yellow/basicYellow/Client.cpp
deleted file mode 100644
index ed2efecfb8c..00000000000
--- a/cpp/test/Yellow/basicYellow/Client.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2002
-// ZeroC, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved.
-//
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
-//
-// **********************************************************************
-
-#include <Ice/Ice.h>
-#include <IceUtil/IceUtil.h>
-#include <Yellow/Yellow.h>
-#include <TestCommon.h>
-
-using namespace std;
-using namespace Ice;
-using namespace Yellow;
-
-class StressThread : public IceUtil::Thread
-{
-public:
-
-    StressThread(const QueryPrx& query) :
-	_query(query)
-    {
-    }
-
-    virtual void
-    run()
-    {
-	string intf = "::Test";
-	for (int i = 0; i < 100; ++i)
-	{
-	    Ice::ObjectPrx result = _query->lookup(intf);
-	}
-    }
-
-private:
-
-    QueryPrx _query;
-};
-
-static int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
-{
-    QueryPrx query = QueryPrx::checkedCast(
-	communicator->stringToProxy("Yellow/Query:default -p 12346"));
-
-    AdminPrx admin = AdminPrx::checkedCast(
-	communicator->stringToProxy("Yellow/Admin:default -p 12347"));
-
-    cout << "testing add... ";
-
-    ObjectAdapterPtr adapter = communicator->createObjectAdapter("dummy");
-    ObjectPrx test1 = adapter->createProxy(stringToIdentity("test"));
-    ObjectPrx test2 = adapter->createProxy(stringToIdentity("test2"));
-
-    ObjectPrx test3 = adapter->createProxy(stringToIdentity("test3"));
-    ObjectPrx test4 = adapter->createProxy(stringToIdentity("test4"));
-
-    admin->add("::Test", test1);
-    admin->add("::Test", test2);
-
-    ObjectProxySeq seq = query->lookupAll("::Test");
-    test(seq.size() == 2);
-    Identity ident = seq[0]->ice_getIdentity();
-    test(ident == stringToIdentity("test") || ident == stringToIdentity("test2"));
-    if(ident == stringToIdentity("test"))
-    {
-	test(seq[1]->ice_getIdentity() == stringToIdentity("test2"));
-    }
-    else
-    {
-	test(seq[1]->ice_getIdentity() == stringToIdentity("test"));
-    }
-
-    admin->add("::Test2", test3);
-    admin->add("::Test2", test4);
-
-    seq = query->lookupAll("::Test2");
-    test(seq.size() == 2);
-    ident = seq[0]->ice_getIdentity();
-    test(ident == stringToIdentity("test3") || ident == stringToIdentity("test4"));
-    if(ident == stringToIdentity("test3"))
-    {
-	test(seq[1]->ice_getIdentity() == stringToIdentity("test4"));
-    }
-    else
-    {
-	test(seq[1]->ice_getIdentity() == stringToIdentity("test3"));
-    }
-
-    cout << "ok" << endl;
-
-    cout << "testing lookup... ";
-    try
-    {
-	query->lookup("::Foo");
-	test(false);
-    }
-    catch(const NoSuchOfferException&)
-    {
-	// Expected
-    }
-    ObjectPrx obj = query->lookup("::Test");
-    ident = obj->ice_getIdentity();
-    test(ident == stringToIdentity("test") || ident == stringToIdentity("test2"));
-
-    obj = query->lookup("::Test2");
-    ident = obj->ice_getIdentity();
-    test(ident == stringToIdentity("test3") || ident == stringToIdentity("test4"));
-
-    cout << "ok" << endl;
-
-    cout << "testing remove... ";
-    try
-    {
-	admin->remove("::Test2", test1);
-	test(false);
-    }
-    catch(const NoSuchOfferException&)
-    {
-	// Expected
-    }
-
-    admin->remove("::Test2", test3);
-
-    obj = query->lookup("::Test2");
-    ident = obj->ice_getIdentity();
-    test(ident == stringToIdentity("test4"));
-
-    admin->remove("::Test2", test4);
-
-    try
-    {
-	query->lookup("::Test2");
-	test(false);
-    }
-    catch(const NoSuchOfferException&)
-    {
-	// Expected
-    }
-    cout << "ok" << endl;
-
-    cout << "testing concurrent queries... " << flush;
-    vector<IceUtil::ThreadControl> controls;
-    for(int i = 0; i < 10; ++i)
-    {
-	IceUtil::ThreadPtr t = new StressThread(query);
-	controls.push_back(t->start());
-    }
-    for(vector<IceUtil::ThreadControl>::iterator p = controls.begin(); p != controls.end(); ++p)
-    {
-	p->join();
-    }
-    cout << "ok" << endl;
-
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-	communicator = Ice::initialize(argc, argv);
-	status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-	cerr << ex << endl;
-	status = EXIT_FAILURE;
-    }
-
-    try
-    {
-	communicator->destroy();
-    }
-    catch(const Ice::Exception& ex)
-    {
-	cerr << ex << endl;
-	status = EXIT_FAILURE;
-    }
-
-    return status;
-}
diff --git a/cpp/test/Yellow/basicYellow/Makefile b/cpp/test/Yellow/basicYellow/Makefile
deleted file mode 100644
index 46c01b71de3..00000000000
--- a/cpp/test/Yellow/basicYellow/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2002
-# ZeroC, Inc.
-# Billerica, MA, USA
-#
-# All Rights Reserved.
-#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
-#
-# **********************************************************************
-
-top_srcdir	= ../../..
-
-CLIENT		= client
-
-TARGETS		= $(CLIENT)
-
-OBJS		= Client.o
-
-SRCS		= $(OBJS:.o=.cpp)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-
-$(CLIENT): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lYellow $(LIBS)
-
-include .depend
diff --git a/cpp/test/Yellow/basicYellow/basicyellow.dsp b/cpp/test/Yellow/basicYellow/basicyellow.dsp
deleted file mode 100644
index 3ed7227eea9..00000000000
--- a/cpp/test/Yellow/basicYellow/basicyellow.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="basicYellowC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=basicYellowC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "basicYellow.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "basicYellow.mak" CFG="basicYellowC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "basicYellowC - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "basicYellowC - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "basicYellowC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
-# SUBTRACT LINK32 /debug /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "basicYellowC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "basicYellowC - Win32 Release"
-# Name "basicYellowC - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\Client.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/cpp/test/Yellow/basicYellow/config_client b/cpp/test/Yellow/basicYellow/config_client
deleted file mode 100644
index e5f518da475..00000000000
--- a/cpp/test/Yellow/basicYellow/config_client
+++ /dev/null
@@ -1,2 +0,0 @@
-Yellow.Admin=Yellow/Admin:tcp -p 10001 -h 127.0.0.1
-Yellow.Query=Yellow/Query:tcp -p 10000 -h 127.0.0.1
diff --git a/cpp/test/Yellow/basicYellow/config_yellow b/cpp/test/Yellow/basicYellow/config_yellow
deleted file mode 100644
index e659b547394..00000000000
--- a/cpp/test/Yellow/basicYellow/config_yellow
+++ /dev/null
@@ -1,2 +0,0 @@
-Yellow.Query.Endpoints=tcp -p 10000 -h 127.0.0.1
-Yellow.Admin.Endpoints=tcp -p 10001 -h 127.0.0.1
diff --git a/cpp/test/Yellow/basicYellow/config_yellow_service b/cpp/test/Yellow/basicYellow/config_yellow_service
deleted file mode 100644
index 608b6cdb053..00000000000
--- a/cpp/test/Yellow/basicYellow/config_yellow_service
+++ /dev/null
@@ -1,6 +0,0 @@
-#Ice.Trace.Network=1
-
-Ice.Warn.Connections=1
-
-IceBox.Service.Yellow=YellowService:create --Ice.Config=config_yellow
-IceBox.DBEnvName.Yellow=db
diff --git a/cpp/test/Yellow/basicYellow/db/.dummy b/cpp/test/Yellow/basicYellow/db/.dummy
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/cpp/test/Yellow/basicYellow/db/.dummy
+++ /dev/null
diff --git a/cpp/test/Yellow/basicYellow/run.py b/cpp/test/Yellow/basicYellow/run.py
deleted file mode 100755
index 0357852c4b9..00000000000
--- a/cpp/test/Yellow/basicYellow/run.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2002
-# ZeroC, Inc.
-# Billerica, MA, USA
-#
-# All Rights Reserved.
-#
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
-#
-# **********************************************************************
-
-import os, sys, time
-
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
-        break
-else:
-    raise "can't find toplevel directory!"
-
-sys.path.append(os.path.join(toplevel, "config"))
-import TestUtil
-
-name = os.path.join("Yellow", "basicYellow")
-testdir = os.path.join(toplevel, "test", name)
-
-IceBox = os.path.join(toplevel, "bin", "icebox")
-IceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
-
-IceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-YellowService=" --IceBox.Service.Yellow=YellowService:create" + \
-	      ' --Yellow.Query.Endpoints="default -p 12346" --Yellow.Admin.Endpoints="default -p 12347"' + \
-	      ' --IceBox.PrintServicesReady=Yellow'
-
-dbEnvName = os.path.join(testdir, "db")
-TestUtil.cleanDbDir(dbEnvName)
-YellowDBEnv=" --IceBox.DBEnvName.Yellow=" + dbEnvName
-
-print "starting yellow service...",
-command = IceBox + TestUtil.clientServerOptions + IceBoxEndpoints + YellowService + YellowDBEnv
-IceBoxPipe = os.popen(command)
-TestUtil.getServerPid(IceBoxPipe)
-TestUtil.waitServiceReady(IceBoxPipe, "Yellow")
-print "ok"
-
-client = os.path.join(testdir, "client")
-
-#
-# Start the client.
-#
-print "starting client...",
-command = client + TestUtil.clientOptions
-clientPipe = os.popen(command)
-print "ok"
-
-for output in clientPipe.xreadlines():
-    print output,
-    
-#
-# Shutdown yellow.
-#
-print "shutting down yellow service...",
-command = IceBoxAdmin + TestUtil.clientOptions + IceBoxEndpoints + r' shutdown'
-IceBoxAdminPipe = os.popen(command)
-IceBoxAdminStatus = IceBoxAdminPipe.close()
-if IceBoxAdminStatus:
-    TestUtil.killServers()
-    sys.exit(1)
-print "ok"
-
-YellowStatus = IceBoxPipe.close()
-clientStatus = clientPipe.close();
-
-if YellowStatus or clientStatus:
-    TestUtil.killServers()
-    sys.exit(1)
-
-sys.exit(0)