Fri Sep 2 15:04:00 2005 William Otte <wotte@dre.vanderbilt.edu>

121 files changed, 54 insertions, 7176 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 831411eb621..7f6276ec206 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,33 @@
+Fri Sep  2 15:04:00 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+	* tests/tests.mwc
+	* tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+	* tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+	* tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+	* tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+	* tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+	* tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
+	* tests/IDL3/Events/Abstract/Abstract.mpc
+	* tests/IDL3/Events/Regular/Regular.mpc
+	* tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+	* tests/IDL3/Homes/Basic/Basic.mpc
+	* tests/IDL3/Homes/Factory/Factory.mpc
+	* tests/IDL3/Homes/Finder/Finder.mpc
+	* tests/IDL3/Homes/Inheritance/Inheritance.mpc
+	* tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+	* tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
+	* tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+	* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+	* tests/IDL3/ImpliedIDL/Events/Events.mpc
+	* tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+	* tests/IDL3/Lookup/lookup_test.mpc
+
+	Updated to use dnc ciao base project. 
+
+	* tests/RTCCM
+
+	Removed this test. 
+	
 Thu Sep  1 10:20:48 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	CIAO Reorganization.  Plese see tag before_ciao_reorg
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
index 2d29a08daff..1372ae82668 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Attributes"
 
-project(Attributes_stub): ciao_client {
+project(Attributes_stub): ciao_client_dnc {
   
   sharedname = Attributes_stub
   idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
index 45f844030bf..a1a90abe9a3 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n EventSink"
 
-project(EventSink_stub): ciao_client {
+project(EventSink_stub): ciao_client_dnc {
   
   sharedname = EventSink_stub
   idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
index 3b7c1dd0779..e98d21e8a5a 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n EventSource"
 
-project(EventSource_stub): ciao_client {
+project(EventSource_stub): ciao_client_dnc {
   
   sharedname = EventSource_stub
   idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
index 7fbd704f812..1f1ba286b7d 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Facets"
 
-project(Facets_stub): ciao_client {
+project(Facets_stub): ciao_client_dnc {
   
   sharedname = Facets_stub
   idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
index 9acd47e619c..6ecfc50f438 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Receptacles"
 
-project(Receptacles_stub): ciao_client {
+project(Receptacles_stub): ciao_client_dnc {
   
   sharedname = Receptacles_stub
   idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export -Wb,stub_export_include=Receptacles_stub_export.h -Wb,skel_export_macro=RECEPTACLES_SVNT_Export -Wb,skel_export_include=Receptacles_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
index 38873a4cd60..da4084ee9f3 100644
--- a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleComponent"
 
-project(SimpleComponent_stub): ciao_client {
+project(SimpleComponent_stub): ciao_client_dnc {
   
   sharedname = SimpleComponent_stub
   idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export -Wb,stub_export_include=SimpleComponent_stub_export.h -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export -Wb,skel_export_include=SimpleComponent_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
index b981a93bf1b..bffbdebb9df 100644
--- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Abstract"
 
-project(Abstract_stub): ciao_client {
+project(Abstract_stub): ciao_client_dnc {
   
   sharedname = Abstract_stub
   idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
index 5a10c1e5026..81faf3a8e4f 100644
--- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Regular"
 
-project(Regular_stub): ciao_client {
+project(Regular_stub): ciao_client_dnc {
   
   sharedname = Regular_stub
   idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
index 54f92a8e46c..413748705d0 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HomeAttributes"
 
-project(HomeAttributes_stub): ciao_client {
+project(HomeAttributes_stub): ciao_client_dnc {
   
   sharedname = HomeAttributes_stub
   idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
index 282bcf5ba40..f364c13c293 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Basic"
 
-project(IDL3_Basic_stub): ciao_client {
+project(IDL3_Basic_stub): ciao_client_dnc {
   
   sharedname = Homes_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
index 087d167fa8e..7ff6c2a75bc 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Factory"
 
-project(Factory_stub): ciao_client {
+project(Factory_stub): ciao_client_dnc {
   
   sharedname = Factory_stub
   idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
index d7c904208bb..0409af4d8ad 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Finder"
 
-project(Finder_stub): ciao_client {
+project(Finder_stub): ciao_client_dnc {
   
   sharedname = Finder_stub
   idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
index 97d80c30b03..b8c27d5b42d 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Inheritance"
 
-project(Inheritance_stub): ciao_client {
+project(Inheritance_stub): ciao_client_dnc {
   
   sharedname = Inheritance_stub
   idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
index f35a856046d..5759c52f43c 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICBasic"
 
-project(ICBasic_stub): ciao_client {
+project(ICBasic_stub): ciao_client_dnc {
   
   sharedname = ICBasic_stub
   idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
index 60f471195a9..f3707d8bea2 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICEventSink"
 
-project(ICEventSink_stub): ciao_client {
+project(ICEventSink_stub): ciao_client_dnc {
   
   sharedname = ICEventSink_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
index bc7b6bb47cc..c86b9521ce4 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICEventSource"
 
-project(ICEventSource_stub): ciao_client {
+project(ICEventSource_stub): ciao_client_dnc {
   
   sharedname = ICEventSource_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
index 4735bdbbde4..d47827f2a2d 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICReceptacles"
 
-project(ICReceptacles_stub): ciao_client {
+project(ICReceptacles_stub): ciao_client_dnc {
   
   sharedname = ICReceptacles_stub
   idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
index 32a96f97d5d..7c3478d0b2e 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Events"
 
-project(Events_stub): ciao_client {
+project(Events_stub): ciao_client_dnc {
   
   sharedname = Events_stub
   idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
index 095bcf7c1e0..c81e215abfa 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Homes"
 
-project(Homes_stub): ciao_client {
+project(Homes_stub): ciao_client_dnc {
   
   sharedname = Homes_stub
   idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
index ac1f8ebb213..9814f248c5a 100644
--- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
+++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(LookupTest_stub): ciao_client {
+project(LookupTest_stub): ciao_client_dnc {
   
   sharedname = LookupTest_stub
   idlflags += -Sc
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.cpp
deleted file mode 100644
index 197444ec43d..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-
-#include "SenderC.h"
-#include "ReceiverC.h"
-#include "ace/Get_Opt.h"
-
-static const char *sender_ior = "file://sender.ior";
-static const char *receiver_ior = "file://receiver.ior";
-static int iterations = 1;
-static int corba_priority = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "s:r:n:p:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-        // sender ior
-      case 's':
-        sender_ior = get_opts.opt_arg ();
-        break;
-
-        // receiver ior
-      case 'r':
-        receiver_ior = get_opts.opt_arg ();
-        break;
-
-        // number of itarations
-      case 'n':
-        iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-        // corba priority
-      case 'p':
-        corba_priority = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s\n"
-                           "\t-s <sender ior> [default is %s]\n"
-                           "\t-r <receiver ior> [default is %s]\n"
-                           "\t-n <number of invocations> [defaults to %d]\n"
-                           "\t-p <corba priority> [defaults to %d]\n"
-                           "\n",
-                           argv [0],
-                           sender_ior,
-                           receiver_ior,
-                           iterations,
-                           corba_priority),
-                          -1);
-      }
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  try
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
-
-      int result =
-        parse_args (argc, argv);
-      if (result != 0)
-        return result;
-
-      CORBA::Object_var object =
-        orb->string_to_object (sender_ior);
-
-      DiffServ::Sender_var sender =
-        DiffServ::Sender::_narrow (object.in ());
-
-      object =
-        orb->string_to_object (receiver_ior);
-
-      DiffServ::Receiver_var receiver =
-        DiffServ::Receiver::_narrow (object.in ());
-
-      sender->start (iterations,
-                     corba_priority);
-
-      sender->shutdown ();
-
-      receiver->shutdown ();
-
-      return 0;
-    }
-  catch (CORBA::Exception &exception)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Unexpected exception caught by client: %s (%s)\n",
-                  exception._name (),
-                  exception._rep_id ()));
-
-      return -1;
-    }
-}
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
deleted file mode 100644
index b252d965c8c..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-project (*) : ciao_client, rtcorba, exceptions {
-  after += DiffServ_Sender_stub DiffServ_Receiver_stub
-  includes += ../Sender
-  includes += ../Receiver
-  libs += DiffServ_Sender_stub DiffServ_Receiver_stub DiffServ_stub
-}
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.cidl b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.cidl
deleted file mode 100644
index aa90525496e..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.cidl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Receiver.idl"
-
-composition session ReceiverImpl
-{
-  home executor ReceiverHomeExec
-  {
-    implements DiffServ::ReceiverHome;
-    manages ReceiverExec;
-  };
-};
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.idl b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.idl
deleted file mode 100644
index d8ddde3fc45..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#include "../common/DiffServ.idl"
-
-module DiffServ
-{
-  interface Receiver_Controller
-  {
-    void shutdown ();
-  };
-
-  component Receiver supports Receiver_Controller
-  {
-    provides test writer;
-  };
-
-  home ReceiverHome manages Receiver
-  {
-  };
-};
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc
deleted file mode 100644
index 6397c59a41e..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DiffServ Receiver"
-
-project(DiffServ_Receiver_stub): ciao_client {
-  libs += DiffServ_stub
-  after += DiffServ_stub
-  sharedname = DiffServ_Receiver_stub
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
-  dynamicflags   = RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-    Receiver.idl
-  }
-
-  Source_Files {
-    ReceiverC.cpp
-  }
-}
-
-project(DiffServ_Receiver_svnt) : ciao_servant {
-  after += DiffServ_svnt DiffServ_Receiver_stub
-  sharedname  = DiffServ_Receiver_svnt
-  libs    += DiffServ_Receiver_stub DiffServ_stub DiffServ_svnt
-  
-  idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
-  dynamicflags = RECEIVER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Receiver.cidl
-  }
-
-  IDL_Files {
-    ReceiverE.idl
-  }
-
-  Source_Files {
-    ReceiverEC.cpp
-    ReceiverS.cpp
-    Receiver_svnt.cpp
-  }
-}
-
-
-project(DiffServ_Receiver_exec) : ciao_component {
-  after   += DiffServ_Receiver_svnt
-  sharedname = DiffServ_Receiver_exec
-  libs      += DiffServ_Receiver_stub DiffServ_Receiver_svnt DiffServ_stub DiffServ_svnt
-  
-  idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
-  dynamicflags   = RECEIVER_EXEC_BUILD_DLL
-  requires     += exceptions
-
-  IDL_Files {
-    
-  }
-
-  Source_Files {
-    
-    Receiver_exec.cpp
-  }
-}
-
-
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp
deleted file mode 100644
index 1d0b3979306..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-
-#include "Receiver_exec.h"
-
-namespace CIDL_ReceiverImpl
-{
-  void
-  test_i::method (void)
-    throw (CORBA::SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "test_i::method\n"));
-  }
-
-  ReceiverExec_i::ReceiverExec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ReceiverExec_i\n"));
-
-    int argc = 0;
-    char **argv = 0;
-
-    this->orb_ =
-      CORBA::ORB_init (argc,
-                      argv,
-                      "");
-
-  }
-
-  ::DiffServ::CCM_test_ptr
-  ReceiverExec_i::get_writer (void)
-    throw (CORBA::SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::get_writer\n"));
-    return new test_i;
-  }
-
-  void
-  ReceiverExec_i::shutdown (void)
-    throw (CORBA::SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::shutdown\n"));
-    this->orb_->shutdown ();
-  }
-
-  void
-  ReceiverExec_i::set_session_context (Components::SessionContext_ptr ctx)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::set_session_context\n"));
-
-    this->context_ =
-      ReceiverExec_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-      throw CORBA::INTERNAL ();
-  }
-
-  void
-  ReceiverExec_i::ccm_activate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_activate\n"));
-  }
-
-  void
-  ReceiverExec_i::ccm_passivate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_passivate\n"));
-  }
-
-  void
-  ReceiverExec_i::ccm_remove (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_remove\n"));
-  }
-
-  void
-  ReceiverExec_i::ciao_preactivate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_preactivate\n"));
-  }
-
-  void
-  ReceiverExec_i::ciao_postactivate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_postactivate\n"));
-  }
-
-  ::Components::EnterpriseComponent_ptr
-  ReceiverHomeExec_i::create (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ReceiverHome_exec::create\n"));
-    return new ReceiverExec_i;
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  createReceiverHome_Impl (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "createReceiverHome_Impl\n"));
-    return new ReceiverHomeExec_i;
-  }
-}
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h
deleted file mode 100644
index fedbdf34e50..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-#include "ReceiverEC.h"
-#include "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_ReceiverImpl
-{
-  class RECEIVER_EXEC_Export ReceiverExec_i :
-    public virtual ReceiverExec,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    ReceiverExec_i (void);
-
-    ::DiffServ::CCM_test_ptr get_writer (void)
-      throw (CORBA::SystemException);
-
-    void shutdown (void)
-      throw (CORBA::SystemException);
-
-    void set_session_context (Components::SessionContext_ptr ctx)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ccm_activate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ccm_passivate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ccm_remove (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ciao_preactivate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ciao_postactivate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-  protected:
-
-    ReceiverExec_Context_var context_;
-
-    CORBA::ORB_var orb_;
-
-  };
-
-  class RECEIVER_EXEC_Export test_i :
-    public virtual DiffServ::CCM_test,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    void method (void)
-      throw (CORBA::SystemException);
-
-  };
-
-  class RECEIVER_EXEC_Export ReceiverHomeExec_i :
-    public virtual ReceiverHomeExec,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    ::Components::EnterpriseComponent_ptr create (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  createReceiverHome_Impl (void);
-}
-
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec_export.h
deleted file mode 100644
index 8ad3640d130..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_EXEC
-// ------------------------------
-#ifndef RECEIVER_EXEC_EXPORT_H
-#define RECEIVER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RECEIVER_EXEC_HAS_DLL)
-#  define RECEIVER_EXEC_HAS_DLL 1
-#endif /* ! RECEIVER_EXEC_HAS_DLL */
-
-#if defined (RECEIVER_EXEC_HAS_DLL) && (RECEIVER_EXEC_HAS_DLL == 1)
-#  if defined (RECEIVER_EXEC_BUILD_DLL)
-#    define RECEIVER_EXEC_Export ACE_Proper_Export_Flag
-#    define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_EXEC_BUILD_DLL */
-#    define RECEIVER_EXEC_Export ACE_Proper_Import_Flag
-#    define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_EXEC_BUILD_DLL */
-#else /* RECEIVER_EXEC_HAS_DLL == 1 */
-#  define RECEIVER_EXEC_Export
-#  define RECEIVER_EXEC_SINGLETON_DECLARATION(T)
-#  define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_EXEC_HAS_DLL == 1 */
-
-// Set RECEIVER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_EXEC_NTRACE */
-
-#if (RECEIVER_EXEC_NTRACE == 1)
-#  define RECEIVER_EXEC_TRACE(X)
-#else /* (RECEIVER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_EXEC_NTRACE == 1) */
-
-#endif /* RECEIVER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_stub_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_stub_export.h
deleted file mode 100644
index c457802854f..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_STUB
-// ------------------------------
-#ifndef RECEIVER_STUB_EXPORT_H
-#define RECEIVER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RECEIVER_STUB_HAS_DLL)
-#  define RECEIVER_STUB_HAS_DLL 1
-#endif /* ! RECEIVER_STUB_HAS_DLL */
-
-#if defined (RECEIVER_STUB_HAS_DLL) && (RECEIVER_STUB_HAS_DLL == 1)
-#  if defined (RECEIVER_STUB_BUILD_DLL)
-#    define RECEIVER_STUB_Export ACE_Proper_Export_Flag
-#    define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_STUB_BUILD_DLL */
-#    define RECEIVER_STUB_Export ACE_Proper_Import_Flag
-#    define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_STUB_BUILD_DLL */
-#else /* RECEIVER_STUB_HAS_DLL == 1 */
-#  define RECEIVER_STUB_Export
-#  define RECEIVER_STUB_SINGLETON_DECLARATION(T)
-#  define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_STUB_HAS_DLL == 1 */
-
-// Set RECEIVER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_STUB_NTRACE */
-
-#if (RECEIVER_STUB_NTRACE == 1)
-#  define RECEIVER_STUB_TRACE(X)
-#else /* (RECEIVER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_STUB_NTRACE == 1) */
-
-#endif /* RECEIVER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_svnt_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_svnt_export.h
deleted file mode 100644
index 1c9eca2556d..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_SVNT
-// ------------------------------
-#ifndef RECEIVER_SVNT_EXPORT_H
-#define RECEIVER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RECEIVER_SVNT_HAS_DLL)
-#  define RECEIVER_SVNT_HAS_DLL 1
-#endif /* ! RECEIVER_SVNT_HAS_DLL */
-
-#if defined (RECEIVER_SVNT_HAS_DLL) && (RECEIVER_SVNT_HAS_DLL == 1)
-#  if defined (RECEIVER_SVNT_BUILD_DLL)
-#    define RECEIVER_SVNT_Export ACE_Proper_Export_Flag
-#    define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_SVNT_BUILD_DLL */
-#    define RECEIVER_SVNT_Export ACE_Proper_Import_Flag
-#    define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_SVNT_BUILD_DLL */
-#else /* RECEIVER_SVNT_HAS_DLL == 1 */
-#  define RECEIVER_SVNT_Export
-#  define RECEIVER_SVNT_SINGLETON_DECLARATION(T)
-#  define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_SVNT_HAS_DLL == 1 */
-
-// Set RECEIVER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_SVNT_NTRACE */
-
-#if (RECEIVER_SVNT_NTRACE == 1)
-#  define RECEIVER_SVNT_TRACE(X)
-#else /* (RECEIVER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_SVNT_NTRACE == 1) */
-
-#endif /* RECEIVER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.cidl b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.cidl
deleted file mode 100644
index 5132655af3e..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.cidl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Sender.idl"
-
-composition session SenderImpl
-{
-  home executor SenderHomeExec
-  {
-    implements DiffServ::SenderHome;
-    manages SenderExec;
-  };
-};
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.idl b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.idl
deleted file mode 100644
index a98321eeb17..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#include "../common/DiffServ.idl"
-
-module DiffServ
-{
-  interface Sender_Controller
-  {
-    void start (in unsigned long iterations, 
-                in short priority);
-
-    void shutdown ();
-  };
-
-  component Sender supports Sender_Controller
-  {
-    uses test reader;
-  };
-
-  home SenderHome manages Sender
-  {
-  };
-};
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc
deleted file mode 100644
index 8414a989886..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DiffServ Sender"
-
-project(DiffServ_Sender_stub): ciao_client {
-  libs += DiffServ_stub
-  after += DiffServ_stub
-  sharedname = DiffServ_Sender_stub
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
-  dynamicflags   = SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-    Sender.idl
-  }
-
-  Source_Files {
-    SenderC.cpp
-  }
-}
-
-project(DiffServ_Sender_svnt) : ciao_servant {
-  after += DiffServ_svnt DiffServ_Sender_stub
-  sharedname  = DiffServ_Sender_svnt
-  libs    += DiffServ_Sender_stub DiffServ_stub DiffServ_svnt
-  
-  idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h
-  dynamicflags = SENDER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Sender.cidl
-  }
-
-  IDL_Files {
-    SenderE.idl
-  }
-
-  Source_Files {
-    SenderEC.cpp
-    SenderS.cpp
-    Sender_svnt.cpp
-  }
-}
-
-
-project(DiffServ_Sender_exec) : ciao_component, rtcorba {
-  after   += DiffServ_Sender_svnt
-  sharedname = DiffServ_Sender_exec
-  libs      += DiffServ_Sender_stub DiffServ_Sender_svnt DiffServ_stub DiffServ_svnt
-  includes += ../../../../../tests/RTCORBA/Diffserv
-  
-  idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h
-  dynamicflags   = SENDER_EXEC_BUILD_DLL
-  requires     += exceptions
-
-  IDL_Files {
-    
-  }
-
-  Source_Files {
-    Sender_exec.cpp
-  }
-}
-
-
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
deleted file mode 100644
index c5a7004456d..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// $Id$
-
-#include "tao/RTCORBA/RTCORBA.h"
-#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
-#include "tao/RTCORBA/Network_Priority_Mapping.h"
-#include "Custom_Network_Priority_Mapping.h"
-#include "Custom_Network_Priority_Mapping.cpp"
-#include "Sender_exec.h"
-#include "ace/OS_NS_unistd.h"
-
-namespace CIDL_SenderImpl
-{
-  SenderExec_i::SenderExec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::SenderExec_i\n"));
-
-    int argc = 0;
-    char **argv = 0;
-
-    ACE_DECLARE_NEW_CORBA_ENV;
-
-    ACE_TRY
-      {
-        this->orb_ =
-          CORBA::ORB_init (argc,
-                          argv,
-                          ""
-                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        CORBA::Object_var object =
-          this->orb_->resolve_initial_references ("RTORB"
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        RTCORBA::RTORB_var rt_orb =
-          RTCORBA::RTORB::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-
-        ACE_TRY_CHECK;
-
-        RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties =
-          rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                  ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                  1,
-                                                  0,
-                                                  1,
-                                                  0);
-
-        RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties =
-          rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                  ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                  1,
-                                                  0,
-                                                  1,
-                                                  1);
-
-        RTCORBA::ProtocolList protocols;
-        protocols.length (1);
-        protocols[0].protocol_type = 0;
-        protocols[0].transport_protocol_properties =
-          RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ());
-        protocols[0].orb_protocol_properties =
-          RTCORBA::ProtocolProperties::_nil ();
-
-        this->normal_policy_list_.length (1);
-        this->normal_policy_list_[0] =
-          rt_orb->create_client_protocol_policy (protocols);
-
-        protocols[0].transport_protocol_properties =
-          RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ());
-
-        this->diffserv_policy_list_.length (1);
-        this->diffserv_policy_list_[0] =
-          rt_orb->create_client_protocol_policy (protocols);
-
-        object =
-          this->orb_->resolve_initial_references ("ORBPolicyManager"
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        this->policy_manager_ =
-          CORBA::PolicyManager::_narrow (object.in ());
-
-        object =
-          this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        this->policy_current_ =
-          CORBA::PolicyCurrent::_narrow (object.in ());
-
-        object =
-          this->orb_->resolve_initial_references ("NetworkPriorityMappingManager"
-                                                  ACE_ENV_ARG_PARAMETER);
-
-        ACE_TRY_CHECK;
-
-        RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
-          RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
-
-        this->custom_network_priority_mapping_ =
-          new Custom_Network_Priority_Mapping;
-
-        mapping_manager->mapping (this->custom_network_priority_mapping_);
-      }
-    ACE_CATCHANY
-      {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "(%P|%t) Caught exception in SenderExec_i \n");
-      }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
-
-  void
-  SenderExec_i::change_network_priority (int enable_network_priority,
-                                         Priority_Level level,
-                                         DiffServ::test_var &test)
-  {
-    CORBA::PolicyList *policy_list = 0;
-
-    if (enable_network_priority)
-      policy_list = &this->diffserv_policy_list_;
-    else
-      policy_list = &this->normal_policy_list_;
-
-    switch (level)
-      {
-        // Change policy at ORB level
-      case ORB:
-        {
-          this->policy_manager_->set_policy_overrides (*policy_list,
-                                                      CORBA::SET_OVERRIDE);
-
-          break;
-        }
-
-        // Change policy at THREAD level
-      case THREAD:
-        {
-          this->policy_current_->set_policy_overrides (*policy_list,
-                                                      CORBA::SET_OVERRIDE);
-
-          break;
-        }
-
-        // Change policy at OBJECT level
-      case OBJECT:
-        {
-          CORBA::Object_var object =
-            test->_set_policy_overrides (*policy_list,
-                                        CORBA::SET_OVERRIDE);
-
-          test = DiffServ::test::_narrow (object.in ());
-
-          break;
-        }
-      }
-  }
-
-  void
-  SenderExec_i::start (CORBA::ULong iterations,
-                       CORBA::Short priority)
-    throw (CORBA::SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::start\n"));
-
-    this->custom_network_priority_mapping_->corba_priority (priority);
-
-    DiffServ::test_var test =
-      this->context_->get_connection_reader ();
-
-    int enable_network_priority = 1;
-
-    for (CORBA::ULong i = 0; i < iterations; ++i)
-      {
-        this->toggle (enable_network_priority);
-
-        switch (i)
-          {
-          case 0:
-          case 1:
-            this->change_network_priority (enable_network_priority, ORB, test);
-            break;
-          case 2:
-          case 3:
-            this->change_network_priority (enable_network_priority, THREAD, test);
-            break;
-          default:
-            this->change_network_priority (enable_network_priority, OBJECT, test);
-            break;
-          }
-
-        test->method ();
-        ACE_OS::sleep (1);
-      }
-  }
-
-  void
-  SenderExec_i::shutdown (void)
-    throw (CORBA::SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::shutdown\n"));
-    this->orb_->shutdown ();
-  }
-
-  void
-  SenderExec_i::toggle (int &i)
-  {
-    if (i == 0)
-      i = 1;
-    else i = 0;
-  }
-
-  void
-  SenderExec_i::set_session_context (Components::SessionContext_ptr ctx)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::set_session_context\n"));
-
-    this->context_ =
-      SenderExec_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-      throw CORBA::INTERNAL ();
-  }
-
-  void
-  SenderExec_i::ccm_activate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_activate\n"));
-  }
-
-  void
-  SenderExec_i::ccm_passivate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_passivate\n"));
-  }
-
-  void
-  SenderExec_i::ccm_remove (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_remove\n"));
-  }
-
-
-  void
-  SenderExec_i::ciao_preactivate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_preactivate\n"));
-  }
-
-  void
-  SenderExec_i::ciao_postactivate (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_postactivate\n"));
-  }
-
-  ::Components::EnterpriseComponent_ptr
-  SenderHomeExec_i::create (void)
-    throw (CORBA::SystemException,
-          Components::CCMException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SenderHome_exec::create\n"));
-    return new SenderExec_i;
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  createSenderHome_Impl (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "createSenderHome_Impl\n"));
-    return new SenderHomeExec_i;
-  }
-}
-
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h
deleted file mode 100644
index 295e1e761c6..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-
-#include "SenderEC.h"
-#include "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-class Custom_Network_Priority_Mapping;
-
-namespace CIDL_SenderImpl
-{
-  class SENDER_EXEC_Export SenderExec_i :
-    public virtual SenderExec,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    SenderExec_i (void);
-
-    void start (CORBA::ULong iterations,
-                CORBA::Short priority)
-      throw (CORBA::SystemException);
-
-    void shutdown (void)
-      throw (CORBA::SystemException);
-
-    void set_session_context (Components::SessionContext_ptr ctx)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ccm_activate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ccm_passivate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ccm_remove (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ciao_preactivate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-    void ciao_postactivate (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-
-  protected:
-
-    SenderExec_Context_var context_;
-
-    CORBA::ORB_var orb_;
-
-    Custom_Network_Priority_Mapping *custom_network_priority_mapping_;
-
-    CORBA::PolicyManager_var policy_manager_;
-
-    CORBA::PolicyCurrent_var policy_current_;
-
-    CORBA::PolicyList normal_policy_list_;
-
-    CORBA::PolicyList diffserv_policy_list_;
-
-    enum Priority_Level
-      {
-        OBJECT,
-        THREAD,
-        ORB
-      };
-
-    void change_network_priority (int enable_network_priority,
-                                  Priority_Level level,
-                                  DiffServ::test_var &test);
-
-    void toggle (int &i);
-
-  };
-
-  class SENDER_EXEC_Export SenderHomeExec_i :
-    public virtual SenderHomeExec,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    ::Components::EnterpriseComponent_ptr create (void)
-      throw (CORBA::SystemException,
-             Components::CCMException);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  createSenderHome_Impl (void);
-}
-
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec_export.h
deleted file mode 100644
index dbaa7ea15bc..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SENDER_EXEC
-// ------------------------------
-#ifndef SENDER_EXEC_EXPORT_H
-#define SENDER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (SENDER_EXEC_HAS_DLL)
-#  define SENDER_EXEC_HAS_DLL 1
-#endif /* ! SENDER_EXEC_HAS_DLL */
-
-#if defined (SENDER_EXEC_HAS_DLL) && (SENDER_EXEC_HAS_DLL == 1)
-#  if defined (SENDER_EXEC_BUILD_DLL)
-#    define SENDER_EXEC_Export ACE_Proper_Export_Flag
-#    define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SENDER_EXEC_BUILD_DLL */
-#    define SENDER_EXEC_Export ACE_Proper_Import_Flag
-#    define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SENDER_EXEC_BUILD_DLL */
-#else /* SENDER_EXEC_HAS_DLL == 1 */
-#  define SENDER_EXEC_Export
-#  define SENDER_EXEC_SINGLETON_DECLARATION(T)
-#  define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SENDER_EXEC_HAS_DLL == 1 */
-
-// Set SENDER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SENDER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SENDER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SENDER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SENDER_EXEC_NTRACE */
-
-#if (SENDER_EXEC_NTRACE == 1)
-#  define SENDER_EXEC_TRACE(X)
-#else /* (SENDER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SENDER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SENDER_EXEC_NTRACE == 1) */
-
-#endif /* SENDER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_stub_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_stub_export.h
deleted file mode 100644
index 28c5d3131d0..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SENDER_STUB
-// ------------------------------
-#ifndef SENDER_STUB_EXPORT_H
-#define SENDER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (SENDER_STUB_HAS_DLL)
-#  define SENDER_STUB_HAS_DLL 1
-#endif /* ! SENDER_STUB_HAS_DLL */
-
-#if defined (SENDER_STUB_HAS_DLL) && (SENDER_STUB_HAS_DLL == 1)
-#  if defined (SENDER_STUB_BUILD_DLL)
-#    define SENDER_STUB_Export ACE_Proper_Export_Flag
-#    define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SENDER_STUB_BUILD_DLL */
-#    define SENDER_STUB_Export ACE_Proper_Import_Flag
-#    define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SENDER_STUB_BUILD_DLL */
-#else /* SENDER_STUB_HAS_DLL == 1 */
-#  define SENDER_STUB_Export
-#  define SENDER_STUB_SINGLETON_DECLARATION(T)
-#  define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SENDER_STUB_HAS_DLL == 1 */
-
-// Set SENDER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SENDER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SENDER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SENDER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SENDER_STUB_NTRACE */
-
-#if (SENDER_STUB_NTRACE == 1)
-#  define SENDER_STUB_TRACE(X)
-#else /* (SENDER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SENDER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SENDER_STUB_NTRACE == 1) */
-
-#endif /* SENDER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_svnt_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_svnt_export.h
deleted file mode 100644
index 53236a883f2..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SENDER_SVNT
-// ------------------------------
-#ifndef SENDER_SVNT_EXPORT_H
-#define SENDER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (SENDER_SVNT_HAS_DLL)
-#  define SENDER_SVNT_HAS_DLL 1
-#endif /* ! SENDER_SVNT_HAS_DLL */
-
-#if defined (SENDER_SVNT_HAS_DLL) && (SENDER_SVNT_HAS_DLL == 1)
-#  if defined (SENDER_SVNT_BUILD_DLL)
-#    define SENDER_SVNT_Export ACE_Proper_Export_Flag
-#    define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SENDER_SVNT_BUILD_DLL */
-#    define SENDER_SVNT_Export ACE_Proper_Import_Flag
-#    define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SENDER_SVNT_BUILD_DLL */
-#else /* SENDER_SVNT_HAS_DLL == 1 */
-#  define SENDER_SVNT_Export
-#  define SENDER_SVNT_SINGLETON_DECLARATION(T)
-#  define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SENDER_SVNT_HAS_DLL == 1 */
-
-// Set SENDER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SENDER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SENDER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SENDER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SENDER_SVNT_NTRACE */
-
-#if (SENDER_SVNT_NTRACE == 1)
-#  define SENDER_SVNT_TRACE(X)
-#else /* (SENDER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SENDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SENDER_SVNT_NTRACE == 1) */
-
-#endif /* SENDER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ.idl b/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ.idl
deleted file mode 100644
index f5e63220d93..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include <Components.idl>
-
-module DiffServ
-{
-  interface test
-  {
-    oneway void method ();
-  };
-};
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ.mpc
deleted file mode 100644
index 82f9c9a0408..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -n DiffServ"
-
-project(DiffServ_stub): ciao_client {
-  
-  sharedname = DiffServ_stub
-  idlflags += -Wb,stub_export_macro=DIFFSERV_STUB_Export -Wb,stub_export_include=DiffServ_stub_export.h -Wb,skel_export_macro=DIFFSERV_SVNT_Export -Wb,skel_export_include=DiffServ_svnt_export.h
-  dynamicflags   = DIFFSERV_STUB_BUILD_DLL
-
-  IDL_Files {
-    DiffServ.idl
-  }
-
-  Source_Files {
-    DiffServC.cpp
-  }
-}
-
-project(DiffServ_svnt) : ciao_servant {
-  after +=  DiffServ_stub
-  sharedname  = DiffServ_svnt
-  libs    += DiffServ_stub 
-  
-  idlflags  +=  -Wb,export_macro=DIFFSERV_SVNT_Export -Wb,export_include=DiffServ_svnt_export.h
-  dynamicflags = DIFFSERV_SVNT_BUILD_DLL
-
-  IDL_Files {
-    DiffServ.idl
-  }
-
-  Source_Files {
-    DiffServS.cpp
-  }
-}
-
-
-
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ_stub_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ_stub_export.h
deleted file mode 100644
index 3807939762d..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DIFFSERV_STUB
-// ------------------------------
-#ifndef DIFFSERV_STUB_EXPORT_H
-#define DIFFSERV_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (DIFFSERV_STUB_HAS_DLL)
-#  define DIFFSERV_STUB_HAS_DLL 1
-#endif /* ! DIFFSERV_STUB_HAS_DLL */
-
-#if defined (DIFFSERV_STUB_HAS_DLL) && (DIFFSERV_STUB_HAS_DLL == 1)
-#  if defined (DIFFSERV_STUB_BUILD_DLL)
-#    define DIFFSERV_STUB_Export ACE_Proper_Export_Flag
-#    define DIFFSERV_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DIFFSERV_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DIFFSERV_STUB_BUILD_DLL */
-#    define DIFFSERV_STUB_Export ACE_Proper_Import_Flag
-#    define DIFFSERV_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DIFFSERV_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DIFFSERV_STUB_BUILD_DLL */
-#else /* DIFFSERV_STUB_HAS_DLL == 1 */
-#  define DIFFSERV_STUB_Export
-#  define DIFFSERV_STUB_SINGLETON_DECLARATION(T)
-#  define DIFFSERV_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DIFFSERV_STUB_HAS_DLL == 1 */
-
-// Set DIFFSERV_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DIFFSERV_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DIFFSERV_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DIFFSERV_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DIFFSERV_STUB_NTRACE */
-
-#if (DIFFSERV_STUB_NTRACE == 1)
-#  define DIFFSERV_STUB_TRACE(X)
-#else /* (DIFFSERV_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DIFFSERV_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DIFFSERV_STUB_NTRACE == 1) */
-
-#endif /* DIFFSERV_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ_svnt_export.h b/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ_svnt_export.h
deleted file mode 100644
index 8a2e6bc0c3c..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/common/DiffServ_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DIFFSERV_SVNT
-// ------------------------------
-#ifndef DIFFSERV_SVNT_EXPORT_H
-#define DIFFSERV_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (DIFFSERV_SVNT_HAS_DLL)
-#  define DIFFSERV_SVNT_HAS_DLL 1
-#endif /* ! DIFFSERV_SVNT_HAS_DLL */
-
-#if defined (DIFFSERV_SVNT_HAS_DLL) && (DIFFSERV_SVNT_HAS_DLL == 1)
-#  if defined (DIFFSERV_SVNT_BUILD_DLL)
-#    define DIFFSERV_SVNT_Export ACE_Proper_Export_Flag
-#    define DIFFSERV_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DIFFSERV_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DIFFSERV_SVNT_BUILD_DLL */
-#    define DIFFSERV_SVNT_Export ACE_Proper_Import_Flag
-#    define DIFFSERV_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DIFFSERV_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DIFFSERV_SVNT_BUILD_DLL */
-#else /* DIFFSERV_SVNT_HAS_DLL == 1 */
-#  define DIFFSERV_SVNT_Export
-#  define DIFFSERV_SVNT_SINGLETON_DECLARATION(T)
-#  define DIFFSERV_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DIFFSERV_SVNT_HAS_DLL == 1 */
-
-// Set DIFFSERV_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DIFFSERV_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DIFFSERV_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DIFFSERV_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DIFFSERV_SVNT_NTRACE */
-
-#if (DIFFSERV_SVNT_NTRACE == 1)
-#  define DIFFSERV_SVNT_TRACE(X)
-#else /* (DIFFSERV_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DIFFSERV_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DIFFSERV_SVNT_NTRACE == 1) */
-
-#endif /* DIFFSERV_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini
deleted file mode 100644
index dd3bead273e..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[ComponentInstallation]
-DCE:83d9348a-3248-445c-82c6-e38294943d65=DiffServ_Sender_exec
-DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954=DiffServ_Sender_svnt
-DCE:6b6d29ca-c6e7-4823-806d-157113767331=DiffServ_Receiver_svnt
-DCE:34b61767-2b7d-459d-985d-ece6255275d5=DiffServ_Receiver_exec
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd
deleted file mode 100644
index 757e9f7532b..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- $Id$ -->
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<softpkg name="Receiver" version="1.0">
-
-  <pkgtype>CORBA Component</pkgtype>
-
-  <title>Receiver</title>
-
-  <idl id="IDL:DiffServ/Receiver:1.0"
-    homeid="IDL:DiffServ/ReceiverHome:1.0">
-   <fileinarchive name="Receiver.idl"/>
-  </idl>
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Receiver.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:34b61767-2b7d-459d-985d-ece6255275d5">
-
-   <!-- CIAO extension -->
-   <dependency type="CIAODLL">
-     <softpkgref>
-       <fileinarchive name="Receiver.ssd"/>
-       <implref idref="DCE:6b6d29ca-c6e7-4823-806d-157113767331"/>
-     </softpkgref>
-   </dependency>
-
-   <code type="DLL">
-     <fileinarchive name="DiffServ_Receiver_exec"/>
-     <entrypoint>createReceiverHome_Impl</entrypoint>
-   </code>
-
-  </implementation>
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd
deleted file mode 100644
index a292a0a7a5b..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- $Id$ -->
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<softpkg name="Receiver-Servant" version="1.0">
-
-  <pkgtype>CIAO Servant</pkgtype>
-
-  <title>componentizedSender::Receiver Servants</title>
-
-  <idl id="IDL:DiffServ/Receiver:1.0" 
-       homeid="IDL:DiffServ/ReceiverHome:1.0">
-   <fileinarchive name="Receiver.idl"/>
-  </idl>
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Receiver.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:6b6d29ca-c6e7-4823-806d-157113767331">
-
-   <dependency type="ORB">
-     <name>TAO</name>
-   </dependency>
-
-   <code>
-     <!-- No need to specify extension below since ACE takes care of that, -->
-     <fileinarchive name="DiffServ_Receiver_svnt"/>
-     <entrypoint>createReceiverHome_Servant</entrypoint>
-   </code>
-
-  </implementation>
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd
deleted file mode 100644
index 1814d85830d..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- $Id$ -->
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<softpkg name="Sender" version="1.0">
-
-  <pkgtype>CORBA Component</pkgtype>
-
-  <title>Sender</title>
-
-  <idl id="IDL:DiffServ/Sender:1.0"
-       homeid="IDL:DiffServ/SenderHome:1.0">
-   <fileinarchive name="Sender.idl"/>
-  </idl>
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Sender.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:83d9348a-3248-445c-82c6-e38294943d65">
-
-   <!-- CIAO extension -->
-   <dependency type="CIAODLL">
-     <softpkgref>
-       <fileinarchive name="Sender.ssd"/>
-       <implref idref="DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954"/>
-     </softpkgref>
-   </dependency>
-
-   <code type="DLL">
-     <fileinarchive name="DiffServ_Sender_exec"/>
-     <entrypoint>createSenderHome_Impl</entrypoint>
-   </code>
-
-  </implementation>
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd
deleted file mode 100644
index 196b618e0c6..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- $Id$ -->
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<softpkg name="Sender-Servant" version="1.0">
-
-  <pkgtype>CIAO Servant</pkgtype>
-
-  <title>componentizedSender::Sender Servants</title>
-
-  <idl id="IDL:DiffServ/Sender:1.0"
-       homeid="IDL:DiffServ/SenderHome:1.0">
-   <fileinarchive name="Sender.idl"/>
-  </idl>
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Sender.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954">
-
-   <dependency type="ORB">
-     <name>TAO</name>
-   </dependency>
-
-   <code>
-     <!-- No need to specify extension below since ACE takes care of that, -->
-     <fileinarchive name="DiffServ_Sender_svnt"/>
-     <entrypoint>createSenderHome_Servant</entrypoint>
-   </code>
-
-  </implementation>
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/default.cad b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/default.cad
deleted file mode 100644
index 403af8e586d..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/default.cad
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- $Id$ -->
-<!-- This file must be pre-processed for final location based on $CIAO_ROOT -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-
-<componentassembly id="componentized assembly">
-
-  <componentfiles>
-
-    <componentfile id="com-Sender">
-      <fileinarchive name="Sender.csd"/>
-    </componentfile>
-
-    <componentfile id="com-Receiver">
-      <fileinarchive name="Receiver.csd"/>
-    </componentfile>
-
-  </componentfiles>
-
-  <partitioning>
-
-      <homeplacement id="a_SenderHome">
-        <componentfileref idref="com-Sender"/>
-        <componentinstantiation id="a_Sender">
-         <registercomponent>
-            <writeiortofile name="sender.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_ReceiverHome">
-        <componentfileref idref="com-Receiver"/>
-        <componentinstantiation id="a_Receiver">
-         <registercomponent>
-            <writeiortofile name="receiver.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>reader</usesidentifier>
-        <componentinstantiationref idref="a_Sender"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>writer</providesidentifier>
-        <componentinstantiationref idref="a_Receiver"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/remote.cad b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/remote.cad
deleted file mode 100644
index 9b8543b1e4b..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/remote.cad
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- $Id$ -->
-<!-- This file must be pre-processed for final location based on $CIAO_ROOT -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-
-<componentassembly id="componentized assembly">
-
-  <componentfiles>
-
-    <componentfile id="com-Sender">
-      <fileinarchive name="Sender.csd"/>
-    </componentfile>
-
-    <componentfile id="com-Receiver">
-      <fileinarchive name="Receiver.csd"/>
-    </componentfile>
-
-  </componentfiles>
-
-  <partitioning>
-
-      <homeplacement id="a_SenderHome">
-        <componentfileref idref="com-Sender"/>
-        <componentinstantiation id="a_Sender">
-         <registercomponent>
-            <writeiortofile name="sender.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-    <processcollocation>
-      <homeplacement id="a_ReceiverHome">
-        <componentfileref idref="com-Receiver"/>
-        <componentinstantiation id="a_Receiver">
-         <registercomponent>
-            <writeiortofile name="receiver.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-      <destination>Remote</destination>
-    </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>reader</usesidentifier>
-        <componentinstantiationref idref="a_Sender"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>writer</providesidentifier>
-        <componentinstantiationref idref="a_Receiver"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/run_test.pl b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/run_test.pl
deleted file mode 100755
index 965f51fb069..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/run_test.pl
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- perl -*-
-# $Id$
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-
-$ACE_ROOT = $ENV {'ACE_ROOT'};
-$CIAO_ROOT = $ENV {'CIAO_ROOT'};
-
-$ORBdebuglevel = 0;
-
-$daemon_1 = new PerlACE::Process ("${CIAO_ROOT}/tools/Daemon/CIAO_Daemon",
-                                  "-ORBEndpoint iiop://localhost:20000 " .
-                                  "-n \"${CIAO_ROOT}/tools/RTComponentServer/RTComponentServer -ORBdebuglevel $ORBdebuglevel\"");
-
-$daemon_2 = new PerlACE::Process ("${CIAO_ROOT}/tools/Daemon/CIAO_Daemon",
-                                  "-ORBEndpoint iiop://localhost:12000 " .
-                                  "-n \"${CIAO_ROOT}/tools/RTComponentServer/RTComponentServer -ORBdebuglevel $ORBdebuglevel\"");
-
-$assembly_manager_args = "-o assembly_manager.ior -c test.dat";
-$assembly_manager = new PerlACE::Process ("${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Manager", "$assembly_manager_args");
-
-$assembly_deployer_args = "-k file://assembly_manager.ior -a remote.cad -o assembly";
-$assembly_deployer = new PerlACE::Process ("${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Deployer", "$assembly_deployer_args");
-
-$controller = new PerlACE::Process ("../Controller/Controller", "-n 6 -p 15000");
-
-# Remove all ior files
-unlink "assembly_manager.ior";
-unlink "daemon.ior";
-unlink "receiver.ior";
-unlink "sender.ior";
-unlink "assembly";
-
-# Start the daemons.
-$daemon_1->Spawn ();
-$daemon_2->Spawn ();
-
-# Start the assembly manager
-$assembly_manager->Spawn ();
-
-# Wait till the assembly manager finishes writing the IOR
-PerlACE::waitforfile ("assembly_manager.ior");
-
-# Start the Assembly_Deployer
-$assembly_deployer->Spawn ();
-
-# Wait till the sender and receiver to finish writing their IORs
-PerlACE::waitforfile ("sender.ior");
-PerlACE::waitforfile ("receiver.ior");
-
-# Now start the controller
-$controller->Spawn ();
-
-# Wait for controller to get done.
-$controller->Wait ();
-$controller->{RUNNING} = 0;
-
-# Kill daemons.
-$daemon_1->Kill ();
-$daemon_2->Kill ();
-$assembly_manager->Kill ();
-$assembly_deployer->Kill ();
-
-# Remove all ior files
-unlink "assembly_manager.ior";
-unlink "daemon.ior";
-unlink "receiver.ior";
-unlink "sender.ior";
-unlink "assembly";
-
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/test.dat b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/test.dat
deleted file mode 100644
index 087a2a967e4..00000000000
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/test.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-Default corbaloc:iiop:localhost:20000/ServerActivator
-Remote  corbaloc:iiop:localhost:12000/ServerActivator
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.cidl b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.cidl
deleted file mode 100644
index 60237271100..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.cidl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$  -*- IDL -*-
-
-#include "Controller.idl"
-
-composition session Controller_Impl
-{
-  home executor ControllerHome_exec
-  {
-    implements Priority_Test::ControllerHome;
-    manages Controller_exec;
-  };
-};
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.idl b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.idl
deleted file mode 100644
index 94e705e3c2d..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-/**
- * @file Controller.idl
- *
- * Definition of an Controller component that triggers a worker
- * connecting to it to do some work.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-
-#ifndef CONTROLLER_IDL
-#define CONTROLLER_IDL
-
-#include "../Priority_Test.idl"
-
-module Priority_Test
-{
-  component Controller supports Op_Mode
-    {
-      uses Common_Ops worker;
-    };
-
-  home ControllerHome manages Controller
-  {
-  };
-};
-
-#endif /* CONTROLLER_IDL */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc
deleted file mode 100644
index d097c0dce34..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -l .. -p Priority_Test -i Controller"
-
-project(Priority_Test_Controller_stub): ciao_client {
-  after += Priority_Test_stub
-  sharedname = Controller_stub
-  libs    += Priority_Test_stub
-  libpaths += ..
-  idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export -Wb,stub_export_include=Controller_stub_export.h -Wb,skel_export_macro=CONTROLLER_SVNT_Export -Wb,skel_export_include=Controller_svnt_export.h
-  dynamicflags   = CONTROLLER_STUB_BUILD_DLL
-
-  IDL_Files {
-    Controller.idl
-  }
-
-  Source_Files {
-    ControllerC.cpp
-  }
-}
-
-project(Priority_Test_Controller_svnt) : ciao_servant {
-  after += Priority_Test_svnt Priority_Test_Controller_stub
-  sharedname  = Controller_svnt
-  libs    += Controller_stub Priority_Test_stub Priority_Test_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=CONTROLLER_SVNT_Export -Wb,export_include=Controller_svnt_export.h
-  dynamicflags = CONTROLLER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Controller.cidl
-  }
-
-  IDL_Files {
-    ControllerE.idl
-  }
-
-  Source_Files {
-    ControllerEC.cpp
-    ControllerS.cpp
-    Controller_svnt.cpp
-  }
-}
-
-
-project(Priority_Test_Controller_exec) : ciao_component {
-  after   += Priority_Test_Controller_svnt
-  sharedname = Controller_exec
-  libs      += Controller_stub Controller_svnt Priority_Test_stub Priority_Test_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=CONTROLLER_EXEC_Export -Wb,export_include=Controller_exec_export.h
-  dynamicflags   = CONTROLLER_EXEC_BUILD_DLL
-
-  IDL_Files {
-    ControllerEI.idl
-  }
-
-  Source_Files {
-    ControllerEIC.cpp
-    Controller_exec.cpp
-  }
-}
-
-project(Priority_Test_Rate_Controller_exec) : ciao_component {
-  after   += Priority_Test_Controller_svnt
-  sharedname = Rate_Controller_exec
-  libs      += Controller_stub Controller_svnt Priority_Test_stub Priority_Test_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=CONTROLLER_EXEC_Export -Wb,export_include=Controller_exec_export.h
-  dynamicflags   = CONTROLLER_EXEC_BUILD_DLL
-
-  IDL_Files {
-    ControllerEI.idl
-  }
-
-  Source_Files {
-    ControllerEIC.cpp
-    Rate_Controller.cpp
-    Pulser.cpp
-  }
-}
-
-project (*client) : ciao_client {
-  exename = client
-  after += Priority_Test_Controller_stub
-  libs += Controller_stub Priority_Test_stub
-  libpaths += ..
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    client.cpp
-  }
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/ControllerEI.idl b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/ControllerEI.idl
deleted file mode 100644
index 7cfb0d8ceed..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/ControllerEI.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-/**
- * @file ControllerEI.idl
- *
- * Definition of the Controller component implementation.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-
-#ifndef CONTROLLEREI_IDL
-#define CONTROLLEREI_IDL
-
-#include "ControllerE.idl"
-
-module Priority_Test
-{
-  /**
-   * @interface Controller_Exec
-   *
-   * The actually Controller executor inherits from
-   * CCM_Controller as a monolithic implementation.
-   */
-  local interface Controller_Exec :
-    CCM_Controller,
-    Components::SessionComponent
-  {
-  };
-
-};
-
-#endif /* CONTROLLEREI_IDL */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec.cpp
deleted file mode 100644
index 61134dc563d..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// $Id$
-
-#include "Controller_exec.h"
-#include "CIAO_common.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-#include "ace/Env_Value_T.h"
-#include "ace/OS_NS_stdio.h"
-
-/// Default constructor.
-MyImpl::Controller_exec_i::Controller_exec_i ()
-{
-}
-
-/// Default destructor.
-MyImpl::Controller_exec_i::~Controller_exec_i ()
-{
-}
-
-// Operations from Priority_Test::Controller
-void
-MyImpl::Controller_exec_i::start (CORBA::Long arg
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // This simply performs some measurements and print out the result.
-
-  ACE_DEBUG ((LM_DEBUG, "PERFORM TEST\n"));
-
-  ACE_UNUSED_ARG (arg);
-
-  Priority_Test::Common_Ops_var device =
-    this->context_->get_connection_worker (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  const int niterations = 1000;
-  const CORBA::Long work = arg;
-  ACE_Sample_History history (niterations);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) device->do_work (work, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  const int len = 1024;
-  char title [len];
-
-  ACE_OS::snprintf (title, len, "Total (work=%4d)", work);
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  ACE_Env_Value<int> envar ("CIAO_DUMP_SAMPLE_HISTORY", 0);
-  if (envar != 0)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results (title, gsf);
-
-  ACE_Throughput_Stats::dump_throughput (title, gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-MyImpl::Controller_exec_i::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-// Operations from Components::SessionComponent
-void
-MyImpl::Controller_exec_i::set_session_context (
-    Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Controller_exec_i::set_session_context\n"));
-
-  this->context_ =
-    Priority_Test::CCM_Controller_Context::_narrow (ctx
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
-  // Urm, we actually discard exceptions thown from this operation.
-}
-
-void
-MyImpl::Controller_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::Controller_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::Controller_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Controller_exec_i::ccm_activate\n"));
-}
-
-void
-MyImpl::Controller_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Controller_exec_i::ccm_passivate\n"));
-}
-
-void
-MyImpl::Controller_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Controller_exec_i::ccm_remove\n"));
-}
-
-/// Default ctor.
-MyImpl::Controller_Home_exec_i::Controller_Home_exec_i ()
-{
-}
-
-/// Default dtor.
-MyImpl::Controller_Home_exec_i::~Controller_Home_exec_i ()
-{
-}
-
-// Explicit home operations.
-
-// Implicit home operations.
-
-::Components::EnterpriseComponent_ptr
-MyImpl::Controller_Home_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  return new MyImpl::Controller_exec_i;
-}
-
-
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome_Impl (void)
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "extern \"C\" ::createControllerHome_Impl\n"));
-  return new MyImpl::Controller_Home_exec_i;
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec.h
deleted file mode 100644
index 748087423ae..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-
-/**
- * @file Controller_exec.h
- *
- * Header file for the actual Controller and ControllerHome component
- * implementations.  These classes are the implementations of local
- * interfaces defined in ControllerEI.idl.
- *
- * @author Nanbor Wang <nanbor@cse.wustl.edu>
- */
-
-#ifndef CONTROLLER_EXEC_H
-#define CONTROLLER_EXEC_H
-
-#include "ControllerEIC.h"
-#include "tao/LocalObject.h"
-
-// The namespace name for the actual implementation classes doesn't
-// really matter.  Since there may be several different
-// implementations for a component, they can very well be in different
-// namespaces.
-namespace MyImpl
-{
-  /**
-   * @class Controller_exec_i
-   *
-   * A generic controller implementation.
-   */
-  class CONTROLLER_EXEC_Export Controller_exec_i :
-    public virtual Priority_Test::Controller_Exec,
-    // CIAO container implementation depends on correct reference
-    // counting of local interfaces, so we take a short cut to
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default constructor.
-    Controller_exec_i ();
-
-    /// Default destructor.
-    ~Controller_exec_i ();
-
-    // Operations from Priority_Test::Controller
-
-    virtual void
-    start (CORBA::Long arg
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void
-    stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-  protected:
-    /// Copmponent specific context
-    Priority_Test::CCM_Controller_Context_var context_;
-  };
-
-  /**
-   * @class Controller_exec_i
-   *
-   * CB_Worker home executor implementation class.
-   */
-  class CONTROLLER_EXEC_Export Controller_Home_exec_i :
-    public virtual Priority_Test::CCM_ControllerHome,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default ctor.
-    Controller_Home_exec_i ();
-
-    /// Default dtor.
-    ~Controller_Home_exec_i ();
-
-    // Explicit home operations.
-
-    // Implicit home operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-  };
-
-}
-
-// Executor DLL entry point.  CIAO's deployment and assembly framework
-// invokes this function on the resulting DLL to get the home executor.
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome_Impl (void);
-
-#endif /* CONTROLLER_EXEC_H */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec_export.h
deleted file mode 100644
index 080ecb25a44..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_EXEC
-// ------------------------------
-#ifndef CONTROLLER_EXEC_EXPORT_H
-#define CONTROLLER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_EXEC_HAS_DLL)
-#  define CONTROLLER_EXEC_HAS_DLL 1
-#endif /* ! CONTROLLER_EXEC_HAS_DLL */
-
-#if defined (CONTROLLER_EXEC_HAS_DLL) && (CONTROLLER_EXEC_HAS_DLL == 1)
-#  if defined (CONTROLLER_EXEC_BUILD_DLL)
-#    define CONTROLLER_EXEC_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_EXEC_BUILD_DLL */
-#    define CONTROLLER_EXEC_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_EXEC_BUILD_DLL */
-#else /* CONTROLLER_EXEC_HAS_DLL == 1 */
-#  define CONTROLLER_EXEC_Export
-#  define CONTROLLER_EXEC_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_EXEC_HAS_DLL == 1 */
-
-// Set CONTROLLER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_EXEC_NTRACE */
-
-#if (CONTROLLER_EXEC_NTRACE == 1)
-#  define CONTROLLER_EXEC_TRACE(X)
-#else /* (CONTROLLER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_EXEC_NTRACE == 1) */
-
-#endif /* CONTROLLER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_stub_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_stub_export.h
deleted file mode 100644
index 65a430401a8..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_STUB
-// ------------------------------
-#ifndef CONTROLLER_STUB_EXPORT_H
-#define CONTROLLER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_STUB_HAS_DLL)
-#  define CONTROLLER_STUB_HAS_DLL 1
-#endif /* ! CONTROLLER_STUB_HAS_DLL */
-
-#if defined (CONTROLLER_STUB_HAS_DLL) && (CONTROLLER_STUB_HAS_DLL == 1)
-#  if defined (CONTROLLER_STUB_BUILD_DLL)
-#    define CONTROLLER_STUB_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_STUB_BUILD_DLL */
-#    define CONTROLLER_STUB_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_STUB_BUILD_DLL */
-#else /* CONTROLLER_STUB_HAS_DLL == 1 */
-#  define CONTROLLER_STUB_Export
-#  define CONTROLLER_STUB_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_STUB_HAS_DLL == 1 */
-
-// Set CONTROLLER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_STUB_NTRACE */
-
-#if (CONTROLLER_STUB_NTRACE == 1)
-#  define CONTROLLER_STUB_TRACE(X)
-#else /* (CONTROLLER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_STUB_NTRACE == 1) */
-
-#endif /* CONTROLLER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_svnt_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_svnt_export.h
deleted file mode 100644
index d5e7c6aa42d..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_SVNT
-// ------------------------------
-#ifndef CONTROLLER_SVNT_EXPORT_H
-#define CONTROLLER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_SVNT_HAS_DLL)
-#  define CONTROLLER_SVNT_HAS_DLL 1
-#endif /* ! CONTROLLER_SVNT_HAS_DLL */
-
-#if defined (CONTROLLER_SVNT_HAS_DLL) && (CONTROLLER_SVNT_HAS_DLL == 1)
-#  if defined (CONTROLLER_SVNT_BUILD_DLL)
-#    define CONTROLLER_SVNT_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_SVNT_BUILD_DLL */
-#    define CONTROLLER_SVNT_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_SVNT_BUILD_DLL */
-#else /* CONTROLLER_SVNT_HAS_DLL == 1 */
-#  define CONTROLLER_SVNT_Export
-#  define CONTROLLER_SVNT_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_SVNT_HAS_DLL == 1 */
-
-// Set CONTROLLER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_SVNT_NTRACE */
-
-#if (CONTROLLER_SVNT_NTRACE == 1)
-#  define CONTROLLER_SVNT_TRACE(X)
-#else /* (CONTROLLER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_SVNT_NTRACE == 1) */
-
-#endif /* CONTROLLER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
deleted file mode 100644
index 52dcd92ead3..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-
-#include "Pulser.h"
-#include "CIAO_common.h"
-#include "ace/Timer_Queue.h"
-#include "ace/Reactor.h"
-
-//=================================================================
-
-PTImpl::Pulse_Handler::~Pulse_Handler (void)
-{
-}
-
-// ------
-
-PTImpl::Pulser::Pulser (PTImpl::Pulse_Handler *cb)
-  : active_ (0),
-    done_ (0),
-    tid_ (0),
-    pulser_callback_ (cb)
-{
-  // Nothing
-  this->reactor (new ACE_Reactor);
-}
-
-PTImpl::Pulser::~Pulser ()
-{
-  delete this->reactor ();
-  this->reactor (0);
-}
-
-int
-PTImpl::Pulser::open (void*)
-{
-  return this->activate ();
-}
-
-int
-PTImpl::Pulser::close (u_long)
-{
-  this->done_ = 1;
-  this->reactor ()->notify ();
-
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "Waiting\n"));
-  return this->wait ();
-}
-
-int
-PTImpl::Pulser::start (CORBA::Long hertz)
-{
-  if (hertz == 0 || this->active_ != 0)        // Not valid
-    return -1;
-
-  this->active_ = 1;
-  long usec = 1000000 / hertz;
-
-  this->tid_ = this->reactor ()->schedule_timer (this,
-                                                 0,
-                                                 ACE_Time_Value (0, usec),
-                                                 ACE_Time_Value (0, usec));
-
-  return 0;
-}
-
-int
-PTImpl::Pulser::stop (void)
-{
-  if (this->active_ == 0)       // Not valid.
-    return -1;
-  else
-    this->active_ = 0;
-  return 0;
-}
-
-int
-PTImpl::Pulser::active (void)
-{
-  return this->active_;
-}
-
-int
-PTImpl::Pulser::handle_close (ACE_HANDLE handle,
-                                     ACE_Reactor_Mask close_mask)
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("[%x] handle = %d, close_mask = %d\n"),
-                this,
-                handle,
-                close_mask));
-
-  return 0;
-}
-
-int
-PTImpl::Pulser::handle_timeout (const ACE_Time_Value &,
-                                       const void *)
-{
-  if (this->active_ == 0)
-    this->reactor ()->cancel_timer (this);
-  else
-    this->pulser_callback_->pulse ();
-
-  return 0;
-}
-
-int
-PTImpl::Pulser::svc (void)
-{
-  this->reactor ()->owner (ACE_OS::thr_self ());
-
-  while (!this->done_)
-    this->reactor ()->handle_events ();
-
-  return 0;
-}
-
-//=================================================================
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
deleted file mode 100644
index da6cb9698fd..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-/**
- * @file Pulser.h
- *
- * Header file for the Pulser class.
- *
- * @author Nanbor Wang <nanbor@cse.wustl.edu>
- */
-
-#ifndef PULSER_H
-#define PULSER_H
-
-#include "tao/corba.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-namespace PTImpl
-{
-  // Forward decl.
-  class Pulse_Handler
-  {
-  public:
-
-    /// Destructor.
-    virtual ~Pulse_Handler (void);
-
-    /// Helper function to be called back by Pulse_Handler
-    virtual void pulse (void) = 0;
-  };
-
-  /**
-   * @brief Active pulse generater
-   */
-  class Pulser : public ACE_Task_Base
-  {
-  public:
-    // Default constructor
-    Pulser (Pulse_Handler *cb);
-    ~Pulser ();
-
-    int open (void *args = 0);
-
-    int close (u_long flags = 0);
-
-    int start (CORBA::Long hertz);
-
-    int stop (void);
-
-    int active (void);
-
-    // Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-    // Called when <Time_Handler> is removed.
-    virtual int handle_close (ACE_HANDLE handle,
-                              ACE_Reactor_Mask close_mask);
-
-    virtual int svc (void);
-
-  private:
-    /// Tracking whether we are actively generating pulse or not.
-    long active_;
-
-    /// Flag to indicate completion of this active object.
-    int done_;
-
-    /// The timer id we are waiting.
-    int tid_;
-
-    Pulse_Handler *pulser_callback_;
-
-    ACE_Thread_Manager thr_mgr_;
-  };
-
-}
-
-#endif /* PULSER_H */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Rate_Controller.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Rate_Controller.cpp
deleted file mode 100644
index 840c47e1ec2..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Rate_Controller.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-// $Id$
-
-#include "Rate_Controller.h"
-#include "CIAO_common.h"
-
-/// Allocate sample history to take up to 5 minutes of samples.
-const int MyImpl::Rate_Controller_i::sample_time_ = 5;
-
-/// Default constructor.
-MyImpl::Rate_Controller_i::Rate_Controller_i (CORBA::Long hertz)
-  : rate_ (hertz),
-    pulser_ (this),
-    sampler_ (0)
-{
-}
-
-/// Default destructor.
-MyImpl::Rate_Controller_i::~Rate_Controller_i ()
-{
-  delete this->sampler_;
-}
-
-// Operations from Priority_Test::Controller
-void
-MyImpl::Rate_Controller_i::start (CORBA::Long arg
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // This simply performs some measurements and print out the result.
-  ACE_DEBUG ((LM_DEBUG, "PERFORM TEST (%dhz)\n", this->rate_));
-
-  if (this->pulser_.active())
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  this->work_ = arg;
-  this->start_time_ = ACE_OS::gethrtime ();
-  delete this->sampler_;
-#if defined (COLLECT_AND_DUMP_SAMPLE_HISTORY)
-  size_t niterations = this->rate_ * 60 * MyImpl::Rate_Controller_i::sample_time_;
-  this->sampler_ = new SAMPLER (niterations);
-#else
-  this->sampler_ = new SAMPLER;
-#endif /* COLLECT_AND_DUMP_SAMPLE_HISTORY */
-
-  // @@ Start the rate generator
-  this->pulser_.start (this->rate_);
-}
-
-void
-MyImpl::Rate_Controller_i::stop (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (! this->pulser_.active ())
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  // @@ stop the rate generator
-  this->pulser_.stop ();
-  ACE_hrtime_t stop_test = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished (%dhz)\n", this->rate_));
-
-  const int len = 1024;
-  char title [len];
-
-  ACE_OS::snprintf (title, len, "Total (work=%4d @ %2dhz)",
-                    this->work_,
-                    this->rate_);
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-
-  size_t count = 0;
-
-#if defined (COLLECT_AND_DUMP_SAMPLE_HISTORY)
-  this->sampler_->dump_samples (title, gsf);
-
-  ACE_Basic_Stats stats;
-  this->sampler_->collect_basic_stats (stats);
-  stats.dump_results (title, gsf);
-  count = stats.samples_count ();
-#else
-  this->sampler_->dump_results (title, gsf);
-  count = this->sampler_->samples_count ();
-#endif /* COLLECT_BASIC_STATS */
-
-  ACE_Throughput_Stats::dump_throughput (title, gsf,
-                                         stop_test - this->start_time_,
-                                         count);
-}
-
-// Operations from Components::SessionComponent
-void
-MyImpl::Rate_Controller_i::set_session_context (Components::SessionContext_ptr ctx
-                                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Rate_Controller_i::set_session_context (%dhz)\n",
-                this->rate_));
-
-  this->context_ =
-    Priority_Test::CCM_Controller_Context::_narrow (ctx
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
-  // Urm, we actually discard exceptions thown from this operation.
-}
-
-void
-MyImpl::Rate_Controller_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::Rate_Controller_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::Rate_Controller_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Rate_Controller_i::ccm_activate (%dhz)\n",
-                this->rate_));
-
-  this->pulser_.open ();
-}
-
-void
-MyImpl::Rate_Controller_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Rate_Controller_i::ccm_passivate(%dhz)\n",
-                this->rate_));
-
-  this->pulser_.close ();
-}
-
-void
-MyImpl::Rate_Controller_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::Rate_Controller_i::ccm_remove (%dhz)\n",
-                this->rate_));
-}
-
-void
-MyImpl::Rate_Controller_i::pulse (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (CIAO::debug_level () > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Pulse (%dhz)!\n",
-                    this->rate_));
-
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      Priority_Test::Common_Ops_var device =
-        this->context_->get_connection_worker (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-      (void) device->do_work (this->work_, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->sampler_->sample (now - start);
-    }
-  ACE_CATCHANY
-    {
-      // >= 0 meaning always print out the exception.
-      if (CIAO::debug_level () >= 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "Rate_Controller pulse exception\n");
-    }
-  ACE_ENDTRY;
-}
-
-/// Default ctor.
-MyImpl::Rate_Controller_Home_i::Rate_Controller_Home_i (CORBA::Long hertz)
-  : hertz_ (hertz)
-{
-}
-
-/// Default dtor.
-MyImpl::Rate_Controller_Home_i::~Rate_Controller_Home_i ()
-{
-}
-
-// Explicit home operations.
-
-// Implicit home operations.
-
-::Components::EnterpriseComponent_ptr
-MyImpl::Rate_Controller_Home_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  return new MyImpl::Rate_Controller_i (this->hertz_);
-}
-
-
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome25_Impl (void)
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "extern \"C\" ::createControllerHome_Impl (25hz)\n"));
-  return new MyImpl::Rate_Controller_Home_i (25);
-}
-
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome50_Impl (void)
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "extern \"C\" ::createControllerHome_Impl (50hz)\n"));
-  return new MyImpl::Rate_Controller_Home_i (50);
-}
-
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome75_Impl (void)
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "extern \"C\" ::createControllerHome_Impl (75hz)\n"));
-  return new MyImpl::Rate_Controller_Home_i (75);
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Rate_Controller.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Rate_Controller.h
deleted file mode 100644
index ee4a033053d..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Rate_Controller.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// $Id$
-
-/**
- * @file Rate_Controller.h
- *
- * Header file for the Rate Controller and Rate ControllerHome
- * component implementations.  These controller trigger a remote
- * worker at some rate to do some amount of work.
- *
- * We should make "hertz" a configurable parameter using a property
- * file, but, unfortunately, CIAO doesn't support this feature when
- * this executor at this time.  Therefore, we use different entry
- * points for the DLL to control the rate of the Rate_Controller.
- *
- * define macro: COLLECT_AND_DUMP_SAMPLE_HISTORY to collect and dump
- * sample history.
- *
- * @author Nanbor Wang <nanbor@cse.wustl.edu>
- */
-
-#ifndef RATE_CONTROLLER_H
-#define RATE_CONTROLLER_H
-
-#include "ControllerEIC.h"
-#include "tao/LocalObject.h"
-#include "Pulser.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-// The namespace name for the actual implementation classes doesn't
-// really matter.  Since there may be several different
-// implementations for a component, they can very well be in different
-// namespaces.
-namespace MyImpl
-{
-  /**
-   * @class Rate_Controller_i
-   *
-   * A generic controller implementation.
-   */
-  class CONTROLLER_EXEC_Export Rate_Controller_i :
-    public virtual PTImpl::Pulse_Handler,
-    public virtual Priority_Test::Controller_Exec,
-    // CIAO container implementation depends on correct reference
-    // counting of local interfaces, so we take a short cut to
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default constructor.
-    Rate_Controller_i (CORBA::Long hertz);
-
-    /// Default destructor.
-    ~Rate_Controller_i ();
-
-    // Operations from Priority_Test::Controller
-
-    virtual void
-    start (CORBA::Long arg
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void
-    stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    /// Callback
-    virtual void
-    pulse (void);
-
-  protected:
-    const CORBA::Long rate_;
-
-    CORBA::Long work_;
-
-    /// Copmponent specific context
-    Priority_Test::CCM_Controller_Context_var context_;
-
-    /// Pulser generate periodical events
-    PTImpl::Pulser pulser_;
-
-    // ------ Statistic related variables --------
-
-    /// Amount of memory to allocate for performance samples.
-    static const int sample_time_;     // in minute
-
-    /// Mark the time when the "start method" is called.
-    ACE_hrtime_t start_time_;
-
-#if defined (COLLECT_AND_DUMP_SAMPLE_HISTORY)
-    typedef ACE_Sample_History SAMPLER;
-#else
-    typedef ACE_Basic_Stats SAMPLER;
-#endif /* COLLECT_AND_DUMP_SAMPLE_HISTORY */
-    SAMPLER *sampler_;
-  };
-
-  /**
-   * @class Controller_exec_i
-   *
-   * CB_Worker home executor implementation class.
-   */
-  class CONTROLLER_EXEC_Export Rate_Controller_Home_i :
-    public virtual Priority_Test::CCM_ControllerHome,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default ctor.
-    Rate_Controller_Home_i (CORBA::Long hertz);
-
-    /// Default dtor.
-    ~Rate_Controller_Home_i ();
-
-    // Explicit home operations.
-
-    // Implicit home operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-  private:
-    CORBA::Long hertz_;
-  };
-
-}
-
-// Executor DLL entry point.  CIAO's deployment and assembly framework
-// invokes this function on the resulting DLL to get the home executor.
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome25_Impl (void);
-
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome50_Impl (void);
-
-extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createControllerHome75_Impl (void);
-
-#endif /* RATE_CONTROLLER_H */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp
deleted file mode 100644
index 7ee91f86db9..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-/**
- * @file client.cpp
- *
- * This program interact with a Controller component
- */
-
-#include "ControllerC.h"
-#include "ace/Get_Opt.h"
-#include "ace/streams.h"
-#include "ace/SString.h"
-
-
-int ctrl_off = 0;
-long work = 80;
-typedef ACE_Unbounded_Stack<ACE_CString> STRING_STACK;
-typedef ACE_Unbounded_Stack<Priority_Test::Controller_var> CTRL_STACK;
-
-int
-parse_args (int argc, char *argv[], STRING_STACK &iors)
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:fw:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-
-      case 'k':
-        iors.push (get_opts.opt_arg ());
-        break;
-
-      case 'f':                 // Turn off controller
-        ctrl_off = 1;
-        break;
-
-      case 'w':
-        work = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s\n"
-                           "-k <Controller IOR>\n"
-                           "-w <work amount>\n"
-                           "-f: Turn off Controller\n"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  if (iors.is_empty () && ctrl_off == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Please provide controller IOR\n"),
-                      -1);
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""  ACE_ENV_ARG_PARAMETER);
-
-      STRING_STACK IORs;
-
-      if (parse_args (argc, argv, IORs) != 0)
-        return -1;
-
-
-      CTRL_STACK controllers;
-
-      while (!IORs.is_empty ())
-        {
-          ACE_CString ior;
-          IORs.top (ior);
-          CORBA::Object_var obj
-            = orb->string_to_object (ior.c_str ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          Priority_Test::Controller_var ctrlr
-            = Priority_Test::Controller::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (ctrlr.in ()))
-            {
-              ACE_DEBUG ((LM_ERROR,
-                          "Unable to acquire 'Controller' objref\n",
-                          ior.c_str ()));
-            }
-          else
-            {
-              controllers.push (ctrlr);
-            }
-          IORs.pop (ior);
-
-        }
-
-      while (! controllers.is_empty ())
-        {
-          Priority_Test::Controller_var ctrlr;
-          controllers.top (ctrlr);
-
-          if (ctrl_off != 0)
-            ctrlr->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          else
-            ctrlr->start (work
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          controllers.pop (ctrlr);
-        }
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Who is the culprit \n");
-      cerr << "Uncaught CORBA exception" << endl;
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test.idl b/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test.idl
deleted file mode 100644
index f0268ad3a42..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-
-/**
- * @file Priority_Test.idl
- *
- * Definition of events, and common interfaces used in Priority_Test module.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-
-#ifndef CIAO_PRIORITY_TEST_IDL
-#define CIAO_PRIORITY_TEST_IDL
-
-#include <Components.idl>
-
-module Priority_Test
-{
-  /**
-   * @brief interface Op_Mode defines the "operation mode" interface.
-   */
-  interface Op_Mode
-  {
-    /// Start with arg.
-    void start (in long arg);
-
-    void stop ();
-  };
-
-  /**
-   * @brief interface Common_Ops defines some "common" operations.  It
-   * is intended to be used as the interface type of a facet or a
-   * receptacle.  All operations in the interface are rather generic
-   * and the actualy component implmenetion should decide what they
-   * actually do.
-   *
-   * @param work the amount of work to be done
-   * @param aux auxiliary parameter
-   */
-  interface Common_Ops
-  {
-    long do_work (in long work,
-                  in long aux);
-  };
-};
-
-#endif /* CIAO_PRIORITY_TEST_IDL */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test.mpc b/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test.mpc
deleted file mode 100644
index 888d0005c99..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test.mpc
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -n Priority_Test"
-
-project(Priority_Test_stub): ciao_client {
-
-  sharedname = Priority_Test_stub
-  idlflags += -Wb,stub_export_macro=PRIORITY_TEST_STUB_Export -Wb,stub_export_include=Priority_Test_stub_export.h -Wb,skel_export_macro=PRIORITY_TEST_SVNT_Export -Wb,skel_export_include=Priority_Test_svnt_export.h
-  dynamicflags   = PRIORITY_TEST_STUB_BUILD_DLL
-
-  IDL_Files {
-    Priority_Test.idl
-  }
-
-  Source_Files {
-    Priority_TestC.cpp
-  }
-}
-
-project(Priority_Test_svnt) : ciao_servant {
-  after +=  Priority_Test_stub
-  sharedname  = Priority_Test_svnt
-  libs    += Priority_Test_stub
-
-  idlflags  +=  -Wb,export_macro=PRIORITY_TEST_SVNT_Export -Wb,export_include=Priority_Test_svnt_export.h
-  dynamicflags = PRIORITY_TEST_SVNT_BUILD_DLL
-
-  Source_Files {
-    Priority_TestS.cpp
-  }
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test_stub_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test_stub_export.h
deleted file mode 100644
index 7c94cc23525..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PRIORITY_TEST_STUB
-// ------------------------------
-#ifndef PRIORITY_TEST_STUB_EXPORT_H
-#define PRIORITY_TEST_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PRIORITY_TEST_STUB_HAS_DLL)
-#  define PRIORITY_TEST_STUB_HAS_DLL 1
-#endif /* ! PRIORITY_TEST_STUB_HAS_DLL */
-
-#if defined (PRIORITY_TEST_STUB_HAS_DLL) && (PRIORITY_TEST_STUB_HAS_DLL == 1)
-#  if defined (PRIORITY_TEST_STUB_BUILD_DLL)
-#    define PRIORITY_TEST_STUB_Export ACE_Proper_Export_Flag
-#    define PRIORITY_TEST_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PRIORITY_TEST_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PRIORITY_TEST_STUB_BUILD_DLL */
-#    define PRIORITY_TEST_STUB_Export ACE_Proper_Import_Flag
-#    define PRIORITY_TEST_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PRIORITY_TEST_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PRIORITY_TEST_STUB_BUILD_DLL */
-#else /* PRIORITY_TEST_STUB_HAS_DLL == 1 */
-#  define PRIORITY_TEST_STUB_Export
-#  define PRIORITY_TEST_STUB_SINGLETON_DECLARATION(T)
-#  define PRIORITY_TEST_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PRIORITY_TEST_STUB_HAS_DLL == 1 */
-
-// Set PRIORITY_TEST_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PRIORITY_TEST_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PRIORITY_TEST_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PRIORITY_TEST_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PRIORITY_TEST_STUB_NTRACE */
-
-#if (PRIORITY_TEST_STUB_NTRACE == 1)
-#  define PRIORITY_TEST_STUB_TRACE(X)
-#else /* (PRIORITY_TEST_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PRIORITY_TEST_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PRIORITY_TEST_STUB_NTRACE == 1) */
-
-#endif /* PRIORITY_TEST_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test_svnt_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test_svnt_export.h
deleted file mode 100644
index ea8969a9a6d..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Priority_Test_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PRIORITY_TEST_SVNT
-// ------------------------------
-#ifndef PRIORITY_TEST_SVNT_EXPORT_H
-#define PRIORITY_TEST_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PRIORITY_TEST_SVNT_HAS_DLL)
-#  define PRIORITY_TEST_SVNT_HAS_DLL 1
-#endif /* ! PRIORITY_TEST_SVNT_HAS_DLL */
-
-#if defined (PRIORITY_TEST_SVNT_HAS_DLL) && (PRIORITY_TEST_SVNT_HAS_DLL == 1)
-#  if defined (PRIORITY_TEST_SVNT_BUILD_DLL)
-#    define PRIORITY_TEST_SVNT_Export ACE_Proper_Export_Flag
-#    define PRIORITY_TEST_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PRIORITY_TEST_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PRIORITY_TEST_SVNT_BUILD_DLL */
-#    define PRIORITY_TEST_SVNT_Export ACE_Proper_Import_Flag
-#    define PRIORITY_TEST_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PRIORITY_TEST_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PRIORITY_TEST_SVNT_BUILD_DLL */
-#else /* PRIORITY_TEST_SVNT_HAS_DLL == 1 */
-#  define PRIORITY_TEST_SVNT_Export
-#  define PRIORITY_TEST_SVNT_SINGLETON_DECLARATION(T)
-#  define PRIORITY_TEST_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PRIORITY_TEST_SVNT_HAS_DLL == 1 */
-
-// Set PRIORITY_TEST_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PRIORITY_TEST_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PRIORITY_TEST_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PRIORITY_TEST_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PRIORITY_TEST_SVNT_NTRACE */
-
-#if (PRIORITY_TEST_SVNT_NTRACE == 1)
-#  define PRIORITY_TEST_SVNT_TRACE(X)
-#else /* (PRIORITY_TEST_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PRIORITY_TEST_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PRIORITY_TEST_SVNT_NTRACE == 1) */
-
-#endif /* PRIORITY_TEST_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/README b/TAO/CIAO/tests/RTCCM/Priority_Test/README
deleted file mode 100644
index 1da8a82ff3e..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/README
+++ /dev/null
@@ -1,52 +0,0 @@
-
-This directory containing the component implementations that we use to
-demonstrate how real-time behaviors can be composed into an
-application using CIAO's real-time extension.  Under the "descriptors"
-subdirectory, you can find several example applications that consist
-of different number of components, with different real-time behaviors
-specifications.  Component implementations used in these examples
-are organized  by component types under subdirectories as:
-
-* Controller:
-
-  Subdirectory Controller contains definition for component type
-  Controller.  A controller trigger the connecting worker receptacle
-  interface to perform some amount of work.  Each controller component
-  implementation implements a different strategy of invoking the
-  "worker" receptacle.  For example,
-
-  * The Controller_exec.* files contain the implementation of a
-  controller component that requests the "worker" to perform certain
-  amount of work (specified via the "start" method) continuously for
-  1000 times and print out the performance statistics (throughput,
-  latency, etc.)  of making these 1000 requests.
-
-  * The Rate_Controller.* files contain the implementation of a
-  rate-based controller.  When the "start" method of its supported
-  interface is invoked, the component start requsting the connecting
-  "worker" to perform specified amount of work at certain
-  predetermined rate (the rate is predetermined and is generated using
-  the timer in ACE_Ractor.)  When the "stop" method of its supported
-  interface is called, the component stop the fix-rate requests and
-  print out the performance of the requests made between start and
-  stop methods are called.  This will show the actual rate the
-  controller are able to sustain.  The Rate_Controller.* files define
-  the homes for 3 Rate_Controllers that try to request the worker to
-  perform work at 25, 50, and 75 hertz.
-
-* Worker: A worker component performs some amount of "work".  Two
-  Worker component implementations are provided.  Only CB_Worker is
-  used in the tests.
-
-  * CB_Worker.* files contain a compute-bound worker implementation.
-  Upon request, it tries to find a large prime number a certain number
-  of times (i.e., the amount of work.)
-
-  * IOB_Wroker.* files contain an I/O-bound worker implementation that
-  simply print out the requested amount of work upon request.
-
-
-Several application assemblies are used to demonstrate how the
-real-time extension in CIAO enforces the composed real-time behaviors.
-The following document "NOTE.txt" under the "descriptors" subdirectory
-explains how to run these examples.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp
deleted file mode 100644
index c6f64623405..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-#include "CB_Worker_exec.h"
-#include "CIAO_common.h"
-
-#include "ace/ACE.h"
-
-
-// This should really be a configurable value.  CIAO doesn't suppor
-// this yet but the new D&C shall support this RSN.
-static long local_primer_ = 9619;
-
-/// Default constructor.
-MyImpl::CB_Worker_exec::CB_Worker_exec ()
-{
-}
-
-/// Default destructor.
-MyImpl::CB_Worker_exec::~CB_Worker_exec ()
-{
-}
-
-// Operations from Priority_Test::Worker
-
-Priority_Test::CCM_Common_Ops_ptr
-MyImpl::CB_Worker_exec::get_some_device (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return Priority_Test::CCM_Common_Ops::_duplicate (this);
-}
-
-// Operations from Priority_Test::Common_Ops
-
-CORBA::Long
-MyImpl::CB_Worker_exec::do_work (CORBA::Long work,
-                                 CORBA::Long aux
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // aux is not use for now, so do something with it.
-  CORBA::ULong retv = work + aux;
-
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "CB_Worker::do_work: %hd units of work\n",
-                work));
-
-  for (; work != 0; --work)
-    ACE::is_prime (local_primer_,
-                   2,
-                   local_primer_ / 2);
-
-  return retv;
-}
-
-// Operations from Components::SessionComponent
-void
-MyImpl::CB_Worker_exec::set_session_context (Components::SessionContext_ptr ctx
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::CB_Worker_exec::set_session_context\n"));
-
-  this->context_ =
-    Priority_Test::CCM_Worker_Context::_narrow (ctx
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
-  // Urm, we actually discard exceptions thown from this operation.
-}
-
-void
-MyImpl::CB_Worker_exec::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::CB_Worker_exec::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::CB_Worker_exec::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::CB_Worker_exec::ccm_activate\n"));
-}
-
-void
-MyImpl::CB_Worker_exec::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::CB_Worker_exec::ccm_passivate\n"));
-}
-
-void
-MyImpl::CB_Worker_exec::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::CB_Worker_exec::ccm_remove\n"));
-}
-
-/// Default ctor.
-MyImpl::CB_Worker_Home_exec::CB_Worker_Home_exec ()
-{
-}
-
-/// Default dtor.
-MyImpl::CB_Worker_Home_exec::~CB_Worker_Home_exec ()
-{
-}
-
-// Explicit home operations.
-
-// Implicit home operations.
-
-::Components::EnterpriseComponent_ptr
-MyImpl::CB_Worker_Home_exec::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  return new MyImpl::CB_Worker_exec;
-}
-
-
-extern "C" WORKER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createWorkerHome_Impl (void)
-{
-  return new MyImpl::CB_Worker_Home_exec;
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.h
deleted file mode 100644
index 9f974478c49..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// $Id$
-
-/**
- * @file CB_Worker_exec.h
- *
- * Header file for the actual CB_Worker and CB_WorkerHome component
- * implementations.  These classes are the implementations of local
- * interfaces defined in WorkerEI.idl.
- *
- * @author Nanbor Wang <nanbor@cse.wustl.edu>
- */
-
-#ifndef CB_WORKER_EXEC_H
-#define CB_WORKER_EXEC_H
-
-#include "WorkerEIC.h"
-#include "tao/LocalObject.h"
-
-// The namespace name for the actual implementation classes doesn't
-// really matter.  Since there may be several different
-// implementations for a component, they can very well be in different
-// namespaces.
-namespace MyImpl
-{
-  /**
-   * @class CB_Worker_exec
-   *
-   * A compute-bound worker executor implementation class.
-   */
-  class WORKER_EXEC_Export CB_Worker_exec :
-    public virtual Priority_Test::Worker_Exec,
-    // CIAO container implementation depends on correct reference
-    // counting of local interfaces, so we take a short cut to
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default constructor.
-    CB_Worker_exec ();
-
-    /// Default destructor.
-    ~CB_Worker_exec ();
-
-    // Operations from Priority_Test::Worker
-
-    virtual Priority_Test::CCM_Common_Ops_ptr
-    get_some_device (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // Operations from Priority_Test::Common_Ops
-
-    virtual CORBA::Long
-    do_work (CORBA::Long work,
-             CORBA::Long aux
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-  protected:
-    /// Copmponent specific context
-    Priority_Test::CCM_Worker_Context_var context_;
-  };
-
-  /**
-   * @class CB_Worker_exec
-   *
-   * CB_Worker home executor implementation class.
-   */
-  class WORKER_EXEC_Export CB_Worker_Home_exec :
-    public virtual Priority_Test::CCM_WorkerHome,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default ctor.
-    CB_Worker_Home_exec ();
-
-    /// Default dtor.
-    ~CB_Worker_Home_exec ();
-
-    // Explicit home operations.
-
-    // Implicit home operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-  };
-
-}
-
-// Executor DLL entry point.  CIAO's deployment and assembly framework
-// invokes this function on the resulting DLL to get the home executor.
-extern "C" WORKER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createWorkerHome_Impl (void);
-
-#endif /* CB_WORKER_EXEC_H */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp
deleted file mode 100644
index e289052ec35..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// $Id$
-
-#include "IOB_Worker_exec.h"
-#include "CIAO_common.h"
-
-/// Default constructor.
-MyImpl::IOB_Worker_exec::IOB_Worker_exec ()
-{
-}
-
-/// Default destructor.
-MyImpl::IOB_Worker_exec::~IOB_Worker_exec ()
-{
-}
-
-// Operations from Priority_Test::Worker
-
-Priority_Test::CCM_Common_Ops_ptr
-MyImpl::IOB_Worker_exec::get_some_device (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return Priority_Test::CCM_Common_Ops::_duplicate (this);
-}
-
-// Operations from Priority_Test::Common_Ops
-
-CORBA::Long
-MyImpl::IOB_Worker_exec::do_work (CORBA::Long work,
-                                  CORBA::Long aux
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong retv = work - aux;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "MyImpl::IOB_Worker_exec::do_work (%d, %d) = %d\n",
-              work, aux, retv));
-  return retv;
-}
-
-// Operations from Components::SessionComponent
-void
-MyImpl::IOB_Worker_exec::set_session_context (
-    Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::IOB_Worker_exec::set_session_context\n"));
-
-  this->context_ =
-    Priority_Test::CCM_Worker_Context::_narrow (ctx
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
-  // Urm, we actually discard exceptions thown from this operation.
-}
-
-void
-MyImpl::IOB_Worker_exec::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::IOB_Worker_exec::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-}
-
-void
-MyImpl::IOB_Worker_exec::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::IOB_Worker_exec::ccm_activate\n"));
-}
-
-void
-MyImpl::IOB_Worker_exec::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::IOB_Worker_exec::ccm_passivate\n"));
-}
-
-void
-MyImpl::IOB_Worker_exec::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  if (CIAO::debug_level () > 0)
-    ACE_DEBUG ((LM_DEBUG, "MyImpl::IOB_Worker_exec::ccm_remove\n"));
-}
-
-/// Default ctor.
-MyImpl::IOB_Worker_Home_exec::IOB_Worker_Home_exec ()
-{
-}
-
-/// Default dtor.
-MyImpl::IOB_Worker_Home_exec::~IOB_Worker_Home_exec ()
-{
-}
-
-// Explicit home operations.
-
-// Implicit home operations.
-
-::Components::EnterpriseComponent_ptr
-MyImpl::IOB_Worker_Home_exec::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
-{
-  return new MyImpl::IOB_Worker_exec;
-}
-
-
-extern "C" WORKER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createWorkerHome_Impl (void)
-{
-  return new MyImpl::IOB_Worker_Home_exec;
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.h
deleted file mode 100644
index b9ffec311fe..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// $Id$
-
-/**
- * @file IOB_Worker_exec.h
- *
- * Header file for the actual IOB_Worker and IOB_WorkerHome component
- * implementations.  These classes are the implementations of local
- * interfaces defined in WorkerEI.idl.
- *
- * @author Nanbor Wang <nanbor@cse.wustl.edu>
- */
-
-#ifndef IOB_WORKER_EXEC_H
-#define IOB_WORKER_EXEC_H
-
-#include "WorkerEIC.h"
-#include "tao/LocalObject.h"
-
-// The namespace name for the actual implementation classes doesn't
-// really matter.  Since there may be several different
-// implementations for a component, they can very well be in different
-// namespaces.
-namespace MyImpl
-{
-  /**
-   * @class IOB_Worker_exec
-   *
-   * A compute-bound worker executor implementation class.
-   */
-  class WORKER_EXEC_Export IOB_Worker_exec :
-    public virtual Priority_Test::Worker_Exec,
-    // CIAO container implementation depends on correct reference
-    // counting of local interfaces, so we take a short cut to
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default constructor.
-    IOB_Worker_exec ();
-
-    /// Default destructor.
-    ~IOB_Worker_exec ();
-
-    // Operations from Priority_Test::Worker
-
-    virtual Priority_Test::CCM_Common_Ops_ptr
-    get_some_device (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // Operations from Priority_Test::Common_Ops
-
-    virtual CORBA::Long
-    do_work (CORBA::Long work,
-             CORBA::Long aux
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-
-    virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-  protected:
-    /// Copmponent specific context
-    Priority_Test::CCM_Worker_Context_var context_;
-  };
-
-  /**
-   * @class IOB_Worker_exec
-   *
-   * IOB_Worker home executor implementation class.
-   */
-  class WORKER_EXEC_Export IOB_Worker_Home_exec :
-    public virtual Priority_Test::CCM_WorkerHome,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    /// Default ctor.
-    IOB_Worker_Home_exec ();
-
-    /// Default dtor.
-    ~IOB_Worker_Home_exec ();
-
-    // Explicit home operations.
-
-    // Implicit home operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
-  };
-
-}
-
-// Executor DLL entry point.  CIAO's deployment and assembly framework
-// invokes this function on the resulting DLL to get the home executor.
-extern "C" WORKER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createWorkerHome_Impl (void);
-
-#endif /* IOB_WORKER_EXEC_H */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/README b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/README
deleted file mode 100644
index b3fdb9f95b9..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/README
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id$
-
-This directory contains the implementations for worker components.
-They have the same component definition and share the same
-stub/skeleton/servant lib implementations.  That is, they appear to be
-the same to their client but they behave differently.
-
-Workers provide the Common_Ops interface which allows their client to
-request them to "do some work."  Two differnt kinds of worker
-components are available here:
-
-1. Compute_Bound worker (CB_Worker)
-
-   Upon receiving a request to perform some work, it will perform some
-   heavy computation and eat up a lot of CPU cycles before returning.
-
-2. IO_Bound worker (IOB_Worker)
-
-   Upon receiving a request to perform some work, it will perform some
-   I/O operations before returning.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.cidl b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.cidl
deleted file mode 100644
index b30f3994117..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.cidl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$  -*- IDL -*-
-
-#include "Worker.idl"
-
-composition session Worker_Impl
-{
-  home executor WorkerHome_exec
-  {
-    implements Priority_Test::WorkerHome;
-    manages Worker_exec;
-  };
-};
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.idl b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.idl
deleted file mode 100644
index 4f1a5b4a5bf..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-/**
- * @file Worker.idl
- *
- * Definition of a Worker component that does some work.  This work
- * can be either compute-bound or I/O-bound.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-
-#ifndef WORKER_IDL
-#define WORKER_IDL
-
-#include "../Priority_Test.idl"
-
-module Priority_Test
-{
-  component Worker
-    {
-      provides Common_Ops some_device;
-    };
-
-  home WorkerHome manages Worker
-  {
-  };
-};
-
-#endif /* WORKER_IDL */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc
deleted file mode 100644
index e50e699862f..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -l .. -p Priority_Test -i Worker"
-
-project(Priority_Test_Worker_stub): ciao_client {
-  after += Priority_Test_stub
-  libs    += Priority_Test_stub
-  libpaths += ..
-  sharedname = Worker_stub
-  idlflags += -Wb,stub_export_macro=WORKER_STUB_Export -Wb,stub_export_include=Worker_stub_export.h -Wb,skel_export_macro=WORKER_SVNT_Export -Wb,skel_export_include=Worker_svnt_export.h
-  dynamicflags   = WORKER_STUB_BUILD_DLL
-
-  IDL_Files {
-    Worker.idl
-  }
-
-  Source_Files {
-    WorkerC.cpp
-  }
-}
-
-project(Priority_Test_Worker_svnt) : ciao_servant {
-  after += Priority_Test_svnt Priority_Test_Worker_stub
-  sharedname  = Worker_svnt
-  libs    += Worker_stub Priority_Test_stub Priority_Test_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=WORKER_SVNT_Export -Wb,export_include=Worker_svnt_export.h
-  dynamicflags = WORKER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Worker.cidl
-  }
-
-  IDL_Files {
-    WorkerE.idl
-  }
-
-  Source_Files {
-    WorkerEC.cpp
-    WorkerS.cpp
-    Worker_svnt.cpp
-  }
-}
-
-// Compute-bound worker component
-project(Priority_Test_CB_Worker_exec) : ciao_component {
-  after   += Priority_Test_Worker_svnt
-  sharedname = CB_Worker_exec
-  libs      += Worker_stub Worker_svnt Priority_Test_stub Priority_Test_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=WORKER_EXEC_Export -Wb,export_include=Worker_exec_export.h
-  dynamicflags   = WORKER_EXEC_BUILD_DLL
-
-  IDL_Files {
-    WorkerEI.idl
-  }
-
-  Source_Files {
-    WorkerEIC.cpp
-    CB_Worker_exec.cpp
-  }
-}
-
-// IO-bound worker component
-project(Priority_Test_IOB_Worker_exec) : ciao_component {
-  after   += Priority_Test_Worker_svnt
-  sharedname = IOB_Worker_exec
-  libs      += Worker_stub Worker_svnt Priority_Test_stub Priority_Test_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=WORKER_EXEC_Export -Wb,export_include=Worker_exec_export.h
-  dynamicflags   = WORKER_EXEC_BUILD_DLL
-
-  IDL_Files {
-    WorkerEI.idl
-  }
-
-  Source_Files {
-    WorkerEIC.cpp
-    IOB_Worker_exec.cpp
-  }
-}
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/WorkerEI.idl b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/WorkerEI.idl
deleted file mode 100644
index d219d91fbb4..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/WorkerEI.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-/**
- * @file WorkerEI.idl
- *
- * Definition of the Worker component implementation.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-
-#ifndef WORKEREI_IDL
-#define WORKEREI_IDL
-
-#include "WorkerE.idl"
-
-module Priority_Test
-{
-  /**
-   * @interface Worker_Exec
-   *
-   * The actually Worker executor inherits from both CCM_Worker and
-   * CCM_position interfaces as a monolithic implementation.
-   */
-  local interface Worker_Exec :
-    CCM_Worker,
-    CCM_Common_Ops,
-    Components::SessionComponent
-  {
-  };
-
-};
-
-#endif /* WORKEREI_IDL */
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_exec_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_exec_export.h
deleted file mode 100644
index 760ae5b4b43..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl WORKER_EXEC
-// ------------------------------
-#ifndef WORKER_EXEC_EXPORT_H
-#define WORKER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (WORKER_EXEC_HAS_DLL)
-#  define WORKER_EXEC_HAS_DLL 1
-#endif /* ! WORKER_EXEC_HAS_DLL */
-
-#if defined (WORKER_EXEC_HAS_DLL) && (WORKER_EXEC_HAS_DLL == 1)
-#  if defined (WORKER_EXEC_BUILD_DLL)
-#    define WORKER_EXEC_Export ACE_Proper_Export_Flag
-#    define WORKER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define WORKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* WORKER_EXEC_BUILD_DLL */
-#    define WORKER_EXEC_Export ACE_Proper_Import_Flag
-#    define WORKER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define WORKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* WORKER_EXEC_BUILD_DLL */
-#else /* WORKER_EXEC_HAS_DLL == 1 */
-#  define WORKER_EXEC_Export
-#  define WORKER_EXEC_SINGLETON_DECLARATION(T)
-#  define WORKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* WORKER_EXEC_HAS_DLL == 1 */
-
-// Set WORKER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (WORKER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define WORKER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define WORKER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !WORKER_EXEC_NTRACE */
-
-#if (WORKER_EXEC_NTRACE == 1)
-#  define WORKER_EXEC_TRACE(X)
-#else /* (WORKER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define WORKER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (WORKER_EXEC_NTRACE == 1) */
-
-#endif /* WORKER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_stub_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_stub_export.h
deleted file mode 100644
index 554243fc699..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl WORKER_STUB
-// ------------------------------
-#ifndef WORKER_STUB_EXPORT_H
-#define WORKER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (WORKER_STUB_HAS_DLL)
-#  define WORKER_STUB_HAS_DLL 1
-#endif /* ! WORKER_STUB_HAS_DLL */
-
-#if defined (WORKER_STUB_HAS_DLL) && (WORKER_STUB_HAS_DLL == 1)
-#  if defined (WORKER_STUB_BUILD_DLL)
-#    define WORKER_STUB_Export ACE_Proper_Export_Flag
-#    define WORKER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define WORKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* WORKER_STUB_BUILD_DLL */
-#    define WORKER_STUB_Export ACE_Proper_Import_Flag
-#    define WORKER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define WORKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* WORKER_STUB_BUILD_DLL */
-#else /* WORKER_STUB_HAS_DLL == 1 */
-#  define WORKER_STUB_Export
-#  define WORKER_STUB_SINGLETON_DECLARATION(T)
-#  define WORKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* WORKER_STUB_HAS_DLL == 1 */
-
-// Set WORKER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (WORKER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define WORKER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define WORKER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !WORKER_STUB_NTRACE */
-
-#if (WORKER_STUB_NTRACE == 1)
-#  define WORKER_STUB_TRACE(X)
-#else /* (WORKER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define WORKER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (WORKER_STUB_NTRACE == 1) */
-
-#endif /* WORKER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_svnt_export.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_svnt_export.h
deleted file mode 100644
index 47efffe1596..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl WORKER_SVNT
-// ------------------------------
-#ifndef WORKER_SVNT_EXPORT_H
-#define WORKER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (WORKER_SVNT_HAS_DLL)
-#  define WORKER_SVNT_HAS_DLL 1
-#endif /* ! WORKER_SVNT_HAS_DLL */
-
-#if defined (WORKER_SVNT_HAS_DLL) && (WORKER_SVNT_HAS_DLL == 1)
-#  if defined (WORKER_SVNT_BUILD_DLL)
-#    define WORKER_SVNT_Export ACE_Proper_Export_Flag
-#    define WORKER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define WORKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* WORKER_SVNT_BUILD_DLL */
-#    define WORKER_SVNT_Export ACE_Proper_Import_Flag
-#    define WORKER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define WORKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* WORKER_SVNT_BUILD_DLL */
-#else /* WORKER_SVNT_HAS_DLL == 1 */
-#  define WORKER_SVNT_Export
-#  define WORKER_SVNT_SINGLETON_DECLARATION(T)
-#  define WORKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* WORKER_SVNT_HAS_DLL == 1 */
-
-// Set WORKER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (WORKER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define WORKER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define WORKER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !WORKER_SVNT_NTRACE */
-
-#if (WORKER_SVNT_NTRACE == 1)
-#  define WORKER_SVNT_TRACE(X)
-#else /* (WORKER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define WORKER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (WORKER_SVNT_NTRACE == 1) */
-
-#endif /* WORKER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CB_Worker.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CB_Worker.csd
deleted file mode 100644
index 61404164fa5..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CB_Worker.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- CB_Worker's Software Package Descriptor  -->
-<!-- This file describes various CB_Worker executor -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-CB-Worker" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Compute-bound Worker Component</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A compute-bound Worker executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Worker:1.0" homeid="IDL:Priority_Test/WorkerHome:1.0">
-    <fileinarchive name="Worker.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Worker.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:1EB5F4C6-7F5D-43F2-9A44-E89B6E96377F">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="Worker.ssd"/>
-        <implref idref="DCE:53E7624B-96D9-4E2B-BD73-66A56082AA1A"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="CB_Worker_exec"/>
-      <entrypoint>createWorkerHome_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini
deleted file mode 100644
index 0a1a4b7254e..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[ComponentInstallation]
-DCE:53E7624B-96D9-4E2B-BD73-66A56082AA1A=Worker_svnt
-DCE:1EB5F4C6-7F5D-43F2-9A44-E89B6E96377F=CB_Worker_exec
-DCE:A99FBAC6-823B-42D3-87B1-404D2DFCD690=IOB_Worker_exec
-DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799=Controller_svnt
-DCE:9663E039-96F8-41BE-BDA9-3BF4654DE996=Controller_exec
-DCE:95CFD762-03EC-4A53-BF11-E15C1834DD17=Rate_Controller_exec
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.csd
deleted file mode 100644
index 34e6646d9a0..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- Controller Software Package Descriptor  -->
-<!-- This file describes various Controller executors -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-Controller" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Controller Component</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A controller executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
-    <fileinarchive name="Controller.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Controller.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:9663E039-96F8-41BE-BDA9-3BF4654DE996">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="Controller.ssd"/>
-        <implref idref="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="Controller_exec"/>
-      <entrypoint>createControllerHome_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.ssd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.ssd
deleted file mode 100644
index 8e51d337fa7..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.ssd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- Controller's Servant Software Descriptor  -->
-<!-- This file describes various Controller servants -->
-<!-- implementations. -->
-
-
-<softpkg name="Priority-Test-Controller-Servant" version="1.0">
-  <pkgtype>CIAO Servant</pkgtype>
-  <title>Priority_Test::Controller Servants</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A Controller servant implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
-    <fileinarchive name="Controller.idl"/>
-  </idl>
-
-  <!-- Duplicate information.  We should use the copy in Controller.csd -->
-  <!-- So, do we really need this one? -->
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Controller.ccd"/> <!-- Compoenent descriptors -->
-  </descriptor>
-
-  <implementation id="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799">
-
-    <dependency type="ORB">
-      <name>TAO</name>
-    </dependency>
-
-    <code>
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="Controller_svnt"/>
-      <entrypoint>createControllerHome_Servant</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller25.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller25.csd
deleted file mode 100644
index 6b423fff32b..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller25.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- Controller Software Package Descriptor  -->
-<!-- This file describes various Controller executors -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-Controller25" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Controller Component</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A 25hz controller executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
-    <fileinarchive name="Controller.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Controller.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:95CFD762-03EC-4A53-BF11-E15C1834DD17">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="Controller.ssd"/>
-        <implref idref="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="Rate_Controller_exec"/>
-      <entrypoint>createControllerHome25_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller50.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller50.csd
deleted file mode 100644
index 6e811cb9956..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller50.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- Controller Software Package Descriptor  -->
-<!-- This file describes various Controller executors -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-Controller50" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Controller Component</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A 50hz controller executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
-    <fileinarchive name="Controller.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Controller.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:95CFD762-03EC-4A53-BF11-E15C1834DD17">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="Controller.ssd"/>
-        <implref idref="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="Rate_Controller_exec"/>
-      <entrypoint>createControllerHome50_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller75.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller75.csd
deleted file mode 100644
index 89ba842dd22..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller75.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- Controller Software Package Descriptor  -->
-<!-- This file describes various Controller executors -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-Controller75" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Controller Component</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A 75hz controller executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
-    <fileinarchive name="Controller.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Controller.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:95CFD762-03EC-4A53-BF11-E15C1834DD17">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="Controller.ssd"/>
-        <implref idref="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="Rate_Controller_exec"/>
-      <entrypoint>createControllerHome75_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/IOB_Worker.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/IOB_Worker.csd
deleted file mode 100644
index e76018226fe..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/IOB_Worker.csd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- IOB_Worker's Software Package Descriptor  -->
-<!-- This file describes various IOB_Worker executor -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-IOB-Worker" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>IO-bound Worker Component</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A IO-bound Worker executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Worker:1.0" homeid="IDL:Priority_Test/WorkerHome:1.0">
-    <fileinarchive name="Worker.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Worker.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:A99FBAC6-823B-42D3-87B1-404D2DFCD690">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="Worker.ssd"/>
-        <implref idref="DCE:53E7624B-96D9-4E2B-BD73-66A56082AA1A"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="IOB_Worker_exec"/>
-      <entrypoint>createWorkerHome_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/NOTE-win.txt b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/NOTE-win.txt
deleted file mode 100644
index 9b1cf7f9595..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/NOTE-win.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-
-cd $CIAO_ROOT/tests/RTCCM/Priority_Test/descriptors/
-$CIAO_ROOT/tools/Daemon/CIAO_Daemon -ORBEndpoint iiop://`hostname`:10000 -n $CIAO_ROOT/tools/ComponentServer/ComponentServer
-
-Conventional test:
-==================
-
-SET CIAO_DEBUG_LEVEL=25
-
-Remote Daemon:
---------------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Remote Daemon
-    .....\tools\Daemon\CIAO_Daemon  -ORBEndpoint iiop://localhost:12000 -n ../../../../tools/ComponentServer/ComponentServer
-
-Local Daemon:
---------------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Local Daemon
-    .....\tools\Daemon\CIAO_Daemon  -ORBEndpoint iiop://localhost:10000 -n ../../../../tools/ComponentServer/ComponentServer
-
-
-Assembly Manager
------------------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Assembly Manager
-    .....\tools\Assembly_Deployer\Assembly_Manager -o ior -c test.dat
-
-Assembly Deployer
------------------
-
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Assembly Deployer
-    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior -o ck_file -a demo.cad
-
-    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior -d ck_file
-
-client
-------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Client
-    ..\Controller\client
-
-
-RT-server-test:
-===============
-
-Remote Daemon:
---------------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Remote Daemon
-    .....\tools\Daemon\CIAO_Daemon  -ORBEndpoint iiop://localhost:12000 -n ../../../../tools/RTComponentServer/RTComponentServer  -m svcmap.dat
-
-Local Daemon:
---------------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Local Daemon
-    .....\tools\Daemon\CIAO_Daemon  -ORBEndpoint iiop://localhost:10000 -n ../../../../tools/RTComponentServer/RTComponentServer -m svcmap.dat
-
-
-Assembly Manager
------------------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Assembly Manager
-    .....\tools\Assembly_Deployer\Assembly_Manager -o ior -c test.dat
-
-Assembly Deployer
------------------
-
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Assembly Deployer
-    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -a HUDisplay-rtcad.cad
-
-client
-------
-
-    w:\TAO\CIAO\tests\RTCCM\Priority_Test\descriptors\
-    title Controller
-    ..\Controller\client
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/README b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/README
deleted file mode 100644
index 67d2047a536..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/README
+++ /dev/null
@@ -1,65 +0,0 @@
-* Overview
-
-Check out file "NOTE-win.txt" for general hints and procedures for
-running various tests.  When using the regular (non-real-time)
-ComponentServer, the following environment variable can be used to
-help debugging and configuring the server.
-
-1. CIAO_DEBUG_LEVEL=25
-
-        can be used to set the -ORBDebugLevel in ComponentServer.
-
-2. CIAO_FIFO_SCHED=1
-
-        Make sure the component server are running with FIFO
-   scheduling class.
-
-Moreover, because of the lack of mechanism for configuring component
-attributes, the following environment variable is used to control the
-Controller component whether it should output all the latency samples.
-
-        CIAO_DUMP_SAMPLE_HISTORY=1
-
-* Important files:
-
-  bench.conf: the svc.conf file used in all the benchmarking tests.
-
-* Basic remote test measure the maximum sustainable rates a worker can
-  service under certain load.  basic-remote.cad is the CCM assembly
-  file that defines the test application.
-
-  basic_remote.pl is a perl script that helps start deploy the test
-  application.  There are many different ways of using the script.
-  basic_remote.pl provides many command line flags to configure all
-  these different deployment strategies, take a look at the source
-  code.
-
-* Real-time behavior tests: All these tests use the real-time
-  behaviors defined in file "basic_rt.rtd", i.e., this file is
-  referenced from all of the following cad files but the first
-  non-rt one.  All of the following RT test applications employ
-  3 controller of different rates invoking one or more Workers on the
-  server side ComponentServer to serve the requests.
-
-  rate-test.pl can help iterate thru the range of workloads we want to
-  test.
-
-  * no-rt-3rates.cad: No real-time behavior is enforced.  A single
-    worker is used to serve requests from all the Controller.
-
-  * rt-3rates-inc.cad: Each Controller has a dedicated Worker instance
-    on the server-side ComponentServer to serve the requests.  Each
-    Worker are associated to a dedicated threadpool and assigned a
-    priority level that requests of the specific rate will be handle.
-    This cad file apply the rate monotonic scheduling (RMS) strategy.
-
-  * rt-3rates-dec.cad: Same as above but instead uses the reverse RMS
-    strategy.
-
-  * rt-3rates-laned-inc.cad: Same as above but instead of 3 dedicated
-    threadpools, a laned threadpool is used.  All 3 Workers serving
-    the different rates shared the threadpool.  This example uses the
-    RMS strategy.
-
-  * rt-3rates-laned-dec.cad: Same as above but uses the reverse-RMS
-    strategy.
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/RTsvc.conf b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/RTsvc.conf
deleted file mode 100644
index fd9db67aca5..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/RTsvc.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# No options required for regular testing
-
-# For real-time testing, uncomment the following line:
-static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Worker.ssd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Worker.ssd
deleted file mode 100644
index 33dd667e512..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Worker.ssd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
-
-<!-- Worker's Servant Software Descriptor  -->
-<!-- This file describes various Worker servant -->
-<!-- implementations. -->
-
-
-<softpkg name="Priority-Test-Worker-Servant" version="1.0">
-  <pkgtype>CIAO Servant</pkgtype>
-  <title>Priority_Test::Worker Servants</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A Worker servant implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:Priority_Test/Worker:1.0" homeid="IDL:Priority_Test/WorkerHome:1.0">
-    <fileinarchive name="Worker.idl"/>
-  </idl>
-
-  <!-- Duplicate information.  We should use the copy in Worker.csd -->
-  <!-- So, do we really need this one? -->
-  <descriptor type="CORBA Component">
-    <fileinarchive name="Worker.ccd"/> <!-- Compoenent descriptors -->
-  </descriptor>
-
-  <implementation id="DCE:53E7624B-96D9-4E2B-BD73-66A56082AA1A">
-
-    <dependency type="ORB">
-      <name>TAO</name>
-    </dependency>
-
-    <code>
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="Worker_svnt"/>
-      <entrypoint>createWorkerHome_Servant</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic-remote.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic-remote.cad
deleted file mode 100644
index da0abf2387b..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic-remote.cad
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<componentassembly id="A basic remote assembly for baseline performance of RTCCM Priority components.">
-  <componentfiles>
-    <componentfile id="com-Controller">
-      <fileinarchive name="Controller.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-
-  <!-- A plain vanilla partition.  We don't even need the processcollocation tag here. -->
-      <homeplacement id="a_ControllerHome">
-        <componentfileref idref="com-Controller"/>
-        <componentinstantiation id="a_Controller">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="controller.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-     <processcollocation>
-      <homeplacement id="a_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_Worker"/>
-      </homeplacement>
-      <destination>Remote</destination>
-     </processcollocation> 
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_Controller"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_Worker"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_remote.pl b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_remote.pl
deleted file mode 100755
index 12b6882fe19..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_remote.pl
+++ /dev/null
@@ -1,99 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-#
-# @@ Run this script from ../descriptors/ instead.
-#
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$assembly = PerlACE::LocalFile ("basic-remote.cad");
-$am_ior = PerlACE::LocalFile ("am.ior");
-$controller_ior = PerlACE::LocalFile ("controller.ior");
-$cookie = PerlACE::LocalFile ("ck_demo_deployment");
-$topo_config = PerlACE::LocalFile ("remote.dat");
-
-$ACE_ROOT=$ENV{'ACE_ROOT'};
-$CIAO_ROOT=$ENV{'CIAO_ROOT'};
-
-if ($CIAO_ROOT eq "") {
-    $CIAO_ROOT="$ACE_ROOT/TAO/CIAO";
-}
-
-unlink $am_ior;
-unlink $cookie;
-
-
-$assembly_manager_args = "-o $am_ior -c $topo_config";
-
-$ad_deploy = " -k file://$am_ior -o $cookie -a $assembly";
-
-$ad_teardown = " -k file://$am_ior -d $cookie -x";
-
-## Starting up the CIAO Assembly Manager
-$AM = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Manager",
-                           $assembly_manager_args);
-$AM->Spawn ();
-if (PerlACE::waitforfile_timed ($am_ior, 15) == -1) {
-    print STDERR "ERROR: Could not find assembly ior file <$am_ior>\n";
-    $AM->Kill ();
-    exit 1;
-}
-
-## Now actually deploy the application
-$AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer",
-                           $ad_deploy);
-if ($AD->SpawnWaitKill (60) == -1) {
-    print STDERR "ERROR: Failed to deploy assembly file <$assembly>\n";
-    $AD->Kill ();
-    $AM->Kill ();
-}
-
-## Make sure the application is up and running
-if (PerlACE::waitforfile_timed ($controller_ior, 15) == -1) {
-    print STDERR "ERROR: Could not find controller ior file <$controller_ior>\n";
-    $AM->Kill ();
-    exit 1;
-}
-
-for ($work = 10; $work < 401; $work += 10)
-{
-    printf "Test work: $work\n";
-
-#Start the client to send the trigger message
-    $CL = new PerlACE::Process ("../Controllers/client",
-                                "-k file://$controller_ior -w $work");
-    $CL->SpawnWaitKill(60);
-
-## Now wait for the test to complete.  Need to figure out a way to
-## detect this.
-    sleep (1);
-}
-
-## Now teardown the application
-$AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer",
-                           $ad_teardown);
-if ($AD->SpawnWaitKill (60) == -1) {
-    print STDERR "ERROR: Failed to teardown assembly file <$assembly>\n";
-    $AD->Kill ();
-    $AM->Kill ();
-    exit 1;
-}
-
-#$AM->WaitKill(5);
-#$AD->WaitKill(5);
-
-$AM->WaitKill (40);
-
-
-unlink $cookie;
-unlink $controller_ior;
-unlink $am_ior;
-
-exit $status;
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd
deleted file mode 100644
index 657cc5c3654..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE rtcad_ext SYSTEM "../../../../docs/XML/ciao_rt_cad_ext.dtd">
-
-<!-- Here is a sample real-time cad file extension descriptor. -->
-<!-- Take a look at the RTCAD-example.cad to see how to associate -->
-<!-- a componentassembly descriptor file with this file and how to -->
-<!-- use the policy sets defined in this file. -->
-
-<rtcad_ext>
-
-  <!-- First, we need to define how we are going to allocate -->
-  <!-- real-time related resources. -->
-  <rtresources>
-
-    <threadpool id="common_pool"
-                stacksize="0"
-                static_threads="2"
-                dynamic_threads="0"
-                priority="1"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpool id="middle_pool"
-                stacksize="0"
-                static_threads="2"
-                dynamic_threads="0"
-                priority="2"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpool id="high_prio_pool"
-                stacksize="0"
-                static_threads="2"
-                dynamic_threads="0"
-                priority="3"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpoolwithlanes
-                id="laned_pool"
-                stacksize="0"
-                borrowing="no"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0">
-      <lane priority="1"
-            static_threads="2"
-            dynamic_threads="0"/>
-      <lane priority="2"
-            static_threads="2"
-            dynamic_threads="0"/>
-      <lane priority="3"
-            static_threads="2"
-            dynamic_threads="0"/>
-    </threadpoolwithlanes>
-
-    <connectionbands id="common_conn">
-      <band low="1" high="1"/>
-      <band low="2" high="2"/>
-      <band low="3" high="3000"/>
-    </connectionbands>
-  </rtresources>
-
-  <!-- Then, we define sets of policies that can be associated with -->
-  <!-- containers (or <homeplacement> rather) -->
-
-  <rtpolicyset id="LOW_POLICY">
-    <priority_model_policy type="server_declared" priority="1"/>
-    <threadpool_policy idref="common_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="MID_POLICY">
-    <priority_model_policy type="server_declared" priority="2"/>
-    <threadpool_policy idref="middle_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="HIGH_POLICY">
-    <priority_model_policy type="server_declared" priority="3"/>
-    <threadpool_policy idref="high_prio_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="LOW_POLICY_LANED_POOL">
-    <priority_model_policy type="server_declared" priority="1"/>
-    <threadpool_policy idref="laned_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="MID_POLICY_LANED_POOL">
-    <priority_model_policy type="server_declared" priority="2"/>
-    <threadpool_policy idref="laned_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="HIGH_POLICY_LANED_POOL">
-    <priority_model_policy type="server_declared" priority="3"/>
-    <threadpool_policy idref="laned_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="HIGH_CONN_POLICY">
-    <priority_model_policy type="client_propagated" priority="2"/>
-    <threadpool_policy idref="high_prio_pool"/>
-    <banded_connection_policy idref="common_conn"/>
-  </rtpolicyset>
-
-</rtcad_ext>
\ No newline at end of file
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl
deleted file mode 100755
index f4778ddbfc7..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl
+++ /dev/null
@@ -1,173 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-#
-# @@ Run this script from ../descriptors/ instead.
-#
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-
-## Source in the environment setting
-$ACE_ROOT=$ENV{'ACE_ROOT'};
-$CIAO_ROOT=$ENV{'CIAO_ROOT'};
-
-if ($CIAO_ROOT eq "") {
-    $CIAO_ROOT="$ACE_ROOT/TAO/CIAO";
-}
-
-
-$status = 0;
-$assembly = PerlACE::LocalFile ("demo.cad");
-$deploy_config = PerlACE::LocalFile ("test.dat");
-#$deploy_config = PerlACE::LocalFile ("remote.dat");
-$daemon_ior = PerlACE::LocalFile ("daemon.ior");
-$am_ior = PerlACE::LocalFile ("am.ior");
-$controller_ior = PerlACE::LocalFile ("controller.ior");
-$cookie = PerlACE::LocalFile ("ck_demo_deployment");
-
-$compserver="$CIAO_ROOT/tools/ComponentServer/ComponentServer";
-
-## The following control how to iterate thru various work amount
-$start_work = 10;
-$end_work = 400;
-$work_step = 10;
-$run_time = 30;                 # run for $run_time sec.
-
-unlink $daemon_ior;
-unlink $am_ior;
-unlink $cookie;
-
-$test_deploy = 0;               # Do not run client/controller at all
-$no_daemon = 0;                 # Do not start daemon process
-$no_stop = 0;                   # just invoke the start() operation in
-                                # client, no stop() invocation.
-
-# Parse command line argument
-while ( $#ARGV >= 0)
-{
-    if ($ARGV[0] =~ m/^-test_deploy/i) {
-        $test_deploy = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-no_daemon/i) {
-        $no_daemon = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-no_stop/i) {
-        $no_stop = 1;
-    }
-    else {
-        die "Invalid flag: $ARGV[0]\n";
-    }
-
-    shift;
-}
-
-# CIAO Daemon command line arguments
-$daemon_args1 = "-ORBEndpoint iiop://localhost:10000 -o $daemon_ior -i CIAO_Installation_Data.ini -n $compserver";
-
-$assembly_manager_args = "-o $am_ior -c $deploy_config";
-
-$ad_deploy = " -k file://$am_ior -o $cookie -a $assembly";
-
-$ad_teardown = " -k file://$am_ior -d $cookie -x";
-
-# CIAO daemon process definition
-$DS = new PerlACE::Process ("$CIAO_ROOT/tools/Daemon/CIAO_Daemon",
-                            "$daemon_args1");
-
-if ($no_daemon == 0) {
-## Starting up the CIAO daemon
-    $DS->Spawn ();
-    if (PerlACE::waitforfile_timed ($daemon_ior, 15) == -1) {
-        print STDERR "ERROR: Could not find daemon ior file <$daemon_ior>\n";
-        $DS->Kill ();
-        exit 1;
-    }
-}
-
-## Starting up the CIAO Assembly Manager
-$AM = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Manager",
-                           $assembly_manager_args);
-$AM->Spawn ();
-if (PerlACE::waitforfile_timed ($am_ior, 15) == -1) {
-    print STDERR "ERROR: Could not find assembly ior file <$am_ior>\n";
-    $AM->Kill ();
-    $DS->Kill ();
-    exit 1;
-}
-
-## Now actually deploy the application
-$AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer",
-                           $ad_deploy);
-if ($AD->SpawnWaitKill (60) == -1) {
-    print STDERR "ERROR: Failed to deploy assembly file <$assembly>\n";
-    $AD->Kill ();
-    $AM->Kill ();
-    $DS->Kill ();
-}
-
-## Make sure the application is up and running
-if (PerlACE::waitforfile_timed ($controller_ior, 15) == -1) {
-    print STDERR "ERROR: Could not find controller ior file <$controller_ior>\n";
-    $AM->Kill ();
-    $DS->Kill ();
-    exit 1;
-}
-
-# Don't start the test
-if ($test_deploy == 0) {
-    for ($work = $start_work; $work < $end_work; $work += $work_step)
-    {
-        printf "Test work: $work\n";
-
-#Start the client to send the trigger message
-        $CL = new PerlACE::Process ("../Controllers/client",
-                                    "-k file://$controller_ior -w $work");
-        $CL->SpawnWaitKill(60);
-
-        if ($no_stop == 0) {
-## Now wait for the test to complete.  Need to figure out a way to
-## detect this.
-            sleep ($run_time);
-
-#Start the client to send the trigger message
-            $CL = new PerlACE::Process ("../Controllers/client",
-                                        "-k file://$controller_ior -f");
-            $CL->SpawnWaitKill(60);
-        }
-    }
-}
-else {
-    print "Test deploying the application -=-=- Not invoking client\n";
-    sleep (1);
-}
-
-## Now teardown the application
-$AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer",
-                           $ad_teardown);
-if ($AD->SpawnWaitKill (60) == -1) {
-    print STDERR "ERROR: Failed to teardown assembly file <$assembly>\n";
-    $AD->Kill ();
-    $AM->Kill ();
-    $DS->Kill ();
-    exit 1;
-}
-
-#$ctrl = $DS->WaitKill (5);
-#$AM->WaitKill(5);
-#$AD->WaitKill(5);
-
-$AM->WaitKill (2);
-$DS->Kill ();
-
-
-unlink $cookie;
-unlink $controller_ior;
-unlink $daemon_ior;
-unlink $am_ior;
-
-exit $status;
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/bench.conf b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/bench.conf
deleted file mode 100644
index 28aab395bd4..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/bench.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo-25.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo-25.cad
deleted file mode 100644
index f0cb3080a49..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo-25.cad
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<componentassembly id="A test assembly for RTCCM Priority components.">
-  <componentfiles>
-    <componentfile id="com-Controller">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-
-  <!-- A plain vanilla partition.  We don't even need the processcollocation tag here. -->
-      <homeplacement id="a_ControllerHome">
-        <componentfileref idref="com-Controller"/>
-        <componentinstantiation id="a_Controller">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="controller.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_Worker"/>
-      </homeplacement>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_Controller"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_Worker"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo-50.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo-50.cad
deleted file mode 100644
index fee312eff4e..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo-50.cad
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<componentassembly id="A test assembly for RTCCM Priority components.">
-  <componentfiles>
-    <componentfile id="com-Controller">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-
-  <!-- A plain vanilla partition.  We don't even need the processcollocation tag here. -->
-      <homeplacement id="a_ControllerHome">
-        <componentfileref idref="com-Controller"/>
-        <componentinstantiation id="a_Controller">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="controller.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_Worker"/>
-      </homeplacement>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_Controller"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_Worker"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo.cad
deleted file mode 100644
index af6f79df6fb..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/demo.cad
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<componentassembly id="A test assembly for RTCCM Priority components.">
-  <componentfiles>
-    <componentfile id="com-Controller">
-      <fileinarchive name="Controller.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-
-  <!-- A plain vanilla partition.  We don't even need the processcollocation tag here. -->
-      <homeplacement id="a_ControllerHome">
-        <componentfileref idref="com-Controller"/>
-        <componentinstantiation id="a_Controller">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="controller.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_Worker"/>
-      </homeplacement>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_Controller"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_Worker"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/no-rt-3rates.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/no-rt-3rates.cad
deleted file mode 100644
index 00aafadf289..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/no-rt-3rates.cad
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-      <homeplacement id="a_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <componentinstantiation id="a_W50"/>
-        <componentinstantiation id="a_W75"/>
-      </homeplacement>
-
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rate_test.pl b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rate_test.pl
deleted file mode 100755
index 653c9b7d9f0..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rate_test.pl
+++ /dev/null
@@ -1,193 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-#
-# @@ Run this script from ../descriptors/ instead.
-#
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-
-## Source in the environment setting
-$ACE_ROOT=$ENV{'ACE_ROOT'};
-$CIAO_ROOT=$ENV{'CIAO_ROOT'};
-
-if ($CIAO_ROOT eq "") {
-    $CIAO_ROOT="$ACE_ROOT/TAO/CIAO";
-}
-
-
-$status = 0;
-$local = 1;
-$assembly = PerlACE::LocalFile ("no-rt-3rates.cad");
-$daemon_ior = PerlACE::LocalFile ("daemon.ior");
-$am_ior = PerlACE::LocalFile ("am.ior");
-$c25_ior = PerlACE::LocalFile ("c25.ior");
-$c50_ior = PerlACE::LocalFile ("c50.ior");
-$c75_ior = PerlACE::LocalFile ("c75.ior");
-$cookie = PerlACE::LocalFile ("ck_demo_deployment");
-
-## The following control how to iterate thru various work amount
-$start_work = 80;
-$end_work = 401;
-$work_step = 10;
-$run_time = 60;                 # run for $run_time sec.
-
-## Controlling test behavior
-$test_deploy = 0;
-$no_daemon = 0;
-$reverse_call_order = 0;
-
-# Parse command line argument
-while ( $#ARGV >= 0)
-{
-    if ($ARGV[0] =~ m/^-test_deploy/i) {
-        $test_deploy = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-remote/i) {
-        $local = 0;
-    }
-    elsif ($ARGV[0] =~ m/^-assembly/i) {
-        shift;
-        if ($#ARGV >= 0) {
-            $assembly = PerlACE::LocalFile ("$ARGV[0]");
-        }
-    }
-    elsif ($ARGV[0] =~ m/^-work_step/i) {
-        shift;
-        if ($#ARGV >= 0) {
-            $work_step = $ARGV[0];
-        }
-    }
-    elsif ($ARGV[0] =~ m/^-reverse_call_order/i) {
-        $reverse_call_order = 1;
-    }
-    else {
-        die "Invalid flag: $ARGV[0]\n";
-    }
-
-    shift;
-}
-
-if ($local == 1) {
-    $deploy_config = PerlACE::LocalFile ("test.dat");
-}
-else {
-    $deploy_config = PerlACE::LocalFile ("remote.dat");
-}
-
-# CIAO Daemon command line arguments
-$daemon_args1 = "-ORBEndpoint iiop://localhost:10000 -o $daemon_ior -i CIAO_Installation_Data.ini -n $CIAO_ROOT/tools/ComponentServer/ComponentServer";
-
-$assembly_manager_args = "-o $am_ior -c $deploy_config";
-
-$ad_deploy = " -k file://$am_ior -o $cookie -a $assembly";
-
-$ad_teardown = " -k file://$am_ior -d $cookie -x";
-
-# CIAO daemon process definition
-$DS = new PerlACE::Process ("$CIAO_ROOT/tools/Daemon/CIAO_Daemon",
-                            "$daemon_args1");
-
-if ($local == 1) {
-## Starting up the CIAO daemon
-    $DS->Spawn ();
-    if (PerlACE::waitforfile_timed ($daemon_ior, 15) == -1) {
-        print STDERR "ERROR: Could not find daemon ior file <$daemon_ior>\n";
-        $DS->Kill ();
-        exit 1;
-    }
-}
-
-for ($work = $start_work; $work < $end_work; $work += $work_step)
-{
-
-    unlink $daemon_ior;
-    unlink $am_ior;
-    unlink $cookie;
-
-## Starting up the CIAO Assembly Manager
-    $AM = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Manager",
-                               $assembly_manager_args);
-    $AM->Spawn ();
-    if (PerlACE::waitforfile_timed ($am_ior, 15) == -1) {
-        print STDERR "ERROR: Could not find assembly ior file <$am_ior>\n";
-        $AM->Kill ();
-        $DS->Kill ();
-        exit 1;
-    }
-
-## Now actually deploy the application
-    $AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer",
-                               $ad_deploy);
-    if ($AD->SpawnWaitKill (60) == -1) {
-        print STDERR "ERROR: Failed to deploy assembly file <$assembly>\n";
-        $AD->Kill ();
-        $AM->Kill ();
-        $DS->Kill ();
-    }
-
-## Make sure the application is up and running
-    if (PerlACE::waitforfile_timed ($c75_ior, 15) == -1) {
-        print STDERR "ERROR: Could not find controller ior file <$controller_ior>\n";
-        $AM->Kill ();
-        $DS->Kill ();
-        exit 1;
-    }
-
-    printf "Test work: $work\n";
-
-    if ($reverse_call_order == 0) {
-        $all_iors = "-k file://$c25_ior -k file://$c50_ior -k file://$c75_ior";
-    }
-    else {
-        $all_iors = "-k file://$c50_ior -k file://$c75_ior -k file://$c25_ior";
-    }
-
-#Start the client to send the trigger message
-    $CL = new PerlACE::Process ("../Controllers/client",
-                                "$all_iors -w $work");
-    $CL->SpawnWaitKill(60);
-
-## Now wait for the test to complete.  Need to figure out a way to
-## detect this.
-    sleep ($run_time);
-
-#Start the client to send the trigger message
-    $CL = new PerlACE::Process ("../Controllers/client",
-                                "$all_iors -f");
-    $CL->SpawnWaitKill(60);
-## Now teardown the application
-    $AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer",
-                               $ad_teardown);
-    if ($AD->SpawnWaitKill (60) == -1) {
-        print STDERR "ERROR: Failed to teardown assembly file <$assembly>\n";
-        $AD->Kill ();
-        $AM->Kill ();
-        $DS->Kill ();
-        exit 1;
-    }
-
-#$ctrl = $DS->WaitKill (5);
-#$AM->WaitKill(5);
-#$AD->WaitKill(5);
-
-    $AM->WaitKill (2);
-
-
-    unlink $cookie;
-    unlink $c25_ior;
-    unlink $c50_ior;
-    unlink $c75_ior;
-    unlink $daemon_ior;
-    unlink $am_ior;
-
-}
-
-$DS->Kill ();
-
-exit $status;
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/remote.dat b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/remote.dat
deleted file mode 100644
index 9b5120043fd..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/remote.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-Default corbaloc:iiop:hermione:10000/ServerActivator
-Remote  corbaloc:iiop:ron:10000/ServerActivator
\ No newline at end of file
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-dec.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-dec.cad
deleted file mode 100644
index 38e7f12e319..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-dec.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_PRIO_HIGH_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_PRIO_HIGH_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_PRIO_HIGH_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">shared_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-inc.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-inc.cad
deleted file mode 100644
index 5e6feba1726..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-inc.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_PRIO_HIGH_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_PRIO_HIGH_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_PRIO_HIGH_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">shared_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-dec.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-dec.cad
deleted file mode 100644
index e09d35204ad..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-dec.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_PRIO_LOW_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_PRIO_LOW_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_PRIO_LOW_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">shared_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-inc.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-inc.cad
deleted file mode 100644
index 21ace69252a..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-inc.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_PRIO_LOW_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_PRIO_LOW_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_PRIO_LOW_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">shared_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-dec.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-dec.cad
deleted file mode 100644
index 5ca4be3aa03..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-dec.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_PRIO_MID_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_PRIO_MID_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_PRIO_MID_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">shared_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-inc.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-inc.cad
deleted file mode 100644
index 545b23778b1..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-inc.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_PRIO_MID_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_PRIO_MID_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_PRIO_MID_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">shared_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-dec.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-dec.cad
deleted file mode 100644
index a73e6ba0191..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-dec.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_POLICY</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_POLICY</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_POLICY</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">basic_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-inc.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-inc.cad
deleted file mode 100644
index 7f15969f2e8..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-inc.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_POLICY</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_POLICY</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_POLICY</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">basic_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad
deleted file mode 100644
index 86056c30586..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_POLICY_LANED_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_POLICY_LANED_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_POLICY_LANED_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">basic_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad
deleted file mode 100644
index da9d30938e9..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
-
-<!-- 3 rate test with increasing prio = decreasing rate -->
-
-<componentassembly id="A test assembly for 3 worker running on 3 rates.">
-  <componentfiles>
-    <componentfile id="com-Controller25">
-      <fileinarchive name="Controller25.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller50">
-      <fileinarchive name="Controller50.csd"/>
-    </componentfile>
-    <componentfile id="com-Controller75">
-      <fileinarchive name="Controller75.csd"/>
-    </componentfile>
-    <componentfile id="com-Worker">
-      <fileinarchive name="CB_Worker.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-  <!-- Install component on 2 processes without any RT extension -->
-     <processcollocation>
-      <homeplacement id="a25_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W25"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">LOW_POLICY_LANED_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a50_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W50"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">MID_POLICY_LANED_POOL</extension>
-      </homeplacement>
-
-      <homeplacement id="a75_WorkerHome">
-        <componentfileref idref="com-Worker"/>
-        <componentinstantiation id="a_W75"/>
-        <extension class="RT-POLICY-SET"
-                   origin="CIAO">HIGH_POLICY_LANED_POOL</extension>
-      </homeplacement>
-      <extension class="RT-CAD-EXT" origin="CIAO">basic_rt.rtd</extension>
-     </processcollocation>
-
-     <!-- We will run on server's priority -->
-     <processcollocation>
-      <homeplacement id="a_C25Home">
-        <componentfileref idref="com-Controller25"/>
-        <componentinstantiation id="a_C25">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c25.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C50Home">
-        <componentfileref idref="com-Controller50"/>
-        <componentinstantiation id="a_C50">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c50.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-
-      <homeplacement id="a_C75Home">
-        <componentfileref idref="com-Controller75"/>
-        <componentinstantiation id="a_C75">
-          <registercomponent>
-            <!-- writeiortofile is a non-standard CIAO extension.  -->
-            <writeiortofile name="c75.ior"/>
-          </registercomponent>
-        </componentinstantiation>
-      </homeplacement>
-     <destination>Remote</destination>
-     </processcollocation>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C25"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W25"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C50"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W50"/>
-      </providesport>
-    </connectinterface>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>worker</usesidentifier>
-        <componentinstantiationref idref="a_C75"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>some_device</providesidentifier>
-        <componentinstantiationref idref="a_W75"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd
deleted file mode 100644
index 795731a6942..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE rtcad_ext SYSTEM "../../../../docs/XML/ciao_rt_cad_ext.dtd">
-
-<!-- Here is a sample real-time cad file extension descriptor. -->
-<!-- Take a look at the RTCAD-example.cad to see how to associate -->
-<!-- a componentassembly descriptor file with this file and how to -->
-<!-- use the policy sets defined in this file. -->
-
-<rtcad_ext>
-
-  <!-- First, we need to define how we are going to allocate -->
-  <!-- real-time related resources. -->
-  <rtresources>
-
-    <threadpool id="common_pool"
-                stacksize="0"
-                static_threads="3"
-                dynamic_threads="0"
-                priority="1"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpool id="middle_pool"
-                stacksize="0"
-                static_threads="3"
-                dynamic_threads="0"
-                priority="2"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpool id="high_prio_pool"
-                stacksize="0"
-                static_threads="3"
-                dynamic_threads="0"
-                priority="3"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-  </rtresources>
-
-  <!-- Then, we define sets of policies that can be associated with -->
-  <!-- containers (or <homeplacement> rather) -->
-
-  <rtpolicyset id="LOW_PRIO_LOW_POOL">
-    <priority_model_policy type="server_declared" priority="1"/>
-    <threadpool_policy idref="common_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="MID_PRIO_LOW_POOL">
-    <priority_model_policy type="server_declared" priority="2"/>
-    <threadpool_policy idref="common_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="HIGH_PRIO_LOW_POOL">
-    <priority_model_policy type="server_declared" priority="3"/>
-    <threadpool_policy idref="common_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="LOW_PRIO_MID_POOL">
-    <priority_model_policy type="server_declared" priority="1"/>
-    <threadpool_policy idref="middle_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="MID_PRIO_MID_POOL">
-    <priority_model_policy type="server_declared" priority="2"/>
-    <threadpool_policy idref="middle_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="HIGH_PRIO_MID_POOL">
-    <priority_model_policy type="server_declared" priority="3"/>
-    <threadpool_policy idref="middle_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="LOW_PRIO_HIGH_POOL">
-    <priority_model_policy type="server_declared" priority="1"/>
-    <threadpool_policy idref="high_prio_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="MID_PRIO_HIGH_POOL">
-    <priority_model_policy type="server_declared" priority="2"/>
-    <threadpool_policy idref="high_prio_pool"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="HIGH_PRIO_HIGH_POOL">
-    <priority_model_policy type="server_declared" priority="3"/>
-    <threadpool_policy idref="high_prio_pool"/>
-  </rtpolicyset>
-
-</rtcad_ext>
\ No newline at end of file
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/svcmap.dat b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/svcmap.dat
deleted file mode 100644
index bf226e7184d..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/svcmap.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-RT1,RTsvc.conf
-RT2,RTsvc2.conf
-RT3,RTsvc3.conf
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.dat b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.dat
deleted file mode 100644
index d26b3d4e070..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-Default corbaloc:iiop:localhost:10000/ServerActivator
-Remote  corbaloc:iiop:localhost:12000/ServerActivator
\ No newline at end of file
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.rtd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.rtd
deleted file mode 100644
index f29890c21aa..00000000000
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.rtd
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- If this file is moved to a different directory, make sure to change the
-     path to the DTD below. Otherwise the examples won't work. -->
-<!DOCTYPE rtcad_ext SYSTEM "../../../../docs/XML/ciao_rt_cad_ext.dtd">
-
-<!-- Here is a sample real-time cad file extension descriptor. -->
-<!-- Take a look at the RTCAD-example.cad to see how to associate -->
-<!-- a componentassembly descriptor file with this file and how to -->
-<!-- use the policy sets defined in this file. -->
-
-<rtcad_ext>
-
-  <!-- First, we need to define how we are going to allocate -->
-  <!-- real-time related resources. -->
-  <rtresources>
-
-    <threadpoolwithlanes
-                id="shared_pool"
-                stacksize="0"
-                borrowing="no"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0">
-      <lane priority="1"
-            static_threads="100"
-            dynamic_threads="300"/>
-      <lane priority="2"
-            static_threads="2"
-            dynamic_threads="2"/>
-      <lane priority="3"
-            static_threads="1"
-            dynamic_threads="2"/>
-    </threadpoolwithlanes>
-
-    <threadpool id="common_pool"
-                stacksize="0"
-                static_threads="10"
-                dynamic_threads="20"
-                priority="1"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpool id="high_prio_pool"
-                stacksize="0"
-                static_threads="2"
-                dynamic_threads="2"
-                priority="3"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0"/>
-
-    <threadpoolwithlanes
-                id="laned_pool"
-                stacksize="0"
-                borrowing="no"
-                buffering="no"
-                max_buffer="0"
-                buffer_size="0">
-      <lane priority="1"
-            static_threads="10"
-            dynamic_threads="30"/>
-      <lane priority="2"
-            static_threads="3"
-            dynamic_threads="3"/>
-      <lane priority="3"
-            static_threads="1"
-            dynamic_threads="2"/>
-    </threadpoolwithlanes>
-
-    <connectionbands id="common_conn">
-      <band low="1" high="1"/>
-      <band low="2" high="2"/>
-      <band low="3" high="3000"/>
-    </connectionbands>
-  </rtresources>
-
-  <!-- Then, we define sets of policies that can be associated with -->
-  <!-- containers (or <homeplacement> rather) -->
-
-  <rtpolicyset id="POLICY_1">
-    <priority_model_policy type="server_declared" priority="2"/>
-    <threadpool_policy idref="shared_pool"/>
-    <banded_connection_policy idref="common_conn"/>
-  </rtpolicyset>
-
-  <rtpolicyset id="POLICY_2">
-    <threadpool_policy idref="common_pool"/>
-    <priority_model_policy type="client_propagated" priority="2"/>
-  </rtpolicyset>
-
-</rtcad_ext>
\ No newline at end of file
diff --git a/TAO/CIAO/tests/tests.mwc b/TAO/CIAO/tests/tests.mwc
index 0e44f57b774..6479880bd23 100644
--- a/TAO/CIAO/tests/tests.mwc
+++ b/TAO/CIAO/tests/tests.mwc
@@ -2,4 +2,8 @@
 // $Id$
 
 workspace {
+        exclude {
+                RTCCM
+        }
+
 }
\ No newline at end of file