diff options
author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-18 18:25:47 +0000 |
---|---|---|
committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-18 18:25:47 +0000 |
commit | d757522706801933cacd2ac78935512fe4b8aebc (patch) | |
tree | c266a4648044d7355dd716f8ed512fa328d892d6 /CIAO/tests/CIF | |
parent | d4df18b69549e958fc5fa7703d3b7780cbb49d34 (diff) | |
download | ATCD-d757522706801933cacd2ac78935512fe4b8aebc.tar.gz |
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.
Diffstat (limited to 'CIAO/tests/CIF')
-rw-r--r-- | CIAO/tests/CIF/Common/CIF_Common.mpc | 3 | ||||
-rw-r--r-- | CIAO/tests/CIF/Navigation/Navigation.mpc | 16 | ||||
-rw-r--r-- | CIAO/tests/CIF/Receptacle/Receptacle.mpc | 16 |
3 files changed, 18 insertions, 17 deletions
diff --git a/CIAO/tests/CIF/Common/CIF_Common.mpc b/CIAO/tests/CIF/Common/CIF_Common.mpc index 4255b1d343c..5f985b5f264 100644 --- a/CIAO/tests/CIF/Common/CIF_Common.mpc +++ b/CIAO/tests/CIF/Common/CIF_Common.mpc @@ -1,8 +1,9 @@ // $Id$ -project (CIF_Common) : ciao_componentserver_stub, ccm_configvalue, ciao_cs_client, ciao_logger { +project (CIF_Common) : ccm_configvalue, ciao_logger { dynamicflags = CIF_COMMON_BUILD_DLL sharedname = CIF_Common + requires += dummy_label libout = ../lib IDL_Files { } 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 { } diff --git a/CIAO/tests/CIF/Receptacle/Receptacle.mpc b/CIAO/tests/CIF/Receptacle/Receptacle.mpc index 0b1180c5fc0..8dce83e4f82 100644 --- a/CIAO/tests/CIF/Receptacle/Receptacle.mpc +++ b/CIAO/tests/CIF/Receptacle/Receptacle.mpc @@ -1,7 +1,7 @@ // $Id$ project(Receptacle_idl_gen) : componentidldefaults { - + requires += dummy_label custom_only = 1 idlflags += -Wb,stub_export_macro=RECEPTACLE_STUB_Export \ -Wb,stub_export_include=Receptacle_stub_export.h \ @@ -16,7 +16,7 @@ project(Receptacle_idl_gen) : componentidldefaults { } project(Receptacle_lem_gen) : ciaoidldefaults { - + requires += dummy_label after += Receptacle_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=RECEPTACLE_LEM_STUB_Export \ @@ -29,7 +29,7 @@ project(Receptacle_lem_gen) : ciaoidldefaults { } project(Receptacle_lem_stub) : ccm_svnt { - + requires += dummy_label after += Receptacle_lem_gen Receptacle_stub libs += Receptacle_stub libpaths += ../lib @@ -56,7 +56,7 @@ project(Receptacle_lem_stub) : ccm_svnt { } project(Receptacle_stub) : ccm_stub { - + requires += dummy_label after += Receptacle_idl_gen libs += libpaths += ../lib @@ -84,7 +84,7 @@ project(Receptacle_stub) : ccm_stub { } project(Receptacle_exec) : ciao_executor { - + requires += dummy_label after += Receptacle_lem_stub Receptacle_stub sharedname = Receptacle_exec libs += Receptacle_stub Receptacle_lem_stub @@ -112,7 +112,7 @@ project(Receptacle_exec) : ciao_executor { project(Receptacle_svnt) : ciao_servant { - + requires += dummy_label after += Receptacle_lem_stub sharedname = Receptacle_svnt libs += Receptacle_stub Receptacle_lem_stub @@ -141,12 +141,12 @@ project(Receptacle_svnt) : ciao_servant { } } -project (Receptacle_client_test) : ciao_componentserver_stub, ccm_configvalue, ciao_cs_client, ciao_logger { +project (Receptacle_client_test) : ccm_configvalue, ciao_logger { after += Receptacle_stub Receptacle_svnt CIF_Common libpaths += ../lib libs += Receptacle_stub CIF_Common includes += .. - + requires += dummy_label IDL_Files { } |