Fri Jun 18 18:18:54 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc:
        * DAnCE/LocalityManager/Handler/LocalityHandler.mpc:
        * DAnCE/LocalityManager/Scheduler/Scheduler.mpc:
        * DAnCE/NodeApplication/NodeApplication_Impl.h:
        * DAnCE/NodeManager/Node_Manager_Module.cpp:
        * MPC/config/ciao_deployment_handlers.mpb:
        * ciao/Containers/Session/Session_Container.cpp:
        * ciao/Containers/Session/Session_Container.mpc:
        * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc:

          Fallout from removal of CIAO component server.

        * ciao/ComponentServer/CIAO_Base.mpc:
        * ciao/ComponentServer/Client_init.h:
        * ciao/ComponentServer/Server_init.h:

          Restructured into the CIAO_Base library.  Directory will be
          renamed in a future commit.

        * tests/CIF/Common/CIF_Common.mpc:
        * tests/CIF/Navigation/Navigation.mpc:
        * tests/CIF/Receptacle/Receptacle.mpc:

          Disabled until they can be re-implemented without the CIAO
          compoenent server.

        * MPC/config/ciao_componentserver_stub.mpb:
        * MPC/config/ciao_componentserver_svnt.mpb:
        * MPC/config/ciao_cs_client.mpb:
        * ciao/ComponentServer/CIAO_CS_Client.idl:
        * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h:
        * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp:
        * ciao/ComponentServer/CIAO_ComponentServer.cpp:
        * ciao/ComponentServer/CIAO_ComponentServer.idl:
        * ciao/ComponentServer/CIAO_ComponentServer.mpc:
        * ciao/ComponentServer/CIAO_ComponentServer_Impl.h:
        * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp:
        * ciao/ComponentServer/CIAO_ComponentServer_Task.h:
        * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp:
        * ciao/ComponentServer/CIAO_Container_Impl.h:
        * ciao/ComponentServer/CIAO_Container_Impl.cpp:
        * ciao/ComponentServer/CIAO_RTComponentServer.cpp:
        * ciao/ComponentServer/CIAO_RTComponentServer_Task.h:
        * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp:
        * ciao/ComponentServer/CIAO_ServerActivator_Impl.h:
        * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp:

          Removed the CIAO component server.

        * tests/CIAO_ComponentServer:
        * tests/CIAO_ComponentServer/Activator:
        * tests/CIAO_ComponentServer/Activator/Activator.mpc:
        * tests/CIAO_ComponentServer/Activator/client.cpp:
        * tests/CIAO_ComponentServer/Activator/run_test.pl:
        * tests/CIAO_ComponentServer/Basic:
        * tests/CIAO_ComponentServer/Basic/Basic.mpc:
        * tests/CIAO_ComponentServer/Basic/client.cpp:
        * tests/CIAO_ComponentServer/Basic/run_test.pl:
        * tests/CIAO_ComponentServer/Local_Facet:
        * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl:
        * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc:
        * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h:
        * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp:
        * tests/CIAO_ComponentServer/Local_Facet/client.cpp:
        * tests/CIAO_ComponentServer/Local_Facet/run_test.pl:
        * tests/CIAO_ComponentServer/SimpleComponent:
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.idl:
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc:
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h:
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp:
        * tests/CIAO_ComponentServer/SimpleComponent/client.cpp:
        * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl:

          Removed testing of CIAO component server.  These features are already tested
          in other places for the new infrastructure.

1 files changed, 8 insertions, 8 deletions

diff --git a/CIAO/tests/CIF/Navigation/Navigation.mpc b/CIAO/tests/CIF/Navigation/Navigation.mpc
index d544cc72ed8..4d14409b95d 100644
--- a/CIAO/tests/CIF/Navigation/Navigation.mpc
+++ b/CIAO/tests/CIF/Navigation/Navigation.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(Navigation_idl_gen) : componentidldefaults {
-
+  requires += dummy_label
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NAVIGATION_STUB_Export \
               -Wb,stub_export_include=Navigation_stub_export.h \
@@ -16,7 +16,7 @@ project(Navigation_idl_gen) : componentidldefaults {
 }
 
 project(Navigation_lem_gen) : ciaoidldefaults {
-
+  requires += dummy_label
   after += Navigation_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NAVIGATION_LEM_STUB_Export \
@@ -29,7 +29,7 @@ project(Navigation_lem_gen) : ciaoidldefaults {
 }
 
 project(Navigation_lem_stub) : ccm_svnt   {
-
+  requires += dummy_label
   after += Navigation_lem_gen Navigation_stub
   libs  += Navigation_stub
   libpaths += ../lib
@@ -56,7 +56,7 @@ project(Navigation_lem_stub) : ccm_svnt   {
 }
 
 project(Navigation_stub) : ccm_stub   {
-
+  requires += dummy_label
   after += Navigation_idl_gen
   libs  +=
   libpaths += ../lib
@@ -84,7 +84,7 @@ project(Navigation_stub) : ccm_stub   {
 }
 
 project(Navigation_exec) : ciao_executor   {
-
+  requires += dummy_label
   after   += Navigation_lem_stub Navigation_stub
   sharedname = Navigation_exec
   libs += Navigation_stub Navigation_lem_stub
@@ -112,7 +112,7 @@ project(Navigation_exec) : ciao_executor   {
 
 
 project(Navigation_svnt) : ciao_servant   {
-
+  requires += dummy_label
   after      += Navigation_lem_stub
   sharedname  = Navigation_svnt
   libs       += Navigation_stub Navigation_lem_stub
@@ -141,12 +141,12 @@ project(Navigation_svnt) : ciao_servant   {
   }
 }
 
-project (Navigation_client_test) : ciao_componentserver_stub, ccm_configvalue, ciao_cs_client, ciao_logger {
+project (Navigation_client_test) : ccm_configvalue, ciao_logger {
   after += Navigation_stub Navigation_svnt CIF_Common
   libpaths += ../lib
   libs += Navigation_stub CIF_Common
   includes += ..
-
+  requires += dummy_label
   IDL_Files {
   }