diff options
Diffstat (limited to 'CIAO')
403 files changed, 8153 insertions, 13612 deletions
diff --git a/CIAO/CIAO-INSTALL.html b/CIAO/CIAO-INSTALL.html index 680b36d0f9c..b8298e6a907 100644 --- a/CIAO/CIAO-INSTALL.html +++ b/CIAO/CIAO-INSTALL.html @@ -86,7 +86,10 @@ <ul> <li> Open up <code>$ACE_ROOT/bin/MakeProjectCreator/config/default.features</code> - and set <code>cidl=1</code> and <code>boost=1</code>, each on its own line. + and set cidl=1. + <li> + Open up <code>$ACE_ROOT/bin/MakeProjectCreator/config/global.features</code> + and set boost=1. <li> Make sure you set cidl=1, boost=1, and exceptions=1 in <code>$ACE_ROOT/include/makeinclude/platfrom_macros.GNU</code>. <li> @@ -108,7 +111,10 @@ <li> If you have not created it already, create the file <code>%ACE_ROOT%/bin/MakeProjectCreator/config/default.features</code> and add <code>cidl=1</code> and <code>boost=1</code> to it, each on its own - line. + line. An easy way to do this is to copy the file <code>global.features</code> (in the + same directory) as <code>default.features</code> + and modify the appropriate lines in the new file, leaving everything else the + same. <li> Install the <a href="http://www.boost.org">Boost</a> libraries on your machine. For Windows, you can download either the diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc index baef8d92409..062f27d1462 100644 --- a/CIAO/CIAO_TAO_DAnCE.mwc +++ b/CIAO/CIAO_TAO_DAnCE.mwc @@ -4,7 +4,6 @@ workspace { $(ACE_ROOT)/ace $(ACE_ROOT)/apps/gperf/src - $(ACE_ROOT)/contrib/minizip $(ACE_ROOT)/ACEXML $(TAO_ROOT)/tao $(TAO_ROOT)/TAO_IDL diff --git a/CIAO/CIDLC/ExecutorMappingGenerator.cpp b/CIAO/CIDLC/ExecutorMappingGenerator.cpp index 369fbbaac02..c30f11ce59f 100644 --- a/CIAO/CIDLC/ExecutorMappingGenerator.cpp +++ b/CIAO/CIDLC/ExecutorMappingGenerator.cpp @@ -1940,7 +1940,7 @@ generate (CommandLine const& cl, if (swapping) { - os << "#include <CIAO_UpgradeableContext.idl>" << endl; + os << "#include <UpgradeableContext.idl>" << endl; } Traversal::TranslationUnit unit; diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2589ec2c963..89db2249a85 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,1095 +1,2559 @@ -Sun Jan 7 18:44:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Nov 6 17:48:56 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - No need to set members to 0 in destructor + * CIDLC/ServantHeaderGenerator.cpp: + * CIDLC/ServantSourceGenerator.cpp: - * DAnCE/RepositoryManager/URL_Parser.cpp: - Fixed conversion warning and memory leak - -Sun Jan 7 12:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/CCM_ClientContainerInterceptor.idl: - * ciao/CCM_ClientContainerInterceptorRegistration.idl: - * ciao/CCM_ContainerClientRequestInfo.idl: - * ciao/CCM_ContainerInterceptor.idl: - * ciao/CCM_ContainerRequestInfo.idl: - * ciao/CCM_ContainerServantRequestInfo.idl: - * ciao/CCM_ContainerServerRequestInfo.idl: - * ciao/CCM_ContainerStubRequestInfo.idl: - * ciao/CCM_ExtensionComponent.idl: - * ciao/CCM_ExtensionContext.idl: - * ciao/CCM_InvalidRegistration.idl: - * ciao/CCM_QoS.idl: - * ciao/CCM_ServantContainerInterceptor.idl: - * ciao/CCM_ServantContainerInterceptorRegistration.idl: - * ciao/CCM_ServerContainerInterceptor.idl: - * ciao/CCM_ServerContainerInterceptorRegistration.idl: - * ciao/CCM_StubContainerInterceptor.idl: - * ciao/CCM_StubContainerInterceptorRegistration.idl: - Added interfaces from QoS for CCM spec (OMG 06-04-15). We - don't have an implementation yet, just the interfaces at - this moment - -Fri Jan 5 12:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + Changed signature of generated ciao_push_event() method, + with additional typecode parameter, also added this arg + to a generated call to the CIAO Event Service version + of this method. - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Fixed conversion warnings +Thu Oct 26 14:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/URL_Parser.cpp: - Improved layout and documentation + * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: + Use ACE_OS methods, this fixes bugzilla 2691. + Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> + for reporting this issue -Wed Jan 3 19:32:05 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Wed Oct 25 14:54:03 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - * CIAO_TAO_DAnCE.mwc: + * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: + * CCF/CCF/CIDL/SemanticAction/Composition.hpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: + * CCF/CCF/IDL3/SemanticAction/Component.hpp: + * CCF/CCF/IDL3/SemanticAction/EventType.hpp: + * CCF/CCF/IDL3/SemanticAction/Home.hpp: - Added $(ACE_ROOT)/contrib/minizip since the RepositoryManager can - use minizip if the zlib feature is enabled. + Minor fixes and cleanups. -Wed Jan 3 07:01:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + * CCF/CCF/IDL2/Parsing/Recovery.hpp: + * CCF/CCF/IDL2/Parser.hpp: + * CCF/CCF/IDL2/Parser.cpp: + * CCF/CCF/CIDL/Parser.hpp: + * CCF/CCF/CIDL/Parser.cpp: + * CCF/CCF/IDL3/Parser.hpp: + * CCF/CCF/IDL3/Parser.cpp: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Fixed conversion warnings + Added syntax errors to every grammar rule. - * DAnCE/RepositoryManager/URL_Parser.cpp: - Initialise pointer with 0 +Wed Oct 25 11:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Wed Jan 3 16:18:36 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + * examples/Null_Component/StaticDAnCEApp.mpc: + Enabled this project in all builds - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: +Mon Oct 23 19:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Use the install base project instead of the deprecated core base - project. + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + Added missing CORBA::string_dup to fix crash with BCB -Thu Dec 28 12:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Fri Oct 20 06:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Doxygen improvements + * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: + Changed the HomeAttributes generation in such a way that it + also compiles with BCB6 -Mon Dec 25 16:19:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * examples/Null_Component/*: + New example, a component with just one interface. This can be used + to analyze the core footprint and see what we can reduce + Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> + for creating this example - * Merry Christmas everyone!!! +Thu Oct 19 23:22:49 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> -Wed Dec 20 06:37:27 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + * DAnCE/RepositoryManager/RepositoryManager.mpc + Modified this file to make sure RepositoryManager project is built + after minizip project. - * MPC/config/ciao_rtevent_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * ciao/CCM_Core.mpc: +Thu Oct 19 10:47:12 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> - Fixed linking errors on OS X. + * DAnCE/TargetManager/CmpClient.cpp + * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp + * examples/BasicSP/EC/controller.cpp + * examples/Display/RateGen/controller.cpp + * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp + Changed the naked atoi () to ACE_OS::atoi (), again thanks to Abdul + for reporiting this. -Wed Dec 13 08:35:48 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> +Wed Oct 18 14:00:04 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: + * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp + (parse_args): Changed the naked atoi() to ACE_OS::atoi(). + Thanks to Abdul for reporting this. - Fixed warnings on NoInterceptors_Core build related to - type conversion. +Wed Oct 18 12:05:00 UTC 2006 Simon Massey <sma@prismtech.com> -Wed Dec 13 07:57:02 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + * DAnCE/TargetManager/DomainDataManager.cpp + Removed warnings about unused local variables (line 186 & 558) - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: +Wed Oct 18 09:50:00 UTC 2006 Simon Massey <sma@prismtech.com> - Fixed a fuzz error. + * DAnCE/TargetManager/CmpClient.cpp + Removed warning about unused local variable (line 154) -Wed Dec 13 07:29:10 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> +Tue Oct 17 21:23:27 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: + * DAnCE/RepositoryManager/README + * DAnCE/RepositoryManager/RepositoryManager.mpc + * DAnCE/RepositoryManager/ZIP_Wrapper.cpp + * DAnCE/RepositoryManager/ZIP_Wrapper.h + Updated these files to use minizip under $ACE_ROOT/contrib/minizip. - Fixed Debian_GCC_4.0 compilation error by removing - unnecessary common for enum definition. +Tue Oct 17 13:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Wed Dec 13 07:19:13 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + * DAnCE/Plan_Launcher/Plan_Launcher.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + Several small layout changes and use ACE_ERROR for + errors - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: +Tue Oct 17 13:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Fixed a compilation error in Win2003_VC71_Versioned_Namespace - build by removing the unnecessary declaration. + * DAnCE/NodeApplication/RTNodeApp_Configurator.{h,cpp}: + Moved destructor implementation to cpp file -Wed Dec 13 06:45:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 17 13:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * examples/Swapping/Sender/Sender_exec.h: - Fixed include because of file name changes + * DAnCE/NodeManager/CIAO_Monitor.h: + Doxygen improvements -Tue Dec 12 20:55:02 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + * DAnCE/NodeManager/NAM_Map.{h,cpp}: + Made is_available a const method - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h: + * DAnCE/NodeManager/Node_Manager.cpp: + Use bool - Modified the ciao_push_event() in this base class to fix - BCC warnings. + * DAnCE/NodeManager/Node_Manager_Impl.cpp: + Use ACE_ERROR together with LM_ERROR -Tue Dec 12 20:21:03 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> +Tue Oct 17 12:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: + * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * DAnCE/NodeApplication/RTConfig_Manager.cpp: + Use ACE_ERROR together with LM_ERROR - Fixed the fuzz errors. + * DAnCE/NodeApplication/NodeApplication_Impl.inl: + Initialise pointers with 0 -Tue Dec 12 20:15:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/NodeApplication/Configurator_Factory.{h,cpp}: + * DAnCE/NodeApplication/Container_Impl.cpp: + * DAnCE/NodeApplication/NodeApplication_Core.cpp: + Use bool and const improvements, doxygen improvements - * ciao/CCM_Component.idl: - * ciao/CCM_Core.mpc: - * ciao/CCM_EventBase.idl: - * ciao/CCM_EventConsumerBase.idl: - * ciao/CCM_HomeConfiguration.idl: - * ciao/CCM_HomeConfigurator.idl: - * ciao/CCM_Object.idl: - * ciao/CCM_PrimaryKeyBase.idl: - * ciao/CCM_SessionComponent.idl: - * ciao/CCM_StateIdFactory.idl: - * ciao/Servant_Impl_Base.h: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl: +Mon Oct 16 19:52:15 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + Updated the re_launch_plan () function for Repoman integration. + + * DAnCE/RepositoryManager/README + * DAnCE/RepositoryManager/RepositoryManager.cpp + * DAnCE/RepositoryManager/RepositoryManager.mpc + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.h + * examples/BasicSP/RepoMan_Usage.html + Fixed some warnings on Liunx. + Fixed the "Deamon" typos. + +Mon Oct 16 15:11:40 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> + + * DAnCE/TargetManager/TM_Client.mpc: + Fixed the linking error in Mac and in FC5 Static + +Mon Oct 16 11:20:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc + BUILD CZAR. Due to the removal of + DAnCE/NodeApplication/NodeApp_Configurator.cpp to correct + the fuze error below, this "other" project's MPC needed to + be updated. (Why is this dependancy here?) + +Mon Oct 16 11:20:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * DAnCE/NodeApplication/NodeApp_Configurator.cpp + * DAnCE/TargetManager/DomainEvents.idl + BUILD CZAR. Removed Fuzz errors after no user action to correct. + +Mon Oct 16 08:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/ADD_Handler.cpp: + * tools/Config_Handlers/DP_Handler.cpp: + * tools/Config_Handlers/IDREF_Base.cpp: + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: + * tools/Config_Handlers/RT-CCM/PS_Handler.cpp: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp + * DAnCE/RepositoryManager/ + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: + Use ACE_ERROR together with LM_ERROR + + * RACE/Controller/Component/Controller.idl: + Changed some comments to doxygen style + + * DAnCE/RepositoryManager/PC_Updater_T.cpp: + Const change + + * DAnCE/RepositoryManager/RepositoryManager.cpp: + Layout changes + + * DAnCE/RepositoryManager/RM_Helper.cpp: + Use strcmp to compare two strings and several layout changes + + * DAnCE/RepositoryManager/RM_Helper.h: + * DAnCE/RepositoryManager/ZIP_Wrapper.h: + Doxygen changes + + * DAnCE/RepositoryManager/RMadmin.cpp: + Documentation changes + + * DAnCE/RepositoryManager/URL_Parser.{h,cpp}: + Use bool for debug_ + + * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: + Initialise pointers with 0 + +Mon Oct 16 08:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl: + Simplified this file by using the new ciao_static_dnc_app base + project. + +Fri Oct 13 17:57:12 2006 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> + + * docs/schema/SANet_Network.xsd + * docs/schema/Task_Map.xsd + + Added SA-POP schemas. + +Fri Oct 13 17:54:58 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> + + * DAnCE/TargetManager/TargetManager.mpc: + Addressed the problems coming up in Mac. Changed the project + inheritence of the TM Component. + +Fri Oct 13 17:43:29 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> + + * DAnCE/TargetManager/DomainDataManager.cpp: + Addressed an error in the last check-in. + +Thu Oct 12 17:36:58 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> + + * DAnCE/TargetManager/CmpClient.cpp: + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/DomainDataManager.cpp: * DAnCE/TargetManager/DomainEvents.idl: - Added remarks about compliance and another set of splitting - idl files in smaller ones + * DAnCE/TargetManager/TM_Client.mpc: + * DAnCE/TargetManager/TargetManager.idl: + * DAnCE/TargetManager/TargetManager.mpc: + * DAnCE/TargetManager/TargetManagerExt.idl: + * DAnCE/TargetManager/TargetManager_exec.h: + * DAnCE/TargetManager/TargetManager_exec.cpp: + Added the functionality to detect any add/delete to the Domain. + Added the feature to relay events to anyone interested for the above. - * ciao/CCM_Event.idl: - * ciao/CCM_Events.idl: - Renamed Event to Events + * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: + Changed the test script to test the above + +Fri Oct 13 16:51:49 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * docs/imgs/dance_arch.jpg: + * docs/imgs/static_dance_arch.jpg: + * docs/imgs/static_dance_impl.jpg: + + Fixed corrupted files. Thanks to Sowayan Abudullah + <abdullah dot sowayan at lmco dot com> + for reporting this. + +>>>>>>> .merge-right.r75088 +Tue Oct 10 19:13:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl: + Fixed compile error. + Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> + for reporting this. + +Tue Oct 10 17:56:51 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp + * DAnCE/NodeApplicationManager/Containers_Info_Map.h + Modify these files to get the artifacts names when using http reference. - * ciao/CCM_HomeConfigurator.idl: - * ciao/CCM_HomeConfiguration.idl: - Renamed Configurator to Configuration +Tue Oct 10 14:24:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Tue Dec 12 14:48:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: + Layout improvements, use ACE_ERROR with LM_ERROR + + * DAnCE/ExecutionManager/DAM_Map.cpp: + Const improvements + + * DAnCE/NodeApplicationManager/Containers_Info_Map.h: + Layout changes + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + Use ACE_ERROR with LM_ERROR + + * DAnCE/NodeApplicationManager/ImplementationInfo.h: + Documentation improvements + + * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: + Const improvements + + * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: + Const improvements + +Tue Oct 10 09:28:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/CCM_Base.idl: - * ciao/CCM_CCM2Context.idl: - * ciao/CCM_ComponentId.idl: - * ciao/CCM_Configurator.idl: + Removed a remark about RTF 1.1, method is now according to the spec + + * ciao/CCM_Component.idl: * ciao/CCM_Container.idl: - * ciao/CCM_Container_Ex.idl: - * ciao/CCM_Core.mpc: - * ciao/CCM_Entity2Context.idl: * ciao/CCM_Event.idl: - * ciao/CCM_ExecutorLocator.idl: - * ciao/CCM_HomeConfigurator.idl: - * ciao/CCM_SessionComponent.idl: - * ciao/CCM_SessionContext.idl: - * ciao/CCM_StandardConfigurator.idl: - * ciao/CCM_StateIdFactory.idl: - * ciao/Deployment_NodeApplication.idl: - Moved more interfaces to their own file - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - Removed virtual keywords, not needed + * ciao/Deployment.idl: + * ciao/Target_Data.idl + Updated some documentation and added some todos about things which + are CIAO specific + + * ciao/Server_init.cpp: + With LM_ERROR use ACE_ERROR + + * ciao/Dynamic_Component_Activator.{h,cpp}: + Removed some invalid comments and a mutex that was not used at all + + * ciao/Context_Impl_Base.h: + Documentation update + +Thu Oct 05 00:35:37 2006 William R. Otte wotte@dre.vanderbilt.edu + + * CIAO version 0.5.3 released. + +Wed Oct 4 08:12:24 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * NEWS: + + Updated with entries for the CIDL compiler work. + +Tue Oct 3 15:16:40 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * NEWS: + + Updated the NEWS to add the changes for Repoman and Plan_Generator + projects. + +Tue Oct 3 12:49:16 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> + + * NEWS: + + Updated the NEWS to add the changes for CoSMIC Quoter tutorial + +Mon Oct 2 09:28:58 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/index.html: + Corrected linked to OMG spec + +Mon Oct 2 08:58:58 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Const changes and improved some messages + Set the nodemanager in the static nodeapplication manager. + Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> + for reporting this. + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + Doxygen improvement + +Thu Sep 28 16:47:58 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher.mpc: + Added the base projects to Plan_Launcher_Impl project to include + required libs. Added null head files to the Plan_Launcher project to + remove the unnecessary dependency on other libs. + +Thu Sep 28 15:57:53 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher.mpc: + Fixed the "undefined reference" error on FC5_Static build. + + * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: + Modified this file to handle the possible RepoMan null reference error. + +Tue Sep 26 21:05:48 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + Fixed the "conversion from '_var' to 'CORBA::Object*'" warning. + +Tue Sep 26 15:52:12 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * docs/tutorials/Quoter/Simple/Broker/Broker.cidl: + * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl: + + Added missing semicolons. + +Mon Sep 25 23:19:15 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + Modified the fetch_reference_naming () to remove its arguments related + to Repoman. * DAnCE/Plan_Generator/PCVisitor.h: - * DAnCE/Plan_Generator/PCVisitorBase.h: - Doxygen changes + Adjusted the order of the data members of Plan_Generator_i class. - * tools/Config_Handlers/DynAny_Handler.mpc: - layout changes -Tue Dec 12 10:08:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Sep 25 19:46:37 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - * MPC/config/taoidl3toidl2defaults.mpb: - Moved from TAO to here + * DAnCE/Plan_Generator/Plan_Generator.mpc (project): Fixed the MPC + file by removing the "requires += RepositoryManager" as this + project, as well as other projects that depend on this, will not + be built unless RepositoryManager=1 is set. -Mon Dec 11 20:55:39 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> +Mon Sep 25 14:42:03 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - * ciao/CCM_Event.idl: + * DAnCE/Plan_Launcher/Plan_Launcher.mpc: Fixed the mpc file. - Modified the "ciao_push_event" operation to pass in "source_id", - which is used to identify the sources of the publisher ports to - support event filtering mechanism. +Mon Sep 25 13:06:05 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - * ciao/Deployment_Events.idl: + * CCF/CCF/IDL2/SemanticAction/Operation.cpp: + * CCF/CCF/IDL2/SemanticAction/Operation.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: + * CCF/CCF/CIDL/SemanticAction/Composition.cpp: + * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - Added new IDL definitions to support RTEC federation, such as - AddrServer, UDPSender, UPDReceiver, etc. + Move some operator<< operators to the global scope so that they + do not hide others. - * ciao/Deployment_NodeApplication.idl: +Sun Sep 24 21:06:07 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - Modified the "install_es" operation to install one service object - per invocation, instead of a sequence of objects. + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + Removed the unnecessary Repoman head file. - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: +Sat Sep 23 04:31:13 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.h + * DAnCE/RepositoryManager/RMadmin.cpp + * ciao/RepositoryManager.idl + Added the replace argument in installPackage () and createPackage () + functions and extend the functionalities of these two functions based + on the latest D&C spec. + +Sat Sep 23 04:07:59 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Generator + * DAnCE/Plan_Generator/PCVisitor.cpp + * DAnCE/Plan_Generator/PCVisitor.h + * DAnCE/Plan_Generator/PCVisitorBase.cpp + * DAnCE/Plan_Generator/PCVisitorBase.h + * DAnCE/Plan_Generator/PCVisitorBase.inl + * DAnCE/Plan_Generator/Plan_Generator.mpc + * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp + * DAnCE/Plan_Generator/Plan_Generator_Impl.h + * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h + Added these files which implement the Plan_Generator project. This + project is used to retrieve information from Repoman and generate/modify + DeploymentPlans based on different demands. + + * DAnCE/Planner + * DAnCE/Planner/Node_T.cpp + * DAnCE/Planner/Node_T.h + * DAnCE/Planner/Node_T.inl + * DAnCE/Planner/PCVisitor.cpp + * DAnCE/Planner/PCVisitor.h + * DAnCE/Planner/PCVisitorBase.cpp + * DAnCE/Planner/PCVisitorBase.h + * DAnCE/Planner/PCVisitorBase.inl + * DAnCE/Planner/Planner.cpp + * DAnCE/Planner/Planner.mpc + Deleted these files. The planner project has been replaced by the more + useful Plan_Generator project. + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + Modified these files. + + * DAnCE/Plan_Generator/PCVisitor.cpp + * DAnCE/Plan_Generator/PCVisitor.h + * DAnCE/Plan_Generator/PCVisitorBase.cpp + * DAnCE/Plan_Generator/PCVisitorBase.h + * DAnCE/Plan_Generator/PCVisitorBase.inl + Deleted these files. + Removed the Plan_Launcher's dependence on RepoMan. Use Plan_Generator + to retrieve information from Repoman and generate/modify DeploymentPlans. + +Fri Sep 22 09:27:25 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp: + * CCF/CCF/IDL2/SemanticGraph/Interface.cpp: + * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: + * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp: + * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: + * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: + * CCF/CCF/IDL2/SemanticGraph/String.cpp: + * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp: + * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: + * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp: + * CCF/CCF/IDL2/SemanticGraph/String.hpp: + * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp: + * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: + * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp: + * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp: + * CCF/CCF/IDL2/SemanticGraph/Name.cpp: + * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: + * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp.m4: + * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: + * CCF/CCF/IDL2/SemanticGraph/Array.hpp: + * CCF/CCF/IDL2/SemanticGraph/Name.hpp: + * CCF/CCF/IDL2/SemanticGraph/Union.cpp: + * CCF/CCF/IDL2/SemanticGraph/Native.hpp: + * CCF/CCF/IDL2/SemanticGraph/Union.hpp: + * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp: + * CCF/CCF/IDL2/SemanticGraph/Exception.hpp: + * CCF/CCF/IDL2/SemanticGraph/Translation.hpp: + * CCF/CCF/IDL2/SemanticGraph/TypeId.hpp: + * CCF/CCF/IDL2/SemanticGraph/Graph.hpp: + * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp: + * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp: + * CCF/CCF/IDL2/SemanticGraph/Member.hpp: + * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4: + * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp: + * CCF/CCF/IDL2/SemanticGraph/Literals.cpp: + * CCF/CCF/IDL2/SemanticGraph/Graph.tpp: + * CCF/CCF/IDL2/SemanticGraph/Literals.hpp: + * CCF/CCF/IDL2/SemanticGraph/Struct.hpp: + * CCF/CCF/IDL2/SemanticGraph/Module.hpp: + + * CCF/CCF/CIDL/SemanticGraph/Executor.cpp: + * CCF/CCF/CIDL/SemanticGraph/Composition.cpp: + * CCF/CCF/CIDL/SemanticGraph/Executor.hpp: + * CCF/CCF/CIDL/SemanticGraph/Composition.hpp: + + * CCF/CCF/IDL3/SemanticGraph/Component.cpp: + * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: + * CCF/CCF/IDL3/SemanticGraph/Component.hpp: + * CCF/CCF/IDL3/SemanticGraph/EventType.hpp: + * CCF/CCF/IDL3/SemanticGraph/Home.hpp: + + + Add file name and line information to every semantic + graph node. This information is used in diagnostics. + + + * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: + * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp: + + Adjust semantic actions interface to provide a way to derive + line numbers. + + + * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: + + * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: + * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp: + + * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: + * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: + + Propagate file name and line number from tokens to semantic + graph nodes. Use file and line numbers when printing error + messages. + + + * CCF/CCF/IDL2/Token.hpp: + * CCF/CCF/IDL2/Parser.hpp: + * CCF/CCF/IDL2/Parser.cpp: + + Fix a number of bugs in error handling and recover. + + + * CIDLC/cidlc.cpp: + + Use file name and line number when creating the translation + unit object. + + +Wed Sep 20 04:05:42 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> + + * docs\tutorials\CoSMIC\02.html + + Added some useful links to various resources to help readers reduce + learning curve.Added a small section that mentions that a Node Map file + has to be created in order to get Quoter example working. Again, + Thanks to Sowayan Abdullah from LMCO for his help in improving the + cosmic documentations. + + +Mon Sep 18 03:26:22 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Utils/XML_Helper.h + + Fixed compile error by removing extra ;. + +Fri Sep 15 21:28:47 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * ciao/Deployment_Core.idl + + Removed the unnecessary event type definition for RTEC since + they are no longer used. + +Sun Sep 10 09:20:18 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Utils/XML_Helper.cpp + * tools/Config_Handlers/Utils/XML_Helper.h + + Removed workaround from previous commit, as Ossama Othman has + provided the proper fix in the G++ macros. + +Fri Sep 8 00:28:27 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Utils/XML_Helper.cpp + * tools/Config_Handlers/Utils/XML_Helper.h + + Made the export declaration on the singleton typedef + contingent on a Microsoft compiler, as the GCC included + with FC5 was not defining the symbol as a result. + +Fri Sep 1 03:09:38 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> + + * docs\tutorials\CoSMIC\index.html + * docs\tutorials\CoSMIC\01.html + + Updated index.html to change the cosmic version.Updated 01.html + to reflect recent changes of idl_to_picml. Thanks to Sowayan Abdullah + from LMCO for his help in improving the cosmic documentations. + +Thu Aug 31 22:45:09 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/RepositoryManager/RepositoryManager.mpc + Modified this file to include $(CIAO_ROOT)/tools/Config_Handlers + in the RMAdmin project. + +Wed Aug 30 17:16:18 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + Added more changes to this file to fix the "reference to + ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex> + ::instance()'"warnings with FC5_Static build. + +Tue Aug 29 23:08:20 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + Fixed the "reference to `ACE_Singleton<CIAO::Config_Handlers + ::XML_Helper, ACE_Null_Mutex>::instance()'"warnings with + FC5_Static build. + + * DAnCE/RepositoryManager/RMadmin.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + Removed unnecessary using of CIAO::Config_Handlers::XML_Helper. + +Mon Aug 28 12:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Modified to accomodate the changes made above by adding only - one ciao event service object reference to the map. + * ciao/Container_Base.cpp: + Fixed some compile warnings with gcc 2.96 - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl: +Thu Aug 24 15:44:08 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - Removed the inheritance relationship between Consumer_Config and - Supplier_Config object. The reason why it was there is because - of a tightly coupled design long time ago. + * DAnCE/Plan_Launcher/Plan_Launcher.cpp + Changed some of the command-line options. - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h: + * examples/BasicSP/RepoMan_Usage.html + Made some minor changes. - Added a virtual function "ciao_push_event" and provides a - default implementation, which is essentially a no_op impl. +Thu Aug 24 000:41:16 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp: - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h: + * DAnCE/Plan_Launcher/PCVisitor.cpp + * DAnCE/Plan_Launcher/PCVisitor.h + * DAnCE/Plan_Launcher/PCVisitorBase.cpp + * DAnCE/Plan_Launcher/PCVisitorBase.h + Solved the "'class has virtual functions but non-virtual destructor" + warnings. - Modified the factory method "create" by passing in the - string identifier for the service object. +Wed Aug 23 17:57:15 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl: + * DAnCE/Plan_Launcher/PCVisitorBase.h + Solved the "invalid use of undefined type 'struct PCVisitorBase'" + warnings. - Added new operations to create gateways object to support - event channel federations. +Wed Aug 23 15:22:36 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: + * DAnCE/Plan_Launcher/PCVisitor.cpp + Solved the "unused parameter" warning. - Added the implementation and MPC files to support event - channel federations in CIAO_Event_Service. +Wed Aug 23 000:04:06 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + * DAnCE/RepositoryManager/README + Made some minor changes. + +Wed Aug 23 000:00:43 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * examples/BasicSP/descriptors/basicNodeDaemon.pl + Use "$ENV{'ACE_ROOT'}/bin" to point to the location of lib file. + +Tue Aug 22 23:47:06 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + Modified these files for RepoMan integration. + + * DAnCE/Plan_Launcher/PCVisitor.cpp + * DAnCE/Plan_Launcher/PCVisitor.h + * DAnCE/Plan_Launcher/PCVisitorBase.cpp + * DAnCE/Plan_Launcher/PCVisitorBase.h + * DAnCE/Plan_Launcher/PCVisitorBase.inl + Added these files for RepoMan integration. + + * examples/BasicSP/RepoMan_Usage.html + Added this file, which explains how to run the BasicSP example using + the integrated RepoMan. + +Mon Aug 21 15:19:25 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * examples/Hello/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: Fixed the + environment variable DANCE_ROOT to point to CIAO_ROOT/DAnCE. + +Thu Aug 17 16:09:09 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/RepositoryManager/Options.cpp + * DAnCE/RepositoryManager/RMadmin.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.h + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + Reimplemented the findNamesByType () and getAllTypes () operations + of Repository Manager, which use the newly generated + ACE_Hash_MultiMap_Manager class and its corresponding classes. + +Mon Aug 14 15:46:34 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Utils/XML_Helper.h + + Fixed a compile error for pedantic GCC4. + +Sun Aug 13 15:18:00 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * CCF/CCF/CodeGenerationKit/Regex.hpp: + + Reimplemented regex wrapper to allow building CIDLC on + platforms without wchat_t support (e.g., Cygwin/Mingw). + +Fri Aug 11 11:46:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * CCF/CCF/IDL2/SemanticGraph/Name.cpp: + * CCF/CCF/IDL2/SemanticGraph/Name.hpp: + + Added support for IDL (underscore) escaping. Added support + for custom name printers. + + * CIDLC/UnescapedNamePrinter.hpp: + + Name printer that prints names unescaped (without the IDL + underscore). + + * CIDLC/CxxNamePrinter.cpp: + * CIDLC/CxxNamePrinter.hpp: + + Name printer that escapes C++ keywords. + + * CIDLC/CorbaTypeNameEmitters.cpp: + * CIDLC/DescriptorGenerator.cpp: + * CIDLC/ExecImplHeaderGenerator.cpp: + * CIDLC/ExecImplSourceGenerator.cpp: * CIDLC/ServantHeaderGenerator.cpp: + * CIDLC/RepositoryIdGenerator.cpp: * CIDLC/ServantSourceGenerator.cpp: + * CIDLC/ExecImplGenerator.cpp: + * CIDLC/UtilityTypeNameEmitters.cpp: + * CIDLC/ServantGenerator.cpp: + * CIDLC/CompositionEmitter.cpp: - Automatically generate the implementation code of - ciao_push_event for component in the servant code. + Updated to handle IDL and C++ name escaping. This fixes + bugzilla bug #2427. - * DAnCE/NodeApplication/NodeApplication.cpp: +Fri Aug 11 07:30:35 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - Explicitly add the init_svcs() operation to the - NA component server implementation. We should figure - out a way to see whether we can avoid doing this at - this level. + * tools/Config_Handlers/Utils/XML_Helper.h + * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/NodeManager/Node_Manager.cpp: + Fixes for a compiler error in the version of GCC shipped with + FC5. - Enhanced NM to pass in service configuration file explicitly. - Also fixed a bug about controlling ORBDebugLevel. +Wed Aug 9 18:53:48 UTC 2006 Jaiganesh B <jai.dre.vanderbilt.edu> - * docs/schema/CIAOEvents.xsd: + * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: + DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: + examples/Hello/descriptors_RTCCM/rt-example.cdp: + examples/Hello/descriptors_RTCCM/rt-config-example.csr: - Enhanced the CIAOEvents schema to support event channel - federation configuration. + Fixed the RT-CCM code to conform to the schema changes. Made changes + to the descriptors directory to fix the working example for RT-CCM. - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: + Thanks to Nanbor Wang for helping fix the codebase. - Config handlers enhancement to support the above - schema changes. +Tue Aug 8 07:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: + * CIAO-INSTALL.html: + Removed vc6 info - Modified to use environment variables instead of relative paths. +Fri Aug 4 21:40:46 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Receiver/Receiver_exec.cpp: + * docs/tutorials/CoSMIC/01.html + * docs/tutorials/CoSMIC/02.html + * docs/tutorials/CoSMIC/03.html + * docs/tutorials/CoSMIC/04.html + * docs/tutorials/CoSMIC/style.css + * docs/tutorials/CoSMIC/index.html - Modified to explicitly print out the contents of the received msgs. + Style fixes, grammatical and spelling corrections, clarifications. - * examples/Hello/descriptors_events/ciao-events-example-collocated.ced: - * examples/Hello/descriptors_events/ciao-events-example-with-federation.ced: - * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced: - * examples/Hello/descriptors_events/ciao-events-example.ced: - * examples/Hello/descriptors_events/ciao-events-federation-mcast.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp.ced: - * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp: - * examples/Hello/descriptors_events/NodeManagerMap.dat: - * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat: - * examples/Hello/descriptors_events/rtec.conf: - * examples/Hello/descriptors_events/run_NodeDaemons.pl: - * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl: - * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl: +Thu Aug 3 20:38:39 UTC 2006 Nanbor Wang <nanbor (at) txcorp (dot) com> - Added a bunch of test cases for CIAO Event Service. + * DAnCE/NodeManager/NodeManager_Impl.cpp: + * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: -Fri Dec 8 22:59:14 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Fixed RT-CCM support. - * tools/tools.mwc: +Thu Aug 3 15:33:11 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - Added IDL3_to_IDL2 directory to the list. + * docs/cidlc.html: -Fri Dec 8 000:09:04 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Regenerated to include the -D and -I options. - * bin/generate_component_mpc.pl: +Wed Aug 2 18:52:14 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - Another typo found by Abdullah Sowayan <abdullah.sowayan@lmco.com>. + * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp: -Thu Dec 7 20:22:57 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Added option types: flag or value. - * bin/generate_component_mpc.pl: + * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp: + * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp: + * CCF/CCF/CodeGenerationKit/CommandLine.hpp: - Fixed bug that omits necessary space between items in 'after' - line, if it contains more than one item. Thanks to Abdullah - Sowayan <abdullah.sowayan@lmco.com> for reporting the bug. + Reimplemented to use hand-coded parser instead of Spirit. The + new implementation takes into account the option types. -Thu Dec 7 19:15:04 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp: + * CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp: - * bin/generate_component_mpc.pl: + Removed. - Fixed typo, had 'ciao_server_dnc', should have been - 'ciao_servant_dnc'. Thanks to Abdullah Sowayan - <abdullah.sowayan@lmco.com> for reporting the mistake. + * CIDLC/cidlc.cpp: + * CIDLC/ServantGenerator.hpp: + * CIDLC/ServantGenerator.cpp: + * CIDLC/DescriptorGenerator.hpp: + * CIDLC/DescriptorGenerator.cpp: + * CIDLC/ExecutorMappingGenerator.hpp: + * CIDLC/ExecutorMappingGenerator.cpp: + * CIDLC/ExecImplGenerator.cpp: + * CIDLC/ExecImplGenerator.hpp: -Thu Dec 7 19:04:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Updated with the option types. This fixes bugzilla bug #2426. - * tools/Config_Handlers/DynAny_Handler.mpc: - Removed taolib and anytypecode base projects, since they are - already pulled in by typecodefactory. +Fri Jul 28 17:53:57 UTC 2006 Boris Kolpackov <boris@kolpackov.net> -Thu Dec 7 13:47:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * CCF/CCF/IDL2/SemanticGraph/Translation.cpp: - * DAnCE/DomainApplicationManager/Deployment_Configuration (init): - Use ACE_Read_Buffer to read the file and parse it contents. This way - we are independent of a fixed buffer length, especially on systems - with multiple network cards and IPv6 enabled the IORs can get huge. + Reimplemented a chunk of code that resulted in what appears to + be invalid code generation by the Intel C++ compiler. This + fixes bugzilla bug #2387. -Thu Dec 7 11:48:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Jul 27 18:08:47 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * ciao/CCM_Core.mpc: - * MPC/config/ciao_server_dnc.mpb: - Don't build DnC server with minimum corba and CORBA/e, this was - disabled in the past implicitly because we used security as - MPC base project but because that has been removed we now - have to explicitly disable this project + * CIAO_TAO.mwc + * CIAO_TAO_DAnCE.mwc -Thu Dec 7 11:34:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Replaced relative references to ACE/TAO with absolute references + using environment variables. - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - Added some todo's, check whether the narrow on the NamingContext - did succeed, use CORBA::ULong for the sequence index +Mon Jul 24 15:45:34 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Use a CORBA::String_var to store the uuid string + * Subversion conversion completed at revision 73730 - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Added some todo's, check whether the narrow on the NamingContext - did succeed, layout changes, fixed bugzilla bug 2729, thanks to Abdul - for reporting that. +Sun Jul 23 15:44:43 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - Doxygen improvements + * Repository frozen for repository conversion -Wed Dec 6 11:26:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Sat Jul 22 21:34:57 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - * ciao/CIAO_ServerResources.idl: - * ciao/Deployment_NodeApplicationManager.idl: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeManager/MonitorCB.h: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/TargetManager/DomainDataManager.h: - * tools/Config_Handlers/DD_Handler.h: - Doxygen documentation updates + * ciao/Container_Base.cpp - * MPC/config/ciao_container_dnc.mpb: - * ciao/CCM_Core.mpc: - Added avoids_corba_e_compact as base project + Fixed a runtime Segfault bug about destroying POA. The problem + is because a Session_Container creates 2 POAs, one of which is called + facet_cons_POA which uses the Servant_Activator policy to activate component + ports (facets, consumers) on demand, then the Servant_Activator object + was deleted when the Session_Container object is out of scope in its + destructor. But when the ORB finally shuts itself down, it tries + to clean all the resources including the facet_cons_POA, since the + Servant_Activator attached to this POA is long gone, a segfault + occurs in the cleaning up phase. The right fix is to destroy all the POAs + associated with this Session_Container in its destructor together with the + Servant_Activator. Thanks Phlip <phlip2005 @ gmail.com> for a + bug report. -Tue Dec 5 11:45:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Jul 20 22:03:31 UTC 2006 Nanbor Wang <nanbor (at) txcorp (dot) com> - * ciao/CCM_Core.mpc: - * MPC/config/ciao_container_dnc.mpb: - Don't build Dnc_Container with corba/e compact has been enabled + * docs/schema/ServerResourceUsage.txt: Revised the document to + change how a policy set should be hooked into a component + instance. This needs to be changed to reflect recent changed in + DnC schema. - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - Simplified this MPC file +Thu Jul 20 01:10:58 UTC 2006 Vipul Singh <vipuls@dre.vanderbilt.edu> -Mon Dec 4 12:14:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/RepositoryManager/PC_Updater.cpp: Removed the variable name + from the arguments in function definition in empty functions to + fix warnings. - * MPC/config/*: - All CIAO base projects are moved from - ACE_wrappers/bin/MakeProjectCreator/config to this directory + * DAnCE/RepositoryManager/RepositoryManager_Impl.h: Changed declaration + at a few places from const static to static const to fix a few + warnings, also removed an unnecessarily defined namespace. -Mon Dec 4 12:35:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: Made a few + changes to fix the warnings and to keep the code in sync with + the changes made to RepositoryManager_Impl.h. Fixed code which + passed non POD types to a varargs function(ACE_DEBUG) which + resulted in aborts at runtime. - * DAnCE/TargetManager/TM_Client.mpc: - Simplified this file using more base projects + * DAnCE/RepositoryManager/URL_Parser.cpp: Assigned value to ptr before + if condition to fix a few warnings. -Mon Dec 4 12:29:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jul 19 08:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/TargetManager/DomainDataManager.h: - Documentation changes + * tools/Config_Handlers/Config_Handlers.mpc: + Use exceptions as base project - * DAnCE/TargetManager/TargetManager.mpc: - Simplified this file using more base projects +Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> -Mon Dec 4 12:24:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * MPC - * MPC/config - New directory for the base projects specifically for CIAO + Use new ACE_CString::size_type type to hold string + position/index value, instead of "int". Addresses "comparison + between signed and unsigned" warnings. -Mon Dec 4 12:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Sat Jul 15 04:21:13 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Use include from CIAO_ROOT and removed using namespace + * DAnCE/RepositoryManager/README.txt: + Remove this file. - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - Simplified this file + * DAnCE/RepositoryManager/README: + Add this file. -Mon Dec 4 11:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Jul 13 18:42:08 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * DAnCE/ExecutionManager/ExecutionManager.mpc: - Simplified by using the base projects + * DAnCE/RepositoryManager/RM_Helper.h: + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: + Fixed a minor error. -Mon Dec 4 11:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jul 12 14:00:59 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - Converted the NodeApplication into a library and build - an exe using this library. Will prevent duplicate compilation - of part of the code. Fixes bugzilla bug 2739. + * DAnCE/RepositoryManager/RM_Helper.cpp: + Fixed the "comparison between signed and unsigned integer" warning. - * DAnCE/NodeApplication/CIAO_NodeApplication_export.h: - New export file: +Tue Jul 11 23:19:58 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + * DAnCE/RepositoryManager/RM_Helper.h: + * DAnCE/RepositoryManager/RM_Helper.cpp: + * DAnCE/RepositoryManager/RMadmin.cpp: + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: + Fixed the "conversion from '__int64' to 'size_t', possible loss + of data" warnings. - * DAnCE/NodeApplication/Configurator_Factory.h: - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Core.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Added export macro to export the class from the new NodeApplication - library. +Sun Jul 09 06:01:14 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/NodeApplication/NodeApplication.mpc: - Added new library project and use this in the executable. + * CIAO version 0.5.2 released. - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - Use the new NodeApplication library and the new base projects - I added for CIAO +Wed Jul 5 15:31:18 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{h,cpp,inl}: - Moved destructor from inline to cpp method and small code improvements + * NEWS + Updated the NEWS file to add the changes of Repoman. - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - Simplified by using the new base projects +Tue Jul 4 11:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Small improvements + * ciao/Home_Servant_Impl_T.cpp: + * ciao/Dynamic_Component_Servant_T.cpp: + * ciao/Swapping_Servant_Home_Impl_T.cpp: + Fixed compile problems with VxWorks 5.5.1 and GCC 2.96 -Mon Dec 4 07:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jul 4 06:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * CIAO-INSTALL.html: - Updated build instructions + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: + Don't build this project in the ace_for_tao configuration - * ciao/Dynamic_Component_Activator.cpp: - Removed not needed return statements in a void method +Mon Jul 3 16:20:54 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * ciao/Dynamic_Component_Activator.h: - Changed guard in file to match filename + * NEWS - * ciao/Home_Servant_Impl_T.cpp: + Updated the NEWS file. + +Tue Jun 27 13:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/RepositoryManager/RM_Helper.cpp: Layout changes - * ciao/Port_Activator.{h,cpp}: - The name methods did really change oid, so renamed name - to oid and added a new name method to return the name - member +Fri Jun 23 13:45:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * ciao/Servant_Activator.cpp: - Const changes and updated for Port Activator changes + Added $(TAO_ROOT) to the 'includes' line of the executable + project, due to a change in the way TAO/Version.h is + included. - * ciao/Servant_Impl_Base.cpp: - Small code improvements +Thu Jun 22 18:47:47 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Const changes + * ciao/Dynamic_Component_Servant_T.cpp: + * ciao/Dynamic_Component_Servant_T.h: + * ciao/Swapping_Servant_Home_Impl_T.cpp: + * ciao/Swapping_Servant_Home_Impl_T.h: - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + Made changes to template code corresponding to those in + + Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + +Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ciao/Home_Servant_Impl_T.cpp: + * ciao/Home_Servant_Impl_T.h: + * ciao/Servant_Impl_T.cpp + * ciao/Servant_Impl_T.h: + + Reduced the number of template parameters in + the component servant and home servant template + base classes. + + * CIDLC/ServantHeaderGenerator.cpp: + * CIDLC/ServantSourceGenerator.cpp: + + Changes to generated servant code corresponding + the the changes in servant base class code + described above. + +Thu Jun 15 20:13:02 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/IDL3_to_IDL2/be_helper.cpp: + + Uncommented code that outputs our copyright notice. This + change also elinates an unused arg warning for the + copyright notice string. + + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + + Added a newline after opening the file for better readability. + +Thu Jun 15 18:37:43 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: + + Added ciao_deployment_stub as a base project for + CIAO_Events_Handlers, to eliminate 'unresolved symbol' + linking errors. Thanks to Ming Xiong <ming.xiong@vanderbilt.edu> + for suggesting the fix. + +Thu Jun 15 15:10:58 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/IDL3_to_IDL2/be_extern.h: + * tools/IDL3_to_IDL2/be_init.cpp: + * tools/IDL3_to_IDL2/be_produce.cpp: + + Changes to keep this backend in sync with changes to the + TAO_IDL front end - see TAO ChangeLog entry of a few + minutes ago. + +Thu Jun 8 16:07:05 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ciao/Servant_Impl_Utils_T.cpp (describe_multiplex_receptacle): + + Fixed an error in instantiation of a + Components::ConnectionDescription valuetype - the actual + constructor call should have been on the OBV_* subclass. + +Thu Jun 8 12:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/Planner/PCVisitor.cpp: + Fixed parameter never used warnings + +Wed Jun 7 21:39:00 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc + + Removed unneeded base projects. + +Wed Jun 7 21:07:11 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ciao/Servant_Impl_Utils_T.cpp: + + Fixed CORBA memory management rule violations in + Servant_Impl_Base static template methods + describe_pub_event_source(), describe_simplex_receptacle() and + describe_multiplex_receptacle(). Thanks to Phlip + <phlip2005@gmail.com> for reporting a problem in + get_all_receptacles() that uncovered the above violations. + +Wed Jun 7 16:52:45 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Config_Handlers.mpc + + Fix for linking error in Visual Studio. + +Wed Jun 7 06:04:45 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * CIDLC/ExecutorMappingGenerator.cpp + + Modified to generate an include of CCM_Container.idl. + + * ciao/Components.idl + * ciao/ComponentsC.h + * ciao/ComponentsS.h + + Changed Components.idl to include CCM_Component.idl instead of + CCM_Container.idl. This removes a dependancy on the container + library for stub projects. + + Note this commit may be rolled back later based on discussions + on the dance-dev list, I am making it preemptively to resolve + scoreboard problems. + +Tue Jun 6 20:32:53 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/Property_Handler.h + + Compile fixes for Borland. + + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/XMLSchema/Writer.hpp + + Fixes for Borland ICEs. + +Tue Jun 6 13:48:59 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Config_Handlers_Common_Export.h + + Missing file from previous commit. + +Mon Jun 5 20:34:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/RepositoryManager/RepositoryManager.mpc + * DAnCE/TargetManager/TM_Client.mpc + * RACE/Controller/Component/Controller.mpc + * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc + * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc + * examples/BasicSP/BasicSP.mpc + * examples/BasicSP/BMClosedED/BMClosedED.mpc + * examples/BasicSP/BMDevice/BMDevice.mpc + * examples/BasicSP/BMDisplay/BMDisplay.mpc + * examples/BasicSP/EC/EC.mpc + * examples/Display/Display_Base/Display_Base.mpc + * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc + * examples/Hello/Hello_Base/Hello_Base.mpc + * examples/Hello/Receiver/Receiver.mpc + * examples/Hello/Sender/Sender.mpc + * examples/Swapping/Hello_Base/Hello_Base.mpc + * examples/Swapping/Receiver/Receiver.mpc + * examples/Swapping/Sender/Sender.mpc + * performance-tests/Protocols/common/Protocols.mpc + * tests/Bug_2130_Regression/interfaces/ENW.mpc + * tests/CIDL/CodeGen/CodeGen.mpc + * 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 + * tests/Minimum/Minimum_Base/Minimum.mpc + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + + Fixes for linking errors/warnings in OS X. + + * tools/Config_Handlers/Any_Handler.h + * tools/Config_Handlers/CEPE_Handler.h + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/DataType_Handler.h + * tools/Config_Handlers/ERE_Handler.h + * tools/Config_Handlers/Req_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.h + + Factored certain elements used by both the deployment + and packaging handlers into a seperate library, also + fixes for linking errors in OS X. + +Fri Jun 2 18:55:41 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/Config_Handlers/Config_Handlers.mpc: + * DAnCE/TargetManager/TargetManager.mpc: + * DAnCE/TargetManager/TM_Client.mpc: + + Shortened long lines. + +Fri Jun 2 12:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * rules.ciao.GNU: + Added setting of TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP when + they are not set, needed for cross compilation + +Thu Jun 1 21:23:51 UTC 2006 <ming.xiong@vanderbilt.edu> + + * examples/Hello/descriptors/run_test.pl + Changed the codes so that it will correctly destroy all + running processes upon failure. + +Thu Jun 1 16:03:26 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * DAnCE/Planner/Planner.cpp: + + Added global qualifier (double colon) to the specialization + and typedef of the planner's Node class, to avoid an + 'ambiguous symbol' error in VC8, which is presumably confusing + it with Deployment::Node. + +Thu Jun 1 15:49:47 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Planner/Node_T.h + * DAnCE/Planner/Planner.cpp + + Modified some minor errors. + +Thu Jun 1 12:55:07 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/Display/NavDisplay/NavDisplay.mpc: + + Fixed typo. + +Wed May 31 18:46:37 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/Display/NavDisplay/NavDisplay.mpc: + + Added 'libs += Display_Base_stub' to the + Display_Base_NaviDisplay_stub project so that VC8, with its + parallel builds, will know about the dependency that VC7.1 + seems to get from the 'after' line. + +Wed May 31 18:17:11 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * DAnCE/TargetManager/TM_Client.mpc: + + Cosmetic changes. + +Wed May 31 17:08:17 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Planner/Planner.mpc + * DAnCE/Planner/Planner.cpp + + Removed the generated file of Repoman (RepositoryManagerDaemonC.*) + included in the Planner project and use the RepositoryManagerC.*. + +Wed May 31 16:49:12 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> + + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + + Made some minor changes. + +Tue May 30 10:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/NodeManager/MonitorController.cpp: + Fixed typo + +Tue May 30 06:16:58 UTC 2006 Boris Kolpackov <boris@kolpackov.net> + + * tools/Config_Handlers/XSCRT/Elements.hpp: + + Added a fix for Sun C++ <= 5.7 template instantiation issue. + +Tue May 30 00:00:22 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/Planner/Node_T.h: + * DAnCE/Planner/Node_T.inl: + * DAnCE/Planner/Node_T.cpp: + * DAnCE/Planner/PCVisitor.h: + * DAnCE/Planner/PCVisitor.cpp: + * DAnCE/Planner/PCVisitorBase.h: + * DAnCE/Planner/PCVisitorBase.inl: + * DAnCE/Planner/PCVisitorBase.cpp: + * DAnCE/Planner/Planner.mpc: + * DAnCE/Planner/Planner.cpp: + + Checking in the Planner for DAnCE which creates a Deployment + Plan on the fly (in-memory). + + * RACE/Input_Adapters/LocationUpdater/Injector.cpp: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h: + * RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h: + * RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable: + * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h: + * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl: + * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp: + * RACE/Input_Adapters/LocationUpdater/PlanUpdater.h: + * RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp: + * RACE/Input_Adapters/LocationUpdater/README.txt: + + Adding the LocationUpdater which is a RACE input adapter which + updates the locations of the implementation artifact to reclect + the ones available in the RepositoryManager. Please see the README + and the code for more info. + + * RACE/Input_Adapters/PlanGenerator/Injector.cpp: + * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h: + * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl: + * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h: + * RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h: + * RACE/Input_Adapters/PlanGenerator/README.txt: + + Adding the PlanGenerator which is a RACE input adapter which queries + the RepositoryManager for an installation name, retrieves the corresponding + PackageConfiguration, and builds the DeploymentPlan on the fly. Please see + the README and the code for more info. + +Mon May 29 21:58:18 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + + Got rid of the code that updates the loader path for the + libraries downloaded via HTTP. Now this has to be done + manually. + + * DAnCE/RepositoryManager/PC_Updater.cpp: + * DAnCE/RepositoryManager/README.txt: * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Throw NO_MEMORY when allocation fails - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - Throw BAD_PARAM when an incorrect method parameter has been passed + Changing the way library names are matched to be more general. + Some additions to the README + A minor change to one of the functions - * DAnCE/NodeManager/BaseMonitor.h: - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/NodeManager_Impl.h: - Doxygen changes +Mon May 29 19:07:54 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Fixed a comment + * DAnCE/NodeApplication/Configurator_Factory.cpp: + * DAnCE/NodeManager/MonitorController.cpp: + * examples/Swapping/Sender/Sender_exec.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - Use true/false for bool + Changed C-style casts from void* to pointer-to-function + to two-step reinterpret_cast<>s, with ptrdiff_t as a + temporary intermediate. C++ forbids casting directly + between pointer-to-object and pointer-to-function, and + some the newer compilers are catching it. - * DAnCE/TargetManager/DomainDataManager.cpp: - Layout changes +Mon May 29 17:44:01 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * DAnCE/TargetManager/TargetManager_exec.cpp: - Removed not needed includes, made messages dependent - on the debug level, added missing duplicate + * examples/Display/Display_Base/Display_Base.mpc: - * DAnCE/TargetManager/TargetManager_exec.h: - Don't use std:: for auto_ptr + Changed the base project of Display_Base_stub from + ciao_client_dnc to ciao_events_base_dnc, in order to pull + in a needed dependency on CIAO_DnC_Container. Thanks to + Ming Xiong <mxiong@dre.vanderbilt.edu> for supplying the + fix. - * DAnCE/TargetManager/TargetManagerExt.idl: - Removed commented out include +Mon May 29 15:32:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * DAnCE/TargetManager/TargetManagerImpl.idl: - Removed empty lines + * examples/Display/NavDisplay/NavDisplay.mpc: - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl: - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - * examples/Display/descriptors/basicNodeDaemon.pl: - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_NodeDaemons.pl: - Use $ACE_ROOT/bin with use lib. This fixes bugzilla bug 2737, - thanks for Abdul for reporting this. + Cosmetic changes (shortened long lines). - * docs/tutorials/Quoter/Simple/01.html: - Update from Abdul + * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: -Fri Dec 1 16:27:34 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Changed 'after +=' and 'libs +=' lines to reflect recent + changes to other examples/Display projects. - * bin/generate_component_mpc.pl: +Fri May 26 13:57:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - Fixed generation of export files. Thanks to Abdullah - Sowayan <abdullah.sowayan@lmco.com> for reporting - the problem. + * DAnCE/RepositoryManager/RMAdmin.cpp(ACE_TMAIN): -Fri Dec 1 13:39:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Fixed unused variable warning, cosmetic changes. - * docs/tutorials/CoSMIC/index.html: - * docs/tutorials/Quoter/Simple/index.html: - Updated download location of ACE/TAO/CIAO +Fri May 26 12:59:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> -Fri Dec 1 11:26:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/NodeManager/NAM_Map.cpp: + Make the equality test explicit to work with the revised octet + sequence implementation. - * DAnCE/ExecutionManager/Execution_Manager.cpp: - Fixed invalid check whether we have a nil POA or not +Thu May 25 19:02:52 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> -Fri Dec 1 11:17:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ciao/Container_Base.cpp(ciao_install_home): - * DAnCE/TargetManager/Deployment_Configuration.{h,cpp}: - Removed these files, not used in the mpc file + Changed the single-step reinterpret_cast of the component + DLL entry points to be a two-step process: first to the + integer type 'ptrdiff_t' then to the desired pointer-to- + function type. A single cast won't work because casting + from pointer-to-object (even void*) to pointer-to-function + directly is not allowed in C++. - * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}: - Close the file handle, part of the fix for bugzilla bug 2733 +Thu May 25 11:50:39 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * DAnCE/TargetManager/DomainDataManager.{h,cpp}: - Const changes, sequences have a CORBA::ULong as length, not int. - Added some todo's and use a little bit more ACE + * ciao/Container_Base.cpp: + Replace the use of static_cast in ciao_install_home with + reinterpret_cast since void* sources are involved. - * DAnCE/TargetManager/TargetManager.cidl: - Removed empty line +Wed May 24 17:35:53 UTC 2006 Nanbor Wang <nanbor@exothermic.txcorp.com> - * DAnCE/TargetManager/TargetManager_exec.cpp: - Fixed memory management and the way we check for a nil - reference + * examples/Display/RateGen/RateGen.mpc: Fixed the project + dependency for controller. -Fri Dec 1 09:01:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue May 23 22:46:58 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - * bin/generate_component_mpc.pl: - Layout improvements, thanks to Abdul for making this - update. + * DAnCE/RepositoryManager/Options.cpp + * DAnCE/RepositoryManager/Options.h + * DAnCE/RepositoryManager/RMadmin.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.h + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + * DAnCE/RepositoryManager/RepositoryManager.cpp -Thu Nov 30 12:45:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Added the code to save the state of the RepoMan at exit and + load the state of it at start. - * DAnCE/ExecutionManager/Execution_Manager.cpp: - Removed not needed ACE_TRY_CHECK +Tue May 23 14:31:11 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - Const improvement + * DAnCE/RepositoryManager/Options.cpp + * DAnCE/RepositoryManager/Options.h + * DAnCE/RepositoryManager/RMadmin.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + * DAnCE/RepositoryManager/RepositoryManager.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Initialise pointer with 0, removed code after return - added added a todo + Added the naming service & the implementation of createPackage + function to RepoMan. - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Doxygen improvement +Mon May 22 18:49:14 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - Lot of layout changes to make the code a little bit more - readable, more has to be done to this file + * ciao/Container_Base.cpp(ciao_install_home): + + Changed C-style casts of DLL entrypoints to static_cast<>s + to the appropriate pointer to function. This change is + intended to eliminate warnings from gcc 4.0. + +Fri May 19 16:49:32 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + * DAnCE/NodeApplicationManager/URL_Parser.cpp: + * DAnCE/NodeManager/Node_Manager.cpp: + + Minor changes to eliminate scoreboard warnings, and to bring + code in line with the ACE style guidelines. + +Thu May 18 20:28:00 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com> + + * examples/Display/GPS/GPS_Impl.ccd: + * examples/Display/NavDisplay/NavDisplay_Impl.ccd: + * examples/Display/RateGen/RateGen_Impl.ccd: + + Removed these generated files from CVS. + +Thu May 18 11:28:52 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + + * examples/Display/Display_Base/GNUmakefile: + * examples/Display/Display_Base/GNUmakefile.Display_Base_stub: + * examples/Display/Display_Base/GNUmakefile.Display_Base_svnt: + + Removed these files from CVS. + +Wed May 17 21:20:46 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com> + + * TAO/CIAO/examples/Display: + Ported the Display example to use the new CIAO framework + + +Tue May 16 12:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * README: + Removed mentioning of vc6 + +Mon May 15 20:48:52 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * CIDLC/ServantSourceGenerator.cpp (generate): + + Removed commented-out code. + + * CIDLC/ServantHeaderGenerator.cpp (generate_facets): + + Fixed cut-and-paste error that was causing facet servant + class declaration to get skipped when the composition is + defined inside one or more IDL modules. + +Fri May 12 07:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/Utils/Functors.h: + Added a workaround for specific for BCB6, should fix the gcc4 + internal compiler errors + +Fri May 12 07:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/XSCRT/Elements.hpp: + The work around is needed for < gcc 3.3 and also BCB6, so make + it a little bit more easier to handle this. + +Thu May 11 21:24:45 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * CIDLC/Literals.cpp: + * CIDLC/Literals.hpp: + * CIDLC/ServantHeaderGenerator.cpp: + * CIDLC/ServantHeaderGenerator.hpp: + * CIDLC/ServantSourceGenerator.cpp: + * CIDLC/ServantSourceGenerator.hpp: + * CIDLC/UtilityTypeNameEmitters.cpp: + * CIDLC/UtilityTypeNameEmitters.hpp: + + Change code generation for facet servant classes to be + defined in a special namespace created from a prefix + and a flattened version of the name of the scope + containing the interface that supports the facet. This + change enables facets in the same translation unit + using the same interface to use a single source code + definition (an internal check in the CIDL compiler + guarantees that the facet servant class is generated + once per interface per translation unit). The fact + that the actual facet servant class type is an instantiation + of a template class ensures that the same interface type + used as a facet in multiple translation units in a build + will not produce multiple-definition link errors, + although in this case there will be duplicated code. + Thanks to James Hill <j.hill@vanderbilt.edu> for providing + the multiple-facet-single-translation-unit use case + and to Nanbor Wang <nanbor@txcorp.com> for his comments + on the proposed solution. + +Wed May 10 14:04:57 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/NodeManager/MonitorCB.cpp + * DAnCE/TargetManager/CmpClient.cpp + * DAnCE/TargetManager/DomainDataManager.cpp + + Fixes for warnings. + +Mon May 8 20:41:43 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * bin/PerlCIAO/perlciao.mpc: + + Fixing a fuzz build error due to a missing Id tag + +Mon May 8 15:33:58 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/RepositoryManager/HTTP_Client.h: + * DAnCE/RepositoryManager/HTTP_Client.cpp: + * DAnCE/RepositoryManager/HTTP_Handler.h: + * DAnCE/RepositoryManager/HTTP_Handler.cpp: + * DAnCE/RepositoryManager/Options.h: + * DAnCE/RepositoryManager/Options.cpp: + * DAnCE/RepositoryManager/PC_Updater.h: + * DAnCE/RepositoryManager/PC_Updater.cpp: + * DAnCE/RepositoryManager/PC_Updater_T.h: + * DAnCE/RepositoryManager/PC_Updater_T.cpp: + * DAnCE/RepositoryManager/README.txt: + * DAnCE/RepositoryManager/RM_Helper.h: + * DAnCE/RepositoryManager/RM_Helper.cpp: + * DAnCE/RepositoryManager/RMadmin.cpp: + * DAnCE/RepositoryManager/RepositoryManager.cpp: + * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl: + * DAnCE/RepositoryManager/RepositoryManager_Impl.h: + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: + * DAnCE/RepositoryManager/URL_Parser.h: + * DAnCE/RepositoryManager/URL_Parser.cpp: * DAnCE/RepositoryManager/ZIP_Wrapper.h: - Doyxgen improvements and removed not needed include + * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - * DAnCE/TargetManager/CmpClient.cpp: - Use true/false for a bool + Updating the RepositoryManager with the latest changes from the + escher repository. Adding my newest changes. Adding some new + minor features. + + * bin/PerlCIAO/TestUtils.base: + * bin/PerlCIAO/TestUtils.pm: + * bin/PerlCIAO/TestUtils_Base.pm: + * bin/PerlCIAO/generate_container.pl: + * bin/PerlCIAO/perlciao.mpc: + + This is a set of test utilities tailored towards testing CIAO components. + It provides a nice and quick interface provising the common functionality + necessary to run a CIAO test and perform clean-up on failure. This utils + are a wrapper around the $ACE_ROOT/bin/PerlACE/ utilities. I will check in + an example of how test utils are used shortly. + + * tools/Config_Handlers/IDD_Handler.cpp: + + Fixing a bug in the PackageConfiguration reverse handler. + + +Fri May 5 15:36:47 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> + + * docs/cidlc.html Added documentation for the CIDL compiler. + Thanks to Boris for contributing this. + + * docs/index.html: Fixed some broken links to the tutorials and added + a link to Ming's tutorial example that shows how to use CoSMIC. + +Fri May 5 16:58:17 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/ExecutionManager/Execution_Manager.cpp (CIAO): Fixed the + parsing of command line options. + +Thu May 4 21:35:01 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/ADD_Handler.cpp + * tools/Config_Handlers/DP_Handler.cpp + + Fixed a reverse handler bug. + +Thu May 4 08:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/RepositoryManager/PC_Updater.cpp: + Fixed compilation error - * DAnCE/TargetManager/Deployment_Configuration.cpp: - Use bool and use 0 instead of NULL +Wed May 3 22:11:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/schema/Basic_Deployment_Data.xsd + * docs/schema/ccd.xsd + * docs/schema/cdd.xsd + * docs/schema/cdp.xsd + * docs/schema/cid.xsd + * docs/schema/cpd.xsd + * docs/schema/iad.xsd + * docs/schema/pcd.xsd + * docs/schema/toplevel.xsd + + Schema propagated from the ARMS repo. + +Wed May 3 12:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * Config_Handlers/Utils/Functors.h: + Made the FUNC argument just return void, this fixes the errors with this + template with BCB on my system, hopefully it doesn't break other + compilers + +Tue May 2 03:04:50 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication.cpp: Removed the code + snippet that bootstraps the NodeApplication process at a + specific OS priority. + +Wed Apr 26 21:25:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.h + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * tools/Config_Handlers/Utils/Functors.h + + Introduced a workaround for a ICE in GCC 4.0.22. + +Wed Apr 26 13:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/DP_Handler.cpp: + * tools/Config_Handlers/XML_File_Intf.cpp: + * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp: + * tools/Config_Handlers/XSCRT/XMLSchema.hpp: + * tools/Config_Handlers/XSCRT/Elements.hpp: + * tools/Config_Handlers/XSCRT/XML.hpp: + Removed workarounds for vc6 again + + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: + Added missing post.h + + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: + * tools/Config_Handlers/Package_Handlers/PC_Intf.h: + Fixed incorrect file tags + +Wed Apr 26 08:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/TargetManager/DomainDataManager.h: - Doxygen changes + Fixed compile problem in gcc4 build - * DAnCE/TargetManager/DomainEvents.idl: - Removed not needed include +Tue Apr 25 21:27:05 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/TargetManager/TargetManager.mpc + + Linking problems for Borland. + + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + More compile fixes for Borland. +Tue Apr 25 20:12:25 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.h + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp + * DAnCE/NodeApplicationManager/Containers_Info_Map.h + * ciao/Deployment_Core.idl + * tools/Config_Handlers/ADD_Handler.cpp + * tools/Config_Handlers/CCD_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.h + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/DP_Handler.cpp + * tools/Config_Handlers/Deployment.hpp + * tools/Config_Handlers/ERE_Handler.cpp + * tools/Config_Handlers/ERE_Handler.h + * tools/Config_Handlers/MDD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.h + * tools/Config_Handlers/Property_Handler.cpp + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/Req_Handler.cpp + * tools/Config_Handlers/Req_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.cpp + * tools/Config_Handlers/SatisfierProperty_Handler.h + * tools/Config_Handlers/cdp.hpp + * tools/Config_Handlers/toplevel.hpp + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.h + + Compilation fixes for borland, some cosmetic fixes as well. + +Tue Apr 25 09:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/CPD_Handler.h: + ComponentPortDescription is a struct, so also forward declare it + as a struct + +Mon Apr 24 18:53:22 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * CIDLC/ServantSourceGenerator.cpp + + Fixed a code generation problem caused by careless merging. + +Mon Apr 24 18:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/ADD_Handler.cpp: + * tools/Config_Handlers/DP_Handler.cpp: + * tools/Config_Handlers/ID_Handler.h: + Removed incorrect semi colons + +Mon Apr 24 06:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/IDREF_Base.cpp: + Removed not needed semi colon that caused compile errors in some + builds + +Sun Apr 23 11:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/Utils/XML_Helper.h: + Fixed compile error + +Sat Apr 22 21:13:10 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/Deployment.hpp + * tools/Config_Handlers/ccd.hpp + * tools/Config_Handlers/cdd.hpp + * tools/Config_Handlers/cdp.hpp + * tools/Config_Handlers/cid.hpp + * tools/Config_Handlers/cpd.hpp + * tools/Config_Handlers/iad.hpp + * tools/Config_Handlers/pcd.hpp + * tools/Config_Handlers/toplevel.hpp + * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp + + Compile errors. + +Fri Apr 21 16:24:46 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * Merge from the ARMS Escher repository. + + Changelog entries to follow: + + Tue Apr 11 09:29:12 UTC 2006 <wotte@blade35.isislab.vanderbilt.edu> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.h + * DAnCE/NodeManager/Node_Manager.cpp + + Additional debugging/compile fixes. + + Tue Apr 11 08:30:42 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * ciao/Deployment_Core.idl + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + + Modified to passivate (and reactivate later) shared components + when tearing down an assembly. + + Sun Apr 9 01:03:19 UTC 2006 <wotte@blade35.isislab.vanderbilt.edu> + + * M APRIL_DEMO.mwc + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/ExecutionManager/Execution_Manager.cpp + * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeManager/MonitorCB.cpp + * DAnCE/NodeManager/NodeManager_Impl.cpp + * DAnCE/NodeManager/Node_Manager.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + + Various compile/runtime fixes. + + Fri Apr 7 15:47:34 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + + Modified to enforce passivation occured on all components + before any connections are removed. + + Fri Apr 7 03:28:03 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> + + * tools/Config_Handlers/Utils/XML_Helper.cpp: + + Replaced "throw;" (which Stroustrup tells us causes an abort) + with "throw 0;" (kind of like an unnamed exception, which is + clearly what the author of this code intended). + + * ciao/Packaging_Data.idl: + + I've had occasion to use this file with the IFR Service, and + I've found that the IFR Service backend chokes on a bunch of + stuff here. The stuff that it chokes on has been protected with + "#ifndef AVOID_IFR_CRASH" so that you can protect the backend + from crashing if you pass -DAVOID_IFR_CRASH to tao_ifr. + + * ciao/Servant_Impl_Base.cpp: + * ciao/Servant_Impl_Base.h: + + Implemented the add_receptacle operation. + + Fri Apr 7 02:55:37 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + + Added ACE_CATCHANY and ACE_CATCHALL blocks in + Plan_Launcher_i::launch_plan to avoid crashing in case of CORBA + fault. + + Fri Apr 7 02:54:29 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> + + * DAnCE/NodeApplication/Configurator_Factory.cpp: + + Options beginning with "-ORB" are explicitly ignored. This + avoids having an "-ORB" option mistakenly parsed as being a + "-o <ior_output_file>" option. + + Fri Apr 7 02:51:31 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> + + * CIDLC/ServantSourceGenerator.cpp: + + Added code to support "get_all_receptacles" operation. + + Fri Apr 7 02:47:02 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> + + * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: + + Made a couple small changes that keep the CIDLC from coughing on + enums + + Fri Apr 7 02:37:34 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h + + Fixed a bug in detecting External connection and Internal + connections. Earlier when an external component is detected, + not *all* connections associated with this components are + purged from the to-be-removed connections list. Added another + helper method <purge_connections> to accomplish this task. + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + + Modified to reuse rebind() instead of bind() to avoid + redeployment duplicate instance errors. + + Thu Apr 6 15:02:59 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication.cpp: + + Modified the NodeApplications to up at OS priority 20 instead of + 50. + + Thu Apr 6 00:35:35 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> + + * DAnCE/NodeManager/CIAO_Monitor.cpp: + * DAnCE/NodeManager/MonitorCB.cpp: + * DAnCE/NodeManager/MonitorController.cpp: + * DAnCE/NodeManager/NodeManager_Impl.cpp: + + * DAnCE/TargetManager/DomainDataManager.cpp: * DAnCE/TargetManager/TargetManager_exec.cpp: - Layout changes - * DAnCE/TargetManager/TM_Client.mpc: - Removed not needed includes + Fixed the TM component removal problem. Changed/Removed + debug messages. -Wed Nov 29 21:26:53 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Wed Apr 5 16:54:20 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * docs/generate_component_mpc.html: + * tools/Config_Handlers/Any_Handler.cpp + * tools/Config_Handlers/DP_Handler.cpp + * tools/Config_Handlers/IDD_Handler.cpp + * tools/Config_Handlers/MDD_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - New file, documentation for the Perl script - generate_component_mpc.pl, in CIAO_ROOT/bin. + Improvements to output more information in the reverse handler. - * bin/generate_component_mpc.pl: - Changes mainly to correct problems with MPC files - generated for non-component builds, i.e., from some IDL - file used in common by multiple component builds, such - as the definition of a port interface. Also made changes - and added a new command line option to help minimize the - amount of code generated from IDL and minimize the - dependencies of the generated makefile or project. + Thu Mar 30 22:10:53 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> -Wed Nov 29 15:43:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/NodeApplication/Container_Impl.cpp + * DAnCE/NodeApplication/NodeApplication.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * ciao/Home_Servant_Impl_T.cpp + * ciao/Servant_Activator.cpp + * tools/Config_Handlers/DD_Handler.cpp + * tools/Config_Handlers/IDREF_Base.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + + Disabled excessive debugging. + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp + * DAnCE/NodeApplicationManager/ImplementationInfo.cpp + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeManager/NodeManager_Impl.cpp + + Disabled RT-CCM support. + + * DAnCE/TargetManager/DomainDataManager.cpp + + Added error messages. + + Wed Mar 29 21:34:07 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> * DAnCE/NodeManager/CIAO_Monitor.cpp: - Don't use plain new, fixes bugzilla bug 2732. Thanks to Abdul - for reporting this + Fixed a Access Error in the monitor. -Wed Nov 29 12:48:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/NodeManager/MonitorCB.cpp: + * DAnCE/NodeManager/MonitorController.cpp: + * DAnCE/NodeManager/NodeManager_Impl.cpp: + Added to have graceful termination. - * ciao/*.idl: - Added ciao/ as prefix to the include path. This way it is clear - where we are including a file from. + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/DomainDataManager.cpp: + * DAnCE/TargetManager/TargetManager_exec.cpp: + Update to turn off monitors at the end. -Tue Nov 28 21:38:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Mon Mar 27 22:39:25 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * DAnCE/RTNodeApplication: - Zapped, not used anymore + * tools/Config_Handlers/Utils/XML_Helper.cpp + * tools/Config_Handlers/Utils/XML_Helper.h -Tue Nov 28 19:33:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Mon Mar 27 20:10:09 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - * ciao/Deployment_DomainApplicationManager.idl: - Added comments about more details which are not compliant according - to the spec + * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp + (get_node_manager): + + Modified this method to re-throw the caught exception. + + Sun Mar 26 22:10:16 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - Use native bool instead of int - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - Reordered includes and improved doxygen documentation + Added code to handle exceptions while trying to connect to the + node managers in get_node_manager (). - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Const changes, use ACE_ERROR for error messages + * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Const changes, use more ACE and little cleanup + Added debug messages. - * DAnCE/NodeManager/CIAO_Monitor.h: - Doxygen improvement + * RACE/Controller/Component/RACE_common.h: - * DAnCE/NodeManager/MonitorCB.cpp: - Code layout changes + Added a new file to define the RACE_DEBUG and RACE_ERROR macros. + + Mon Mar 27 00:22:02 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + + Modified to allow ccm_passicate to be called on all components + before actually deactivating any components. + + Thu Mar 23 23:18:56 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/NodeManager/MonitorController.cpp (svc): + + Removed an unwanted debug statement. + + Thu Mar 23 22:54:25 UTC 2006 Nishanth Shankarn <nshankar@dre.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + + Removed an unwanted debug statement. - * DAnCE/NodeManager/MonitorCB.h: - Doxygen changes and added some todo's + Thu Mar 23 19:40:54 UTC 2006 Nishanth Shankarn <nshankar@dre.vanderbilt.edu> + * APRIL_DEMO.mwc: + * CIAO.mwc: + * CIAODAnCE.mwc: + * CIAOTAO.mwc: + * CIAO_TAO_DAnCE.mwc: + + Modified the mwc files so that they exclude the RACE/hog_string + directory. + + Thu Mar 23 18:04:58 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + + Fixed a bug in set_priority method. + + Wed Mar 22 19:32:37 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeManager/NodeManager_Impl.cpp + + Modified to make debug statements debug_level controlled. + + Wed Mar 22 00:51:11 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/NodeManager/NodeManager_Impl.cpp + + Modified to find the corresponding NAM when given a plan_uuid. + + Wed Mar 22 02:12:58 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> + + * DAnCE/NodeManager/CIAO_Monitor.cpp: + * DAnCE/NodeManager/MonitorCB.cpp: * DAnCE/NodeManager/MonitorController.cpp: - Use bool and small improvements - * DAnCE/NodeManager/Node_Manager.cpp: - Use the correct value for the lenght of the buffer passed - to hostname + Removed some of the debug statements + + Tue Mar 21 19:12:57 UTC 2006 Nishanth Shankarn <nshankar@dre.vanderbilt.edu> + + * RACE/hog_string/hog.cdp: + + Fixed the plan id. + + Mon Mar 20 21:07:50 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + + turning off the HTTP capability for Linux until I figure out why + it affects the loading of libraries. + + Mon Mar 20 20:40:37 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + + Changed loader path delimiter on Unix-like systems from ';' to ':' + + + Mon Mar 20 17:22:22 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/HTTP_Client.h: + * DAnCE/NodeApplicationManager/HTTP_Client.cpp: + * DAnCE/NodeApplicationManager/HTTP_Handler.h: + * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: + * DAnCE/NodeApplicationManager/URL_Parser.h: + * DAnCE/NodeApplicationManager/URL_Parser.cpp: + + Oops. Forgot to add the actual HTTP code. + + Mon Mar 20 04:27:48 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.h: + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: + + Adding HTTP capability to DAnCE. + * DAnCE/RepositoryManager/HTTP_Client.h: + * DAnCE/RepositoryManager/HTTP_Client.cpp: + * DAnCE/RepositoryManager/HTTP_Handler.h: + * DAnCE/RepositoryManager/HTTP_Handler.cpp: + * DAnCE/RepositoryManager/Options.h: + * DAnCE/RepositoryManager/Options.cpp: + * DAnCE/RepositoryManager/PC_Updater.h: + * DAnCE/RepositoryManager/PC_Updater.cpp: + * DAnCE/RepositoryManager/PC_Updater_T.h: + * DAnCE/RepositoryManager/PC_Updater_T.cpp: + * DAnCE/RepositoryManager/RM_Helper.h: + * DAnCE/RepositoryManager/RM_Helper.cpp: + * DAnCE/RepositoryManager/RMadmin.cpp: + * DAnCE/RepositoryManager/RepositoryManager.mpc: + * DAnCE/RepositoryManager/RepositoryManager.cpp: + * DAnCE/RepositoryManager/RepositoryManager_Impl.h: + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: + * DAnCE/RepositoryManager/URL_Parser.h: + * DAnCE/RepositoryManager/URL_Parser.cpp: + * DAnCE/RepositoryManager/ZIP_Wrapper.h: + * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: + + Porting the RepositoryManager to the newest XML config handlers. + Also migrating the code from the DOC repository to ensure the gap + between the code in this repository and that in cvs.doc.wustl.edu + repo is closed. + + + NOTE: I still have some testing left, but before that I need to + compile the CoSMIC version from this repository and regenerate + a bunch of descriptors because all the example descriptors are + broken. + + Sat Mar 18 22:33:10 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/Interfaces/NodeManager.idl + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h + * DAnCE/NodeManager/NodeManager_Impl.cpp + * DAnCE/NodeManager/NodeManager_Impl.h + * ciao/Deployment.idl + + Put the struct Sched_Params definition outside of the NAM + interface. + Cleaned up the code a bit. + + Sun Mar 19 16:52:54 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> + + * DAnCE/TargetManager/CmpClient.cpp: + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/DomainDataManager.cpp: + * DAnCE/TargetManager/TargetManager_exec.cpp: + Updated to implement the commitResource and releaseResource + function + + Sat Mar 18 19:01:18 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication.cpp: + + Enhanced the NodeApplication to run in realtime priority mode. + + Fri Mar 17 06:36:18 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> + + * DAnCE/Interfaces/NodeManager.idl: + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + + * DAnCE/NodeManager/MonitorCB.cpp: + * DAnCE/NodeManager/MonitorController.h: + * DAnCE/NodeManager/MonitorController.cpp: + * DAnCE/NodeManager/NodeManager_Impl.h: * DAnCE/NodeManager/NodeManager_Impl.cpp: - Small improvements and added some todo's + * ciao/Deployment.idl: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Cleanup + Implemented the set_priority method on the NodeManager + and NodeApplicationManager interface. Removed some of the debug + messages - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Made some debug lines dependent on a debug level + Thu Mar 16 03:54:39 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> + + * tools/Config_Handlers/DD_Handler.cpp: + Updated the handler to handle optional parameters + + Tue Mar 14 07:01:28 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + + * DAnCE/NodeManager/CIAO_Monitor.cpp: + * DAnCE/NodeManager/NodeManager_Impl.h: + Updated to make it portable in windows -Tue Nov 28 16:11:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp: + Fixed the entry point. + Mon Mar 13 23:04:32 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> + + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/DataType_Handler.h + * tools/Config_Handlers/ID_Handler.h + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/Req_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.h + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/NodeManager/Monitor.mpc + * tools/Config_Handlers/Package_Handlers/SID_Handler.h + * tools/Config_Handlers/Utils/XercesString.h - Fixes for link errors in OS X. + Fixed linking/warnings on Windows. -Tue Nov 28 11:45:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Mon Mar 13 18:27:27 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - * CIDLC/ExecutorMappingGenerator.cpp: - Updated because of idl file rename + * DAnCE/TargetManager/TargetManager.mpc: + Changed the projects to depend on NodeManager_Stub. This will fix the + linking errors in Windows. -Tue Nov 28 10:42:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Mon Mar 13 17:36:28 UTC 2006 Krishnakumar B <kitty@dre.vanderbilt.edu> - * ciao/*: - * *: - Renamed a lot of idl files, if the file contains interfaces/types - from the DAnCE spec, added Deployment_ as prefix, if they are - containing CIAO specific interfaces, added CIAO_. This way we can - more easily see if we have spec compliant IDL or not. + * CIDLC/ServantSourceGenerator.cpp (namespace): Updated the + generated code to set the component id on the component context + class to allow retrieving the id at run-time from an executor + implementation. -Tue Nov 28 09:50:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Mon Mar 13 17:28:44 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> - * ciao/CCM_Home.idl: - * ciao/CCM_Object.idl: - Moved CCMHome again to its own file + * DAnCE/ExecutionManager/Execution_Manager.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * ciao/Security.idl: - CIAO uses an interface of the security service but we don't - do a thing with it, so just define a local interface within - CIAO and use that for the moment, saves 250Kb of footprint + Fixes for nameservice discovery of EM. - * ciao/CCM_Context.idl: - Use the local security interface + * docs/schema/toplevel.xsd - * ciao/ExectionManager.idl: - Added todo + Minor correction to schema. - * ciao/CCM_Core.idl: - Added new file + Fri Mar 10 17:03:26 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> -Mon Nov 27 18:34:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * ciao/NodeApplicationManager.idl: - * ciao/Deployment_ApplicationManager.idl: - Moved ApplicationManager interface to its own file + Fixed minor bug in URI interface. - * ciao/CCM_Core.mpc: - Added new file + Thu Mar 9 22:26:17 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * ciao/DomainApplicationManager.idl: - * ciao/TargetManager.idl: - Updated includes + * ciao/Context_Impl_Base.cpp: + * ciao/Context_Impl_Base.h: - * ciao/Target_Data.idl: - Moved ResourceNotAvailable also to the new - Deyloyment_ApplicationManger file + Added CORBA::String_var member to store the component instance + id, also added a pair of set/get methods called _ciao_instance_id. - * DAnCE/NodeManager/CIAO_Monitor.h: - Removed include of memory, not portable and not used. - Fixes bugzilla bug 2730. Thanks to Abdul for reporting - this. + Wed Mar 8 19:07:31 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> -Mon Nov 27 15:41:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * ciao/Deployment_Core.idl: - * ciao/Deployment_Container.idl: - * ciao/Deployment_NodeApplication.idl: - Moved types from Core to the other files and added remarks - to all CIAO specific types + Add error message for connection failure. - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - Updated includes because of the move above + * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc -Mon Nov 27 14:55:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Disabled this project. - * ciao/CCM_Core.mpc: - Added new Deployment_DeploymentPlan + * DAnCE/TargetManager/TargetManager_exec.cpp + * DAnCE/TargetManager/TargetManager_exec.h - * ciao/Deployment_Data.idl - * ciao/Deployment_DeploymentPlan.idl: - Moved types related to DeploymentPlan to their own file + Fix entry point problems. - * ciao/Deployment_Data.idl - Removed RequirementSatisfier, it is superfluous. + Wed Mar 8 19:29:20 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - * ciao/Deployment.idl: - No need to include Deployment_Data + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/DomainDataManager.cpp: + * DAnCE/TargetManager/TargetManagerExt.idl: + * DAnCE/TargetManager/TargetManager_exec.h: + * DAnCE/TargetManager/TargetManager_exec.cpp: + Added the structure in the TMExt interface to maintain the + mapping between hostname to NM refs. - * ciao/Target_Data.idl: - Removed not needed include + Wed Mar 8 14:40:41 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * ciao/Deployment_Connection.idl: - * ciao/TargetManager.idl: - * RACE/Output_Adapters/Interface/PlanEgress.idl: - * RACE/Plan_Analyzer/Interface/PlanIngress.idl: - * RACE/Planner_Manager/Interface/Planner_Manager_I.idl: - * RACE/Planners/Interface/Planner_I.idl: - Updated include because of move above + * tools//Config_Handlers/Deployment.cpp + * tools//Config_Handlers/Deployment.hpp + * tools//Config_Handlers/GNUmakefile + * tools//Config_Handlers/cdd.cpp + * tools//Config_Handlers/cdd.hpp + * tools//Config_Handlers/pcd.cpp + * tools//Config_Handlers/pcd.hpp + * tools//Config_Handlers/toplevel.cpp + * tools//Config_Handlers/toplevel.hpp + * tools//Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools//Config_Handlers/Package_Handlers/PCD_Handler.h - * tools/Config_Handlers/DnC_Dump.{h,cpp}: - Removed RequirementSatisfier + New generated code. -Mon Nov 27 14:11:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Wed Mar 8 03:11:02 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - * ciao/Deployment.idl: - Removed LastConfiguration, it is not used and has been zapped - from the DAnCE spec + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + Implement the Signal Handler for the process NodeManager. And + set the option avoid_zombies=0 -Mon Nov 27 14:04:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ciao/Deployment_Core.idl: - * ciao/Deployment_NodeApplication.idl: - Moved ESInstallationInfo to NodeApplication file + * DAnCE/NodeManager/MonitorController.h: + * DAnCE/NodeManager/MonitorController.cpp: - * ciao/Deployment.idl: - LastConfiguration doesn't seem used, added a comment to that - exception. + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/TargetManager_exec.cpp: + Implement ComponentID to Process Id mapping - * ciao/NodeApplicationManager.idl: - Doxygen improvement + Tue Mar 7 23:26:41 UTC 2006 Nilabja Roy <nilabjar@localhost.localdomain> -Mon Nov 27 13:23:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/TargetManager/DomainDataManager.cpp + * DAnCE/TargetManager/TargetManagerExt.idl + * DAnCE/TargetManager/TargetManager.mpc: + Changed to depend on the NodeManager_Stub, so that + CIAO::NodeManager can be used. - * ciao/NodeApplicationManager.idl: - Doxygen improvement + Tue Mar 7 03:14:50 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + Changed to add the Comp_id to Proc_id mapping - * ciao/Deployment_Core.idl: - Removed InvalidLocation exception, not used and not in the DAnCE - spec + * DAnCE/NodeManager/CIAO_Monitor.h: + * DAnCE/NodeManager/CIAO_Monitor.cpp: + Changed to add the percentage cpu same as vmstat -Mon Nov 27 13:10:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * DAnCE/NodeManager/MonitorController.h: + * DAnCE/NodeManager/MonitorController.cpp: + Changed to add the Comp_id to Proc_id mapping - * ciao/Deployment_Core.idl - * ciao/Deployment_Container.idl - * ciao/Deployment_NodeApplication.idl - Moved some interfaces from Core to their own files + * DAnCE/NodeManager/NodeManager_Impl.h: + * DAnCE/NodeManager/NodeManager_Impl.cpp: + Changed to add the Comp_id to Proc_id mapping - * ciao/CCM_Core.mpc: - Updated because of split above and added some more flags to - reduce the amount of generated files + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/DomainDataManager.cpp: + Changed to add interface to RACE - * ciao/DomainApplicationManager.idl: - * ciao/NodeApplication_CallBack.idl - Updated include + * DAnCE/TargetManager/TargetManagerExt.idl: + * DAnCE/TargetManager/TargetManager_exec.h: + * DAnCE/TargetManager/TargetManager_exec.cpp: + Changed to add interface to RACE - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCENodeApplication/NodeApplication_Impl.h: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - Updated includes because of refactoring above + * DAnCE/TargetManager/descriptors/Domain.cdd: + Updated to the latest xsd -Mon Nov 27 09:40:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - Instead of the http files in this library, use the HTTP - classes from the TAO lib + * docs/schema/cdd.xsd: + Changed the Domain definations - * DAnCE/RepositoryManager/HTTP_Client.cpp - * DAnCE/RepositoryManager/HTTP_Client.h - * DAnCE/RepositoryManager/HTTP_Handler.cpp - * DAnCE/RepositoryManager/HTTP_Handler.h - Removed, not needed anymore, these files did move to the TAO - lib to support http:// ior and we are reusing them now in - CIAO + Mon Mar 6 19:46:54 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - * DAnCE/RepositoryManager/RepositoryManager.mpc - Removed the files above + * DAnCE/Interfaces/NodeManager.idl + * DAnCE/NodeManager/NodeManager_Impl.h + * DAnCE/NodeManager/NodeManager_Impl.cpp: + + Added the set_priority method to modify the priority of + NodeApplication process. + + Wed Mar 1 20:56:16 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * DAnCE/TargetManager/TargetManager_exec.h + * DAnCE/TargetManager/TargetManager_exec.cpp + * DAnCE/TargetManager/TargetManagerExt.idl: -Mon Nov 27 09:36:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Added method to TargetManagerExt interface to obtain references to + the NodeManagers. + + + Fri Feb 24 22:55:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Basic_Deployment_Data.cpp + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/CEPE_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.h + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/CRDD_Handler.cpp + * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/DP_Handler.cpp + * tools/Config_Handlers/DP_Handler.h + * tools/Config_Handlers/DataType_Handler.cpp + * tools/Config_Handlers/DataType_Handler.h + * tools/Config_Handlers/DnC_Dump.cpp + * tools/Config_Handlers/ERE_Handler.h + * tools/Config_Handlers/IDD_Handler.cpp + * tools/Config_Handlers/IDREF_Base.cpp + * tools/Config_Handlers/IDREF_Base.h + * tools/Config_Handlers/ID_Handler.cpp + * tools/Config_Handlers/ID_Handler.h + * tools/Config_Handlers/IRDD_Handler.cpp + * tools/Config_Handlers/IRDD_Handler.h + * tools/Config_Handlers/MDD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/RDD_Handler.cpp + * tools/Config_Handlers/Req_Handler.cpp + * tools/Config_Handlers/Req_Handler.h + * tools/Config_Handlers/STD_PCD_Handler.h + * tools/Config_Handlers/ccd.cpp + * tools/Config_Handlers/ccd.hpp + * tools/Config_Handlers/cid.cpp + * tools/Config_Handlers/cid.hpp + * tools/Config_Handlers/cpd.cpp + * tools/Config_Handlers/cpd.hpp + * tools/Config_Handlers/iad.cpp + * tools/Config_Handlers/iad.hpp + * tools/Config_Handlers/pcd.cpp + * tools/Config_Handlers/pcd.hpp + * tools/Config_Handlers/test.cdp + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CAD_Handler.h + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.h + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h + * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/IAD_Handler.h + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/PCD_Handler.h + * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp + * tools/Config_Handlers/Package_Handlers/PC_Intf.h + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.h + * tools/Config_Handlers/Package_Handlers/test.cpp + * tools/Config_Handlers/Package_Handlers/descriptors/package.tpd + * tools/Config_Handlers/Utils/Exceptions.h + * tools/Config_Handlers/Utils/Functors.h + * tools/Config_Handlers/Utils/XML_Error_Handler.cpp + * tools/Config_Handlers/Utils/XML_Helper.h + * tools/Config_Handlers/XMLSchema/Writer.hpp + + Package handlers and changes necessary to support them. + +Fri Apr 21 08:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * CIDLC/ServantSourceGenerator.cpp: + Removed usage of ACE_NESTED_CLASS + + * DAnCE/RepositoryManager/PC_Updater.cpp: + Fixed compile errors + +Thu Apr 20 13:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/DnC_Dump.cpp: + * DAnCE/RepositoryManager/RMadmin.cpp: + Fixed compile error + +Thu Apr 20 09:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp: + Fixed compile error + +Wed Apr 19 19:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - Instead of the http files in this library, use the HTTP - classes from the TAO lib + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + Fixed usage of sequences. The sequences now return + a pointer on the subscript operators, not _var which was not according + to the spec. - * DAnCE/NodeApplicationManager/URL_Parser.h: - Doxygen improvements +Wed Apr 19 14:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/NodeApplicationManager/HTTP_Client.cpp: - * DAnCE/NodeApplicationManager/HTTP_Client.h: - * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: - * DAnCE/NodeApplicationManager/HTTP_Handler.h: - Removed, not needed anymore, these files did move to the TAO - lib to support http:// ior and we are reusing them now in - CIAO + * tools/Config_Handlers/XMLSchema/Types.hpp: + Removed vc6 workaround - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - Removed the files above +Wed Apr 19 13:43:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Mon Nov 27 09:33:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * docs/schema/xsc-banner.h: + * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp: + * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: + Removed include of vc6-4786.h - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Removed include of errno.h. It is not portable, but it seems - it isn't needed at all. Thanks to Abdul for reporting this, - this fixes bugzilla bug 2726. - -Mon Nov 27 08:59:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/tutorials/Quoter: - Extended this tutorial with more documentations. Thanks to - Abdul for delivering these files. This fixes bugzilla 2717 - -Fri Nov 24 13:59:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Added check whether we got a valid NodeImplementationInfo back - and not a nill pointer. Fixes bugzilla bug 2692 finally. - Thanks to Abdul for pointing out the need for this check - -Fri Nov 24 09:41:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - Don't build this project in ace_for_tao configuration - -Thu Nov 23 12:34:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/CCM_Home.idl: - * ciao/CCM_Object.idl: - Moved CCMHome again to its own file now the idl compiler has - been fixed to handle this correctly - -Wed Nov 22 20:39:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/Dynamic_Component_Servant_Base.h: - Removed the character c from the first line which drove the - compilers really crazy - -Wed Nov 22 19:31:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/CCM_Home.idl: - * ciao/CCM_Object.idl: - Moved CCMHome to CCMObject, when these are in seperate files - the generated code for components is not correct. We want to have - these interfaces in seperate files but we can sort out this - later. - -Wed Nov 22 14:45:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/Dynamic_Component_Servant_Base.h: - Fixed pragme once warning - -Wed Nov 22 11:05:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/CCM_Base.idl - * ciao/CCM_CCM2Context.idl - * ciao/CCM_CCMException.idl - * ciao/CCM_Component.idl - * ciao/CCM_Configurator.idl - * ciao/CCM_Container.idl - * ciao/CCM_Container_Ex.idl - * ciao/CCM_Context.idl - * ciao/CCM_Cookie.idl - * ciao/CCM_Core.mpc - * ciao/CCM_EnterpriseComponent.idl - * ciao/CCM_EntityComponent.idl - * ciao/CCM_EntityContext.idl - * ciao/CCM_Enumeration.idl - * ciao/CCM_Event.idl - * ciao/CCM_Home.idl - * ciao/CCM_HomeConfigurator.idl - * ciao/CCM_HomeExecutorBase.idl - * ciao/CCM_HomeFinder.idl - * ciao/CCM_HomeRegistration.idl - * ciao/CCM_KeylessCCMHome.idl - * ciao/CCM_Navigation.idl - * ciao/CCM_Object.idl - * ciao/CCM_ProxyHomeRegistration.idl - * ciao/CCM_Receptacle.idl - * ciao/CCM_Session2Context.idl - * ciao/CCM_SessionSynchronization.idl - * ciao/CCM_StandardConfigurator.idl - * ciao/Client_init.cpp - * ciao/Components.idl - * ciao/Cookies.h - * ciao/CosPersistentState.idl - * ciao/Deployment.idl - * ciao/Deployment_Application.idl - * ciao/Deployment_Base.idl - * ciao/Deployment_Connection.idl - * ciao/Deployment_Core.idl - * ciao/Deployment_Data.idl - * ciao/Deployment_TargetData.idl - * ciao/DomainApplicationManager.idl - * ciao/Home_Servant_Impl_Base.h - * ciao/NodeApplicationManager.idl - * ciao/NodeManager.idl - * ciao/Servant_Impl_Base.h - * ciao/Servant_Impl_T.cpp - * ciao/Server_init.cpp - * ciao/StandardConfigurator_Impl.h - * ciao/SwapExec.idl - * ciao/Swapping_Servant_Home_Impl_Base.h - * ciao/Target_Data.idl - * ciao/TargetManager.idl - * ciao/UpgradeableContext.idl - Splitted the huge idl files into smaller parts. The CCM files are almost done, - the Deployment files do need some more iterations to get smaller files that - contain an interface with the types they need. This way the linker can optimize - objects out during a static compilation - - * ciao/CIAO_Value.idl: - * ciao/Container_Base.pidl: - Removed, not used at all - - * ciao/ComponentsC.h: - * ciao/ComponentsS.h: - Removed, will be generated by tao_idl - - * DAnCE/Interfaces/NodeManagerDaemon.idl - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * DAnCE/NodeManager/MonitorController.h - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/DomainEvents.idl - * DAnCE/TargetManager/TargetManager.cidl - * DAnCE/TargetManager/TargetManager.mpc - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/DnC_Dump.h - * examples/Hello/Sender/starter.cpp - Updated because of rename above +Wed Apr 19 13:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * DAnCE/TargetManager/TargetManager.idl: - Renamed to TargetManagerImpl.idl, this is the interface - it contains. + * tools/Config_Handlers/STD_PC_Intf.cpp: + * tools/Config_Handlers/XSCRT/XMLSchema.hpp: + * tools/Config_Handlers/XSCRT/Elements.hpp: + * tools/Config_Handlers/XSCRT/XML.hpp: + * tools/Config_Handlers/DP_Handler.cpp: + * tools/Config_Handlers/DP_Handler.cpp: + Removed vc6 workarounds - * DAnCE/NodeApplication/Container_Impl.cpp - * DAnCE/NodeApplication/Container_Impl.h - Removed get_homes(), it is not in the base idl +Wed Apr 19 11:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/RateGen/RateGen.mpc - * RACE/common/RACE_common.mpc - * RACE/Input_Adapters/Base/Input_Adapter.mpc - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc - * RACE/Output_Adapters/Base/Output_Adapter.mpc - * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc - * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc - * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc - * RACE/Planner_Manager/Component/Planner_Manager.mpc - * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc - * RACE/Planners/Base/Planner.mpc - * RACE/Planners/Interface/Planner_Interface.mpc - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc - * tests/IDL3/ImpliedIDL/All/all.mpc - * tests/IDL3/Lookup/lookup_test.mpc - * tests/Minimum/Minimum_Base/Minimum.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - Simplified these mpc files, the -GT option is not added by - orbsvcslib anymore and -Sc is deprecated + * tools/Config_Handlers/DnC_Dump.{h,cpp}: + Updated for string manager change in TAO - * tests/IDL3/Events/Any/main.cpp: - * tests/IDL3/Events/Any/README: - * tests/IDL3/Events/Any/run_test.pl: - Updated this test to reproduce a problem with valuetype - insertion into an any. This test will now fail until - Jeff Parsons commits some idl compiler changes + * ciao/Servant_Impl_Base.cpp: + Updated for sequence change + +Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/Deployment.hpp + * tools/Config_Handlers/ccd.hpp + * tools/Config_Handlers/cdd.hpp + * tools/Config_Handlers/cdp.hpp + * tools/Config_Handlers/cid.hpp + * tools/Config_Handlers/cpd.hpp + * tools/Config_Handlers/iad.hpp + * tools/Config_Handlers/pcd.hpp + * tools/Config_Handlers/toplevel.hpp + Removed vc6 workarounds -Mon Nov 20 08:16:34 2006 Simon McQueen <sm@prismtech.com> + * tools/Config_Handlers/vc6-4786.h + Removed - * CIAO version 0.5.4 released. +Tue Apr 18 20:55:05 2006 Wallace Zhang <zhangw@ociweb.com> + + * CIAO version 0.5.1 released. Local Variables: mode: change-log add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) indent-tabs-mode: nil End: - diff --git a/CIAO/ChangeLogs/ChangeLog-06b b/CIAO/ChangeLogs/ChangeLog-06b deleted file mode 100644 index b7797cca18a..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-06b +++ /dev/null @@ -1,2752 +0,0 @@ -Fri Nov 17 16:08:43 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * performace-tests/Protocols/common/Protocols_svnt_export.h: - - Removed this file, renamed as the one added below. - - * performace-tests/Protocols/common/Protocols_skel_export.h: - - New file, renamed from the one removed above. - - * performace-tests/Protocols/Sender/Sender.idl: - * performace-tests/Protocols/Sender/Sender.mpc: - * performace-tests/Protocols/Receiver/Receiver.mpc: - * performace-tests/Protocols/Receiver/Receiver.idl: - * performace-tests/Protocols/common/Protocols.mpc: - * performace-tests/Protocols/common/Protocols.idl: - - Fixes to incorrect generation by generate_component_mpc.pl, - similar to those in - - Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - Also removed include of Components.idl from Protocols.idl, - since it contains no component or eventtype declarations, - and added the include to Sender.idl and Receiver.idl. - -Thu Nov 16 14:41:24 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h: - - Removed these files, added as renamed below. - - * tests/Bug_2130_Regression/interfaces/ENW_skel_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h: - - New files, renamed from those removed above. - - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc: - * docs/tutorials/Quoter/Simple/Broker/Broker.mpc: - - Fixes to incorrect generation by generate_component_mpc.pl, - similar to those in - - Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - -Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Display/Display_Base/Display_Base_svnt_export.h: - - Removed this file, and added it as named below. - - * examples/Display/Display_Base/Display_Base_skel_export.h: - - New file, renamed from the one removed above. - - * examples/Display/Display_Base/Display_Base.mpc: - - Fixed incorrect export macros that were originally generated - by generate_component_mpc.pl. Also removed the -GT IDL - compiler command line option, which generated unnecessar - tie classes and template files (added by a base MPC project), - and made cosmetic changes to line breaks. Finally, - renamed project Display_Base_svnt to Display_Base_skel, - to eliminate confusion since the projects in this MPC - file are object-based, not component-based. The export - macros and export include files were also renamed, as - described above, consistently with these last changes. - - * examples/GPS/GPS.mpc: - * examples/NavDisplay/NavDisplay.mpc: - * examples/RateGen/RateGen.mpc: - - Renamed references to the Display_Base_svnt lib to be - consistent with the name change above, removed -GT - from the command line options passed to the IDL compiler, - and added -SS (suppress skeleton file generation) and - -St (suppress typecode and Any operator generation) from - *_svnt projects, and removed 'idlflags' line from - *_exec projects without IDL files. - -Wed Nov 15 10:30:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * NEWS: - - Entries submitted by Shanshan Jiang and Johnny Willemsen. - -Tue Nov 14 16:27:55 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Null_Component/Null_Component.mpc: - - Updated lib names in 'libs +=...' lines, overlooked in - - Mon Nov 13 16:54:47 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - -Tue Nov 14 09:00:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * NEWS: - - Entry submitted by Boris Kolpackov. - -Mon Nov 13 16:54:47 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Null_Component/Null_Interface_svnt_export.h: - - Removed this file, renamed as below. - - * examples/Null_Component/Null_Interface_skel_export.h: - - Added this file, renamed from removed file above. - - * examples/Null_Component/Null_Interface.mpc: - - Renamed several things corresponding to the renaming - change above and replace export macro definition in - the skel project with separate stub and skel export - macro definitions and corresponding included. Also - added typecode/Any suppression command line option - -St to IDL compiler execution for both stub and skel - projects, and reduced MPC base project dependencies - (and thus link dependencies) to a minimum. - - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/StaticDAnCEApp.mpc: - - Renamed items corresponding to change above. - -Fri Nov 10 16:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - Removed deprecated -Sc option from idlflags - -Wed Nov 8 20:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Null_Component/*: - Added some modelling files I got also from Abdul and removed the .ccd file - I committed by accident - -Wed Nov 8 14:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Fixed a small memory leaks and other problems. This fixes bugzilla - 2692. Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> - for reporting these issues. - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - A few small improvements - -Sun Nov 5 19:16:57 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - Removed the use of STL iostream. - Use ACE DLL decorator, prefix, suffix for DLL file names. - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - Removed the use of STL iostream. - -Fri Nov 3 03:03:24 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/RepositoryManager/PC_Updater.cpp - Modified these files to differentiate the location field of - deploymentplan for different platforms. - -Thu Nov 2 22:54:12 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * CIDLC/ServnatSourceGenerator.cpp: - - Added generation of code to register eventtype factories with - the container ORB for components with publish and emit ports - (generation of such registration for components with consume - ports already existed). This additional registration is necessary - if the component sends an event using a CIAO Event Service - event channel that is collocated with it. - -Thu Nov 2 20:22:46 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp (main): - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp (main): - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp (main): - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/NodeManager/Node_Manager.cpp (main): Replaced exit() with - ACE_OS::exit(). Thanks to Abdul Sowayan for reporting this. - This fixes bugid #2695. - -Mon Oct 30 19:13:03 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tests/IDL3/Events/Any/EventAny.idl: - * tests/IDL3/Events/Any/Any.mpc: - * tests/IDL3/Events/Any/main.cpp: - * tests/IDL3/Events/Any/README: - * tests/IDL3/Events/Any/run_test.pl: - - New test, to ensure that IDL eventtypes are - inserted/extracted from Anys correctly, and that - the resulting Anys are marshaled/demarshaled - correctly. - - * tests/IDL3/Events/Regular/Regular.mpc: - - Added backslashes to shorted 'idlflags' line. - -Mon Oct 30 13:26:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * DAnCE/TargetManager/CmpClient.cpp - BUILDCZAR removing old scoreboard warning. - -Thu Oct 26 14:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Use ACE_OS methods, this fixes bugzilla 2691. - Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> - for reporting this issue - -Wed Oct 25 14:54:03 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: - * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/Home.hpp: - - Minor fixes and cleanups. - - * CCF/CCF/IDL2/Parsing/Recovery.hpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/CIDL/Parser.hpp: - * CCF/CCF/CIDL/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/Parser.cpp: - - Added syntax errors to every grammar rule. - -Wed Oct 25 11:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Null_Component/StaticDAnCEApp.mpc: - Enabled this project in all builds - -Mon Oct 23 19:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Added missing CORBA::string_dup to fix crash with BCB - -Fri Oct 20 06:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Changed the HomeAttributes generation in such a way that it - also compiles with BCB6 - - * examples/Null_Component/*: - New example, a component with just one interface. This can be used - to analyze the core footprint and see what we can reduce - Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> - for creating this example - -Thu Oct 19 23:22:49 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/RepositoryManager.mpc - Modified this file to make sure RepositoryManager project is built - after minizip project. - -Thu Oct 19 10:47:12 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> - - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp - * examples/BasicSP/EC/controller.cpp - * examples/Display/RateGen/controller.cpp - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp - Changed the naked atoi () to ACE_OS::atoi (), again thanks to Abdul - for reporiting this. - -Wed Oct 18 14:00:04 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp - (parse_args): Changed the naked atoi() to ACE_OS::atoi(). - Thanks to Abdul for reporting this. - -Wed Oct 18 12:05:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * DAnCE/TargetManager/DomainDataManager.cpp - Removed warnings about unused local variables (line 186 & 558) - -Wed Oct 18 09:50:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * DAnCE/TargetManager/CmpClient.cpp - Removed warning about unused local variable (line 154) - -Tue Oct 17 21:23:27 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/README - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/RepositoryManager/ZIP_Wrapper.h - Updated these files to use minizip under $ACE_ROOT/contrib/minizip. - -Tue Oct 17 13:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Several small layout changes and use ACE_ERROR for - errors - -Tue Oct 17 13:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/NodeApplication/RTNodeApp_Configurator.{h,cpp}: - Moved destructor implementation to cpp file - -Tue Oct 17 13:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/NodeManager/CIAO_Monitor.h: - Doxygen improvements - - * DAnCE/NodeManager/NAM_Map.{h,cpp}: - Made is_available a const method - - * DAnCE/NodeManager/Node_Manager.cpp: - Use bool - - * DAnCE/NodeManager/Node_Manager_Impl.cpp: - Use ACE_ERROR together with LM_ERROR - -Tue Oct 17 12:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - Use ACE_ERROR together with LM_ERROR - - * DAnCE/NodeApplication/NodeApplication_Impl.inl: - Initialise pointers with 0 - - * DAnCE/NodeApplication/Configurator_Factory.{h,cpp}: - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - Use bool and const improvements, doxygen improvements - -Mon Oct 16 19:52:15 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Updated the re_launch_plan () function for Repoman integration. - - * DAnCE/RepositoryManager/README - * DAnCE/RepositoryManager/RepositoryManager.cpp - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * examples/BasicSP/RepoMan_Usage.html - Fixed some warnings on Liunx. - Fixed the "Deamon" typos. - -Mon Oct 16 15:11:40 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/TM_Client.mpc: - Fixed the linking error in Mac and in FC5 Static - -Mon Oct 16 11:20:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - BUILD CZAR. Due to the removal of - DAnCE/NodeApplication/NodeApp_Configurator.cpp to correct - the fuze error below, this "other" project's MPC needed to - be updated. (Why is this dependancy here?) - -Mon Oct 16 11:20:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * DAnCE/NodeApplication/NodeApp_Configurator.cpp - * DAnCE/TargetManager/DomainEvents.idl - BUILD CZAR. Removed Fuzz errors after no user action to correct. - -Mon Oct 16 08:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/IDREF_Base.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/PS_Handler.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp - * DAnCE/RepositoryManager/ - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Use ACE_ERROR together with LM_ERROR - - * RACE/Controller/Component/Controller.idl: - Changed some comments to doxygen style - - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - Const change - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Layout changes - - * DAnCE/RepositoryManager/RM_Helper.cpp: - Use strcmp to compare two strings and several layout changes - - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - Doxygen changes - - * DAnCE/RepositoryManager/RMadmin.cpp: - Documentation changes - - * DAnCE/RepositoryManager/URL_Parser.{h,cpp}: - Use bool for debug_ - - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - Initialise pointers with 0 - -Mon Oct 16 08:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl: - Simplified this file by using the new ciao_static_dnc_app base - project. - -Fri Oct 13 17:57:12 2006 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> - - * docs/schema/SANet_Network.xsd - * docs/schema/Task_Map.xsd - - Added SA-POP schemas. - -Fri Oct 13 17:54:58 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/TargetManager.mpc: - Addressed the problems coming up in Mac. Changed the project - inheritence of the TM Component. - -Fri Oct 13 17:43:29 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/DomainDataManager.cpp: - Addressed an error in the last check-in. - -Thu Oct 12 17:36:58 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/DomainEvents.idl: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Added the functionality to detect any add/delete to the Domain. - Added the feature to relay events to anyone interested for the above. - - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - Changed the test script to test the above - -Tue Oct 10 19:13:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl: - Fixed compile error. - Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> - for reporting this. - -Tue Oct 10 17:56:51 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - Modify these files to get the artifacts names when using http reference. - -Tue Oct 10 14:24:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - Layout improvements, use ACE_ERROR with LM_ERROR - - * DAnCE/ExecutionManager/DAM_Map.cpp: - Const improvements - - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - Layout changes - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Use ACE_ERROR with LM_ERROR - - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - Documentation improvements - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - Const improvements - - * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: - Const improvements - -Tue Oct 10 09:28:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/CCM_Base.idl: - Removed a remark about RTF 1.1, method is now according to the spec - - * ciao/CCM_Component.idl: - * ciao/CCM_Container.idl: - * ciao/CCM_Event.idl: - * ciao/Deployment.idl: - * ciao/Target_Data.idl - Updated some documentation and added some todos about things which - are CIAO specific - - * ciao/Server_init.cpp: - With LM_ERROR use ACE_ERROR - - * ciao/Dynamic_Component_Activator.{h,cpp}: - Removed some invalid comments and a mutex that was not used at all - - * ciao/Context_Impl_Base.h: - Documentation update - -Thu Oct 05 00:35:37 2006 William R. Otte wotte@dre.vanderbilt.edu - - * CIAO version 0.5.3 released. - -Wed Oct 4 08:12:24 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * NEWS: - - Updated with entries for the CIDL compiler work. - -Tue Oct 3 15:16:40 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * NEWS: - - Updated the NEWS to add the changes for Repoman and Plan_Generator - projects. - -Tue Oct 3 12:49:16 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> - - * NEWS: - - Updated the NEWS to add the changes for CoSMIC Quoter tutorial - -Mon Oct 2 09:28:58 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/index.html: - Corrected linked to OMG spec - -Mon Oct 2 08:58:58 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Set the nodemanager in the static nodeapplication manager. - Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com> - for reporting this. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Doxygen improvement - -Thu Sep 28 16:47:58 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - Added the base projects to Plan_Launcher_Impl project to include - required libs. Added null head files to the Plan_Launcher project to - remove the unnecessary dependency on other libs. - -Thu Sep 28 15:57:53 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - Fixed the "undefined reference" error on FC5_Static build. - - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - Modified this file to handle the possible RepoMan null reference error. - -Tue Sep 26 21:05:48 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Fixed the "conversion from '_var' to 'CORBA::Object*'" warning. - -Tue Sep 26 15:52:12 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * docs/tutorials/Quoter/Simple/Broker/Broker.cidl: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl: - - Added missing semicolons. - -Mon Sep 25 23:19:15 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Modified the fetch_reference_naming () to remove its arguments related - to Repoman. - - * DAnCE/Plan_Generator/PCVisitor.h: - Adjusted the order of the data members of Plan_Generator_i class. - - -Mon Sep 25 19:46:37 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/Plan_Generator/Plan_Generator.mpc (project): Fixed the MPC - file by removing the "requires += RepositoryManager" as this - project, as well as other projects that depend on this, will not - be built unless RepositoryManager=1 is set. - -Mon Sep 25 14:42:03 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: Fixed the mpc file. - -Mon Sep 25 13:06:05 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * CCF/CCF/IDL2/SemanticAction/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/CIDL/SemanticAction/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - - Move some operator<< operators to the global scope so that they - do not hide others. - -Sun Sep 24 21:06:07 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Removed the unnecessary Repoman head file. - -Sat Sep 23 04:31:13 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RMadmin.cpp - * ciao/RepositoryManager.idl - Added the replace argument in installPackage () and createPackage () - functions and extend the functionalities of these two functions based - on the latest D&C spec. - -Sat Sep 23 04:07:59 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Generator - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/PCVisitor.h - * DAnCE/Plan_Generator/PCVisitorBase.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/PCVisitorBase.inl - * DAnCE/Plan_Generator/Plan_Generator.mpc - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Generator/Plan_Generator_Impl.h - * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h - Added these files which implement the Plan_Generator project. This - project is used to retrieve information from Repoman and generate/modify - DeploymentPlans based on different demands. - - * DAnCE/Planner - * DAnCE/Planner/Node_T.cpp - * DAnCE/Planner/Node_T.h - * DAnCE/Planner/Node_T.inl - * DAnCE/Planner/PCVisitor.cpp - * DAnCE/Planner/PCVisitor.h - * DAnCE/Planner/PCVisitorBase.cpp - * DAnCE/Planner/PCVisitorBase.h - * DAnCE/Planner/PCVisitorBase.inl - * DAnCE/Planner/Planner.cpp - * DAnCE/Planner/Planner.mpc - Deleted these files. The planner project has been replaced by the more - useful Plan_Generator project. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Modified these files. - - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/PCVisitor.h - * DAnCE/Plan_Generator/PCVisitorBase.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/PCVisitorBase.inl - Deleted these files. - Removed the Plan_Launcher's dependence on RepoMan. Use Plan_Generator - to retrieve information from Repoman and generate/modify DeploymentPlans. - -Fri Sep 22 09:27:25 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.cpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/SemanticGraph/String.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp: - * CCF/CCF/IDL2/SemanticGraph/String.hpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp: - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp.m4: - * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: - * CCF/CCF/IDL2/SemanticGraph/Array.hpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Native.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.hpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.hpp: - * CCF/CCF/IDL2/SemanticGraph/TypeId.hpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.hpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp: - * CCF/CCF/IDL2/SemanticGraph/Member.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4: - * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp: - * CCF/CCF/IDL2/SemanticGraph/Literals.cpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.tpp: - * CCF/CCF/IDL2/SemanticGraph/Literals.hpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.hpp: - * CCF/CCF/IDL2/SemanticGraph/Module.hpp: - - * CCF/CCF/CIDL/SemanticGraph/Executor.cpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.cpp: - * CCF/CCF/CIDL/SemanticGraph/Executor.hpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.hpp: - - * CCF/CCF/IDL3/SemanticGraph/Component.cpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: - * CCF/CCF/IDL3/SemanticGraph/Component.hpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.hpp: - * CCF/CCF/IDL3/SemanticGraph/Home.hpp: - - - Add file name and line information to every semantic - graph node. This information is used in diagnostics. - - - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp: - - Adjust semantic actions interface to provide a way to derive - line numbers. - - - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: - - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp: - - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - - Propagate file name and line number from tokens to semantic - graph nodes. Use file and line numbers when printing error - messages. - - - * CCF/CCF/IDL2/Token.hpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Parser.cpp: - - Fix a number of bugs in error handling and recover. - - - * CIDLC/cidlc.cpp: - - Use file name and line number when creating the translation - unit object. - - -Wed Sep 20 04:05:42 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> - - * docs\tutorials\CoSMIC\02.html - - Added some useful links to various resources to help readers reduce - learning curve.Added a small section that mentions that a Node Map file - has to be created in order to get Quoter example working. Again, - Thanks to Sowayan Abdullah from LMCO for his help in improving the - cosmic documentations. - - -Mon Sep 18 03:26:22 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Utils/XML_Helper.h - - Fixed compile error by removing extra ;. - -Fri Sep 15 21:28:47 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * ciao/Deployment_Core.idl - - Removed the unnecessary event type definition for RTEC since - they are no longer used. - -Sun Sep 10 09:20:18 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - - Removed workaround from previous commit, as Ossama Othman has - provided the proper fix in the G++ macros. - -Fri Sep 8 00:28:27 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - - Made the export declaration on the singleton typedef - contingent on a Microsoft compiler, as the GCC included - with FC5 was not defining the symbol as a result. - -Fri Sep 1 03:09:38 UTC 2006 xiong,ming <ming.xiong@vanderbilt.edu> - - * docs\tutorials\CoSMIC\index.html - * docs\tutorials\CoSMIC\01.html - - Updated index.html to change the cosmic version.Updated 01.html - to reflect recent changes of idl_to_picml. Thanks to Sowayan Abdullah - from LMCO for his help in improving the cosmic documentations. - -Thu Aug 31 22:45:09 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/RepositoryManager.mpc - Modified this file to include $(CIAO_ROOT)/tools/Config_Handlers - in the RMAdmin project. - -Wed Aug 30 17:16:18 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - Added more changes to this file to fix the "reference to - ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex> - ::instance()'"warnings with FC5_Static build. - -Tue Aug 29 23:08:20 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - Fixed the "reference to `ACE_Singleton<CIAO::Config_Handlers - ::XML_Helper, ACE_Null_Mutex>::instance()'"warnings with - FC5_Static build. - - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - Removed unnecessary using of CIAO::Config_Handlers::XML_Helper. - -Mon Aug 28 12:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/Container_Base.cpp: - Fixed some compile warnings with gcc 2.96 - -Thu Aug 24 15:44:08 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - Changed some of the command-line options. - - * examples/BasicSP/RepoMan_Usage.html - Made some minor changes. - -Thu Aug 24 000:41:16 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/PCVisitor.cpp - * DAnCE/Plan_Launcher/PCVisitor.h - * DAnCE/Plan_Launcher/PCVisitorBase.cpp - * DAnCE/Plan_Launcher/PCVisitorBase.h - Solved the "'class has virtual functions but non-virtual destructor" - warnings. - -Wed Aug 23 17:57:15 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/PCVisitorBase.h - Solved the "invalid use of undefined type 'struct PCVisitorBase'" - warnings. - -Wed Aug 23 15:22:36 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/PCVisitor.cpp - Solved the "unused parameter" warning. - -Wed Aug 23 000:04:06 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/README - Made some minor changes. - -Wed Aug 23 000:00:43 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * examples/BasicSP/descriptors/basicNodeDaemon.pl - Use "$ENV{'ACE_ROOT'}/bin" to point to the location of lib file. - -Tue Aug 22 23:47:06 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Modified these files for RepoMan integration. - - * DAnCE/Plan_Launcher/PCVisitor.cpp - * DAnCE/Plan_Launcher/PCVisitor.h - * DAnCE/Plan_Launcher/PCVisitorBase.cpp - * DAnCE/Plan_Launcher/PCVisitorBase.h - * DAnCE/Plan_Launcher/PCVisitorBase.inl - Added these files for RepoMan integration. - - * examples/BasicSP/RepoMan_Usage.html - Added this file, which explains how to run the BasicSP example using - the integrated RepoMan. - -Mon Aug 21 15:19:25 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: Fixed the - environment variable DANCE_ROOT to point to CIAO_ROOT/DAnCE. - -Thu Aug 17 16:09:09 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - Reimplemented the findNamesByType () and getAllTypes () operations - of Repository Manager, which use the newly generated - ACE_Hash_MultiMap_Manager class and its corresponding classes. - -Mon Aug 14 15:46:34 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Utils/XML_Helper.h - - Fixed a compile error for pedantic GCC4. - -Sun Aug 13 15:18:00 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * CCF/CCF/CodeGenerationKit/Regex.hpp: - - Reimplemented regex wrapper to allow building CIDLC on - platforms without wchat_t support (e.g., Cygwin/Mingw). - -Fri Aug 11 11:46:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - - Added support for IDL (underscore) escaping. Added support - for custom name printers. - - * CIDLC/UnescapedNamePrinter.hpp: - - Name printer that prints names unescaped (without the IDL - underscore). - - * CIDLC/CxxNamePrinter.cpp: - * CIDLC/CxxNamePrinter.hpp: - - Name printer that escapes C++ keywords. - - * CIDLC/CorbaTypeNameEmitters.cpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/RepositoryIdGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/UtilityTypeNameEmitters.cpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/CompositionEmitter.cpp: - - Updated to handle IDL and C++ name escaping. This fixes - bugzilla bug #2427. - -Fri Aug 11 07:30:35 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Utils/XML_Helper.h - * DAnCE/RepositoryManager/RMadmin.cpp - - Fixes for a compiler error in the version of GCC shipped with - FC5. - -Wed Aug 9 18:53:48 UTC 2006 Jaiganesh B <jai.dre.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: - examples/Hello/descriptors_RTCCM/rt-example.cdp: - examples/Hello/descriptors_RTCCM/rt-config-example.csr: - - Fixed the RT-CCM code to conform to the schema changes. Made changes - to the descriptors directory to fix the working example for RT-CCM. - - Thanks to Nanbor Wang for helping fix the codebase. - -Tue Aug 8 07:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * CIAO-INSTALL.html: - Removed vc6 info - -Fri Aug 4 21:40:46 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/tutorials/CoSMIC/01.html - * docs/tutorials/CoSMIC/02.html - * docs/tutorials/CoSMIC/03.html - * docs/tutorials/CoSMIC/04.html - * docs/tutorials/CoSMIC/style.css - * docs/tutorials/CoSMIC/index.html - - Style fixes, grammatical and spelling corrections, clarifications. - -Thu Aug 3 20:38:39 UTC 2006 Nanbor Wang <nanbor (at) txcorp (dot) com> - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Fixed RT-CCM support. - -Thu Aug 3 15:33:11 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - - * docs/cidlc.html: - - Regenerated to include the -D and -I options. - -Wed Aug 2 18:52:14 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - - * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp: - - Added option types: flag or value. - - * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp: - * CCF/CCF/CodeGenerationKit/CommandLine.hpp: - - Reimplemented to use hand-coded parser instead of Spirit. The - new implementation takes into account the option types. - - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp: - - Removed. - - * CIDLC/cidlc.cpp: - * CIDLC/ServantGenerator.hpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/DescriptorGenerator.hpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplGenerator.hpp: - - Updated with the option types. This fixes bugzilla bug #2426. - - -Fri Jul 28 17:53:57 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - - * CCF/CCF/IDL2/SemanticGraph/Translation.cpp: - - Reimplemented a chunk of code that resulted in what appears to - be invalid code generation by the Intel C++ compiler. This - fixes bugzilla bug #2387. - -Thu Jul 27 18:08:47 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * CIAO_TAO.mwc - * CIAO_TAO_DAnCE.mwc - - Replaced relative references to ACE/TAO with absolute references - using environment variables. - -Mon Jul 24 15:45:34 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * Subversion conversion completed at revision 73730 - -Sun Jul 23 15:44:43 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * Repository frozen for repository conversion - -Sat Jul 22 21:34:57 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * ciao/Container_Base.cpp - - Fixed a runtime Segfault bug about destroying POA. The problem - is because a Session_Container creates 2 POAs, one of which is called - facet_cons_POA which uses the Servant_Activator policy to activate component - ports (facets, consumers) on demand, then the Servant_Activator object - was deleted when the Session_Container object is out of scope in its - destructor. But when the ORB finally shuts itself down, it tries - to clean all the resources including the facet_cons_POA, since the - Servant_Activator attached to this POA is long gone, a segfault - occurs in the cleaning up phase. The right fix is to destroy all the POAs - associated with this Session_Container in its destructor together with the - Servant_Activator. Thanks Phlip <phlip2005 @ gmail.com> for a - bug report. - -Thu Jul 20 22:03:31 UTC 2006 Nanbor Wang <nanbor (at) txcorp (dot) com> - - * docs/schema/ServerResourceUsage.txt: Revised the document to - change how a policy set should be hooked into a component - instance. This needs to be changed to reflect recent changed in - DnC schema. - -Thu Jul 20 01:10:58 UTC 2006 Vipul Singh <vipuls@dre.vanderbilt.edu> - - * DAnCE/RepositoryManager/PC_Updater.cpp: Removed the variable name - from the arguments in function definition in empty functions to - fix warnings. - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: Changed declaration - at a few places from const static to static const to fix a few - warnings, also removed an unnecessarily defined namespace. - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: Made a few - changes to fix the warnings and to keep the code in sync with - the changes made to RepositoryManager_Impl.h. Fixed code which - passed non POD types to a varargs function(ACE_DEBUG) which - resulted in aborts at runtime. - - * DAnCE/RepositoryManager/URL_Parser.cpp: Assigned value to ptr before - if condition to fix a few warnings. - -Wed Jul 19 08:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/Config_Handlers.mpc: - Use exceptions as base project - -Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Use new ACE_CString::size_type type to hold string - position/index value, instead of "int". Addresses "comparison - between signed and unsigned" warnings. - -Sat Jul 15 04:21:13 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/README.txt: - Remove this file. - - * DAnCE/RepositoryManager/README: - Add this file. - -Thu Jul 13 18:42:08 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Fixed a minor error. - -Wed Jul 12 14:00:59 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/RM_Helper.cpp: - Fixed the "comparison between signed and unsigned integer" warning. - -Tue Jul 11 23:19:58 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Fixed the "conversion from '__int64' to 'size_t', possible loss - of data" warnings. - -Sun Jul 09 06:01:14 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * CIAO version 0.5.2 released. - -Wed Jul 5 15:31:18 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * NEWS - Updated the NEWS file to add the changes of Repoman. - -Tue Jul 4 11:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Dynamic_Component_Servant_T.cpp: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - Fixed compile problems with VxWorks 5.5.1 and GCC 2.96 - -Tue Jul 4 06:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - Don't build this project in the ace_for_tao configuration - -Mon Jul 3 16:20:54 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * NEWS - - Updated the NEWS file. - -Tue Jun 27 13:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/RepositoryManager/RM_Helper.cpp: - Layout changes - -Fri Jun 23 13:45:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Added $(TAO_ROOT) to the 'includes' line of the executable - project, due to a change in the way TAO/Version.h is - included. - -Thu Jun 22 18:47:47 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Dynamic_Component_Servant_T.cpp: - * ciao/Dynamic_Component_Servant_T.h: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - - Made changes to template code corresponding to those in - - Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - -Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Home_Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp - * ciao/Servant_Impl_T.h: - - Reduced the number of template parameters in - the component servant and home servant template - base classes. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changes to generated servant code corresponding - the the changes in servant base class code - described above. - -Thu Jun 15 20:13:02 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tools/IDL3_to_IDL2/be_helper.cpp: - - Uncommented code that outputs our copyright notice. This - change also elinates an unused arg warning for the - copyright notice string. - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Added a newline after opening the file for better readability. - -Thu Jun 15 18:37:43 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - - Added ciao_deployment_stub as a base project for - CIAO_Events_Handlers, to eliminate 'unresolved symbol' - linking errors. Thanks to Ming Xiong <ming.xiong@vanderbilt.edu> - for suggesting the fix. - -Thu Jun 15 15:10:58 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tools/IDL3_to_IDL2/be_extern.h: - * tools/IDL3_to_IDL2/be_init.cpp: - * tools/IDL3_to_IDL2/be_produce.cpp: - - Changes to keep this backend in sync with changes to the - TAO_IDL front end - see TAO ChangeLog entry of a few - minutes ago. - -Thu Jun 8 16:07:05 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Servant_Impl_Utils_T.cpp (describe_multiplex_receptacle): - - Fixed an error in instantiation of a - Components::ConnectionDescription valuetype - the actual - constructor call should have been on the OBV_* subclass. - -Thu Jun 8 12:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/Planner/PCVisitor.cpp: - Fixed parameter never used warnings - -Wed Jun 7 21:39:00 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc - - Removed unneeded base projects. - -Wed Jun 7 21:07:11 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Servant_Impl_Utils_T.cpp: - - Fixed CORBA memory management rule violations in - Servant_Impl_Base static template methods - describe_pub_event_source(), describe_simplex_receptacle() and - describe_multiplex_receptacle(). Thanks to Phlip - <phlip2005@gmail.com> for reporting a problem in - get_all_receptacles() that uncovered the above violations. - -Wed Jun 7 16:52:45 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Config_Handlers.mpc - - Fix for linking error in Visual Studio. - -Wed Jun 7 06:04:45 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * CIDLC/ExecutorMappingGenerator.cpp - - Modified to generate an include of CCM_Container.idl. - - * ciao/Components.idl - * ciao/ComponentsC.h - * ciao/ComponentsS.h - - Changed Components.idl to include CCM_Component.idl instead of - CCM_Container.idl. This removes a dependancy on the container - library for stub projects. - - Note this commit may be rolled back later based on discussions - on the dance-dev list, I am making it preemptively to resolve - scoreboard problems. - -Tue Jun 6 20:32:53 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Property_Handler.h - - Compile fixes for Borland. - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/XMLSchema/Writer.hpp - - Fixes for Borland ICEs. - -Tue Jun 6 13:48:59 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Config_Handlers_Common_Export.h - - Missing file from previous commit. - -Mon Jun 5 20:34:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/TargetManager/TM_Client.mpc - * RACE/Controller/Component/Controller.mpc - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Swapping/Hello_Base/Hello_Base.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * performance-tests/Protocols/common/Protocols.mpc - * tests/Bug_2130_Regression/interfaces/ENW.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - * 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 - * tests/Minimum/Minimum_Base/Minimum.mpc - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - - Fixes for linking errors/warnings in OS X. - - * tools/Config_Handlers/Any_Handler.h - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.h - - Factored certain elements used by both the deployment - and packaging handlers into a seperate library, also - fixes for linking errors in OS X. - -Fri Jun 2 18:55:41 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tools/Config_Handlers/Config_Handlers.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TM_Client.mpc: - - Shortened long lines. - -Fri Jun 2 12:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * rules.ciao.GNU: - Added setting of TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP when - they are not set, needed for cross compilation - -Thu Jun 1 21:23:51 UTC 2006 <ming.xiong@vanderbilt.edu> - - * examples/Hello/descriptors/run_test.pl - Changed the codes so that it will correctly destroy all - running processes upon failure. - -Thu Jun 1 16:03:26 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * DAnCE/Planner/Planner.cpp: - - Added global qualifier (double colon) to the specialization - and typedef of the planner's Node class, to avoid an - 'ambiguous symbol' error in VC8, which is presumably confusing - it with Deployment::Node. - -Thu Jun 1 15:49:47 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Planner/Node_T.h - * DAnCE/Planner/Planner.cpp - - Modified some minor errors. - -Thu Jun 1 12:55:07 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Display/NavDisplay/NavDisplay.mpc: - - Fixed typo. - -Wed May 31 18:46:37 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Display/NavDisplay/NavDisplay.mpc: - - Added 'libs += Display_Base_stub' to the - Display_Base_NaviDisplay_stub project so that VC8, with its - parallel builds, will know about the dependency that VC7.1 - seems to get from the 'after' line. - -Wed May 31 18:17:11 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * DAnCE/TargetManager/TM_Client.mpc: - - Cosmetic changes. - -Wed May 31 17:08:17 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - - * DAnCE/Planner/Planner.mpc - * DAnCE/Planner/Planner.cpp - - Removed the generated file of Repoman (RepositoryManagerDaemonC.*) - included in the Planner project and use the RepositoryManagerC.*. - -Wed May 31 16:49:12 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - - Made some minor changes. - -Tue May 30 10:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/NodeManager/MonitorController.cpp: - Fixed typo - -Tue May 30 06:16:58 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - - * tools/Config_Handlers/XSCRT/Elements.hpp: - - Added a fix for Sun C++ <= 5.7 template instantiation issue. - -Tue May 30 00:00:22 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/Planner/Node_T.h: - * DAnCE/Planner/Node_T.inl: - * DAnCE/Planner/Node_T.cpp: - * DAnCE/Planner/PCVisitor.h: - * DAnCE/Planner/PCVisitor.cpp: - * DAnCE/Planner/PCVisitorBase.h: - * DAnCE/Planner/PCVisitorBase.inl: - * DAnCE/Planner/PCVisitorBase.cpp: - * DAnCE/Planner/Planner.mpc: - * DAnCE/Planner/Planner.cpp: - - Checking in the Planner for DAnCE which creates a Deployment - Plan on the fly (in-memory). - - * RACE/Input_Adapters/LocationUpdater/Injector.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h: - * RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp: - * RACE/Input_Adapters/LocationUpdater/PlanUpdater.h: - * RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp: - * RACE/Input_Adapters/LocationUpdater/README.txt: - - Adding the LocationUpdater which is a RACE input adapter which - updates the locations of the implementation artifact to reclect - the ones available in the RepositoryManager. Please see the README - and the code for more info. - - * RACE/Input_Adapters/PlanGenerator/Injector.cpp: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h: - * RACE/Input_Adapters/PlanGenerator/README.txt: - - Adding the PlanGenerator which is a RACE input adapter which queries - the RepositoryManager for an installation name, retrieves the corresponding - PackageConfiguration, and builds the DeploymentPlan on the fly. Please see - the README and the code for more info. - -Mon May 29 21:58:18 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Got rid of the code that updates the loader path for the - libraries downloaded via HTTP. Now this has to be done - manually. - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/README.txt: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - - Changing the way library names are matched to be more general. - Some additions to the README - A minor change to one of the functions - -Mon May 29 19:07:54 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * examples/Swapping/Sender/Sender_exec.cpp: - - Changed C-style casts from void* to pointer-to-function - to two-step reinterpret_cast<>s, with ptrdiff_t as a - temporary intermediate. C++ forbids casting directly - between pointer-to-object and pointer-to-function, and - some the newer compilers are catching it. - -Mon May 29 17:44:01 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Display/Display_Base/Display_Base.mpc: - - Changed the base project of Display_Base_stub from - ciao_client_dnc to ciao_events_base_dnc, in order to pull - in a needed dependency on CIAO_DnC_Container. Thanks to - Ming Xiong <mxiong@dre.vanderbilt.edu> for supplying the - fix. - -Mon May 29 15:32:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/Display/NavDisplay/NavDisplay.mpc: - - Cosmetic changes (shortened long lines). - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Changed 'after +=' and 'libs +=' lines to reflect recent - changes to other examples/Display projects. - -Fri May 26 13:57:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * DAnCE/RepositoryManager/RMAdmin.cpp(ACE_TMAIN): - - Fixed unused variable warning, cosmetic changes. - -Fri May 26 12:59:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * DAnCE/NodeManager/NAM_Map.cpp: - Make the equality test explicit to work with the revised octet - sequence implementation. - -Thu May 25 19:02:52 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Container_Base.cpp(ciao_install_home): - - Changed the single-step reinterpret_cast of the component - DLL entry points to be a two-step process: first to the - integer type 'ptrdiff_t' then to the desired pointer-to- - function type. A single cast won't work because casting - from pointer-to-object (even void*) to pointer-to-function - directly is not allowed in C++. - -Thu May 25 11:50:39 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ciao/Container_Base.cpp: - Replace the use of static_cast in ciao_install_home with - reinterpret_cast since void* sources are involved. - -Wed May 24 17:35:53 UTC 2006 Nanbor Wang <nanbor@exothermic.txcorp.com> - - * examples/Display/RateGen/RateGen.mpc: Fixed the project - dependency for controller. - -Tue May 23 22:46:58 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/Options.h - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - - Added the code to save the state of the RepoMan at exit and - load the state of it at start. - -Tue May 23 14:31:11 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> - - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/Options.h - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - - Added the naming service & the implementation of createPackage - function to RepoMan. - -Mon May 22 18:49:14 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Container_Base.cpp(ciao_install_home): - - Changed C-style casts of DLL entrypoints to static_cast<>s - to the appropriate pointer to function. This change is - intended to eliminate warnings from gcc 4.0. - -Fri May 19 16:49:32 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - * DAnCE/NodeManager/Node_Manager.cpp: - - Minor changes to eliminate scoreboard warnings, and to bring - code in line with the ACE style guidelines. - -Thu May 18 20:28:00 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com> - - * examples/Display/GPS/GPS_Impl.ccd: - * examples/Display/NavDisplay/NavDisplay_Impl.ccd: - * examples/Display/RateGen/RateGen_Impl.ccd: - - Removed these generated files from CVS. - -Thu May 18 11:28:52 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - - * examples/Display/Display_Base/GNUmakefile: - * examples/Display/Display_Base/GNUmakefile.Display_Base_stub: - * examples/Display/Display_Base/GNUmakefile.Display_Base_svnt: - - Removed these files from CVS. - -Wed May 17 21:20:46 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com> - - * TAO/CIAO/examples/Display: - Ported the Display example to use the new CIAO framework - - -Tue May 16 12:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * README: - Removed mentioning of vc6 - -Mon May 15 20:48:52 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * CIDLC/ServantSourceGenerator.cpp (generate): - - Removed commented-out code. - - * CIDLC/ServantHeaderGenerator.cpp (generate_facets): - - Fixed cut-and-paste error that was causing facet servant - class declaration to get skipped when the composition is - defined inside one or more IDL modules. - -Fri May 12 07:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/Utils/Functors.h: - Added a workaround for specific for BCB6, should fix the gcc4 - internal compiler errors - -Fri May 12 07:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/XSCRT/Elements.hpp: - The work around is needed for < gcc 3.3 and also BCB6, so make - it a little bit more easier to handle this. - -Thu May 11 21:24:45 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.hpp: - * CIDLC/UtilityTypeNameEmitters.cpp: - * CIDLC/UtilityTypeNameEmitters.hpp: - - Change code generation for facet servant classes to be - defined in a special namespace created from a prefix - and a flattened version of the name of the scope - containing the interface that supports the facet. This - change enables facets in the same translation unit - using the same interface to use a single source code - definition (an internal check in the CIDL compiler - guarantees that the facet servant class is generated - once per interface per translation unit). The fact - that the actual facet servant class type is an instantiation - of a template class ensures that the same interface type - used as a facet in multiple translation units in a build - will not produce multiple-definition link errors, - although in this case there will be duplicated code. - Thanks to James Hill <j.hill@vanderbilt.edu> for providing - the multiple-facet-single-translation-unit use case - and to Nanbor Wang <nanbor@txcorp.com> for his comments - on the proposed solution. - -Wed May 10 14:04:57 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * DAnCE/NodeManager/MonitorCB.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - - Fixes for warnings. - -Mon May 8 20:41:43 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * bin/PerlCIAO/perlciao.mpc: - - Fixing a fuzz build error due to a missing Id tag - -Mon May 8 15:33:58 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/RepositoryManager/HTTP_Client.h: - * DAnCE/RepositoryManager/HTTP_Client.cpp: - * DAnCE/RepositoryManager/HTTP_Handler.h: - * DAnCE/RepositoryManager/HTTP_Handler.cpp: - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/PC_Updater.h: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater_T.h: - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - * DAnCE/RepositoryManager/README.txt: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.h: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - - Updating the RepositoryManager with the latest changes from the - escher repository. Adding my newest changes. Adding some new - minor features. - - * bin/PerlCIAO/TestUtils.base: - * bin/PerlCIAO/TestUtils.pm: - * bin/PerlCIAO/TestUtils_Base.pm: - * bin/PerlCIAO/generate_container.pl: - * bin/PerlCIAO/perlciao.mpc: - - This is a set of test utilities tailored towards testing CIAO components. - It provides a nice and quick interface provising the common functionality - necessary to run a CIAO test and perform clean-up on failure. This utils - are a wrapper around the $ACE_ROOT/bin/PerlACE/ utilities. I will check in - an example of how test utils are used shortly. - - * tools/Config_Handlers/IDD_Handler.cpp: - - Fixing a bug in the PackageConfiguration reverse handler. - - -Fri May 5 15:36:47 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - - * docs/cidlc.html Added documentation for the CIDL compiler. - Thanks to Boris for contributing this. - - * docs/index.html: Fixed some broken links to the tutorials and added - a link to Ming's tutorial example that shows how to use CoSMIC. - -Fri May 5 16:58:17 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/ExecutionManager/Execution_Manager.cpp (CIAO): Fixed the - parsing of command line options. - -Thu May 4 21:35:01 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/DP_Handler.cpp - - Fixed a reverse handler bug. - -Thu May 4 08:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/RepositoryManager/PC_Updater.cpp: - Fixed compilation error - -Wed May 3 22:11:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/ccd.xsd - * docs/schema/cdd.xsd - * docs/schema/cdp.xsd - * docs/schema/cid.xsd - * docs/schema/cpd.xsd - * docs/schema/iad.xsd - * docs/schema/pcd.xsd - * docs/schema/toplevel.xsd - - Schema propagated from the ARMS repo. - -Wed May 3 12:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * Config_Handlers/Utils/Functors.h: - Made the FUNC argument just return void, this fixes the errors with this - template with BCB on my system, hopefully it doesn't break other - compilers - -Tue May 2 03:04:50 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/NodeApplication/NodeApplication.cpp: Removed the code - snippet that bootstraps the NodeApplication process at a - specific OS priority. - -Wed Apr 26 21:25:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Utils/Functors.h - - Introduced a workaround for a ICE in GCC 4.0.22. - -Wed Apr 26 13:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp: - * tools/Config_Handlers/XSCRT/XMLSchema.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - Removed workarounds for vc6 again - - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: - Added missing post.h - - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: - * tools/Config_Handlers/Package_Handlers/PC_Intf.h: - Fixed incorrect file tags - -Wed Apr 26 08:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/TargetManager/DomainDataManager.h: - Fixed compile problem in gcc4 build - -Tue Apr 25 21:27:05 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * DAnCE/TargetManager/TargetManager.mpc - - Linking problems for Borland. - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - - More compile fixes for Borland. -Tue Apr 25 20:12:25 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * ciao/Deployment_Core.idl - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.h - * tools/Config_Handlers/Property_Handler.cpp - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.cpp - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - - Compilation fixes for borland, some cosmetic fixes as well. - -Tue Apr 25 09:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/CPD_Handler.h: - ComponentPortDescription is a struct, so also forward declare it - as a struct - -Mon Apr 24 18:53:22 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * CIDLC/ServantSourceGenerator.cpp - - Fixed a code generation problem caused by careless merging. - -Mon Apr 24 18:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/ID_Handler.h: - Removed incorrect semi colons - -Mon Apr 24 06:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/IDREF_Base.cpp: - Removed not needed semi colon that caused compile errors in some - builds - -Sun Apr 23 11:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/Utils/XML_Helper.h: - Fixed compile error - -Sat Apr 22 21:13:10 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Compile errors. - -Fri Apr 21 16:24:46 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * Merge from the ARMS Escher repository. - - Changelog entries to follow: - - Tue Apr 11 09:29:12 UTC 2006 <wotte@blade35.isislab.vanderbilt.edu> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeManager/Node_Manager.cpp - - Additional debugging/compile fixes. - - Tue Apr 11 08:30:42 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * ciao/Deployment_Core.idl - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - - Modified to passivate (and reactivate later) shared components - when tearing down an assembly. - - Sun Apr 9 01:03:19 UTC 2006 <wotte@blade35.isislab.vanderbilt.edu> - - * M APRIL_DEMO.mwc - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/MonitorCB.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Various compile/runtime fixes. - - Fri Apr 7 15:47:34 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to enforce passivation occured on all components - before any connections are removed. - - Fri Apr 7 03:28:03 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> - - * tools/Config_Handlers/Utils/XML_Helper.cpp: - - Replaced "throw;" (which Stroustrup tells us causes an abort) - with "throw 0;" (kind of like an unnamed exception, which is - clearly what the author of this code intended). - - * ciao/Packaging_Data.idl: - - I've had occasion to use this file with the IFR Service, and - I've found that the IFR Service backend chokes on a bunch of - stuff here. The stuff that it chokes on has been protected with - "#ifndef AVOID_IFR_CRASH" so that you can protect the backend - from crashing if you pass -DAVOID_IFR_CRASH to tao_ifr. - - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - - Implemented the add_receptacle operation. - - Fri Apr 7 02:55:37 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - - Added ACE_CATCHANY and ACE_CATCHALL blocks in - Plan_Launcher_i::launch_plan to avoid crashing in case of CORBA - fault. - - Fri Apr 7 02:54:29 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - - Options beginning with "-ORB" are explicitly ignored. This - avoids having an "-ORB" option mistakenly parsed as being a - "-o <ior_output_file>" option. - - Fri Apr 7 02:51:31 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> - - * CIDLC/ServantSourceGenerator.cpp: - - Added code to support "get_all_receptacles" operation. - - Fri Apr 7 02:47:02 UTC 2006 Edward R. Mulholland <emulholl@atl.lmco.com> - - * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - - Made a couple small changes that keep the CIDLC from coughing on - enums - - Fri Apr 7 02:37:34 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - - Fixed a bug in detecting External connection and Internal - connections. Earlier when an external component is detected, - not *all* connections associated with this components are - purged from the to-be-removed connections list. Added another - helper method <purge_connections> to accomplish this task. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Modified to reuse rebind() instead of bind() to avoid - redeployment duplicate instance errors. - - Thu Apr 6 15:02:59 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/NodeApplication/NodeApplication.cpp: - - Modified the NodeApplications to up at OS priority 20 instead of - 50. - - Thu Apr 6 00:35:35 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - Fixed the TM component removal problem. Changed/Removed - debug messages. - - Wed Apr 5 16:54:20 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Any_Handler.cpp - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - - Improvements to output more information in the reverse handler. - - - Thu Mar 30 22:10:53 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> - - * DAnCE/NodeApplication/Container_Impl.cpp - * DAnCE/NodeApplication/NodeApplication.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * ciao/Home_Servant_Impl_T.cpp - * ciao/Servant_Activator.cpp - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - - Disabled excessive debugging. - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Disabled RT-CCM support. - - * DAnCE/TargetManager/DomainDataManager.cpp - - Added error messages. - - Wed Mar 29 21:34:07 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Fixed a Access Error in the monitor. - - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Added to have graceful termination. - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Update to turn off monitors at the end. - - Mon Mar 27 22:39:25 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - - Mon Mar 27 20:10:09 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp - (get_node_manager): - - Modified this method to re-throw the caught exception. - - Sun Mar 26 22:10:16 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - - Added code to handle exceptions while trying to connect to the - node managers in get_node_manager (). - - * DAnCE/TargetManager/DomainDataManager.cpp: - - Added debug messages. - - * RACE/Controller/Component/RACE_common.h: - - Added a new file to define the RACE_DEBUG and RACE_ERROR macros. - - Mon Mar 27 00:22:02 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to allow ccm_passicate to be called on all components - before actually deactivating any components. - - Thu Mar 23 23:18:56 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/NodeManager/MonitorController.cpp (svc): - - Removed an unwanted debug statement. - - Thu Mar 23 22:54:25 UTC 2006 Nishanth Shankarn <nshankar@dre.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Removed an unwanted debug statement. - - Thu Mar 23 19:40:54 UTC 2006 Nishanth Shankarn <nshankar@dre.vanderbilt.edu> - - * APRIL_DEMO.mwc: - * CIAO.mwc: - * CIAODAnCE.mwc: - * CIAOTAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Modified the mwc files so that they exclude the RACE/hog_string - directory. - - Thu Mar 23 18:04:58 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Fixed a bug in set_priority method. - - Wed Mar 22 19:32:37 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Modified to make debug statements debug_level controlled. - - Wed Mar 22 00:51:11 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Modified to find the corresponding NAM when given a plan_uuid. - - Wed Mar 22 02:12:58 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - - Removed some of the debug statements - - Tue Mar 21 19:12:57 UTC 2006 Nishanth Shankarn <nshankar@dre.vanderbilt.edu> - - * RACE/hog_string/hog.cdp: - - Fixed the plan id. - - Mon Mar 20 21:07:50 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - turning off the HTTP capability for Linux until I figure out why - it affects the loading of libraries. - - Mon Mar 20 20:40:37 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Changed loader path delimiter on Unix-like systems from ';' to ':' - - - Mon Mar 20 17:22:22 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/HTTP_Client.h: - * DAnCE/NodeApplicationManager/HTTP_Client.cpp: - * DAnCE/NodeApplicationManager/HTTP_Handler.h: - * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: - * DAnCE/NodeApplicationManager/URL_Parser.h: - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - - Oops. Forgot to add the actual HTTP code. - - Mon Mar 20 04:27:48 UTC 2006 Stoyan Paunov <spaunov@isis.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - - Adding HTTP capability to DAnCE. - - * DAnCE/RepositoryManager/HTTP_Client.h: - * DAnCE/RepositoryManager/HTTP_Client.cpp: - * DAnCE/RepositoryManager/HTTP_Handler.h: - * DAnCE/RepositoryManager/HTTP_Handler.cpp: - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/PC_Updater.h: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater_T.h: - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.h: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - - Porting the RepositoryManager to the newest XML config handlers. - Also migrating the code from the DOC repository to ensure the gap - between the code in this repository and that in cvs.doc.wustl.edu - repo is closed. - - - NOTE: I still have some testing left, but before that I need to - compile the CoSMIC version from this repository and regenerate - a bunch of descriptors because all the example descriptors are - broken. - - Sat Mar 18 22:33:10 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> - - * DAnCE/Interfaces/NodeManager.idl - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * ciao/Deployment.idl - - Put the struct Sched_Params definition outside of the NAM - interface. - Cleaned up the code a bit. - - Sun Mar 19 16:52:54 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Updated to implement the commitResource and releaseResource - function - - Sat Mar 18 19:01:18 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/NodeApplication/NodeApplication.cpp: - - Enhanced the NodeApplication to run in realtime priority mode. - - Fri Mar 17 06:36:18 UTC 2006 Nilabja Roy <roy_n@dre.vanderbilt.edu> - - * DAnCE/Interfaces/NodeManager.idl: - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * ciao/Deployment.idl: - - Implemented the set_priority method on the NodeManager - and NodeApplicationManager interface. Removed some of the debug - messages - - Thu Mar 16 03:54:39 UTC 2006 Nilabja Roy <nilabjar@dre.vanderbilt.edu> - - * tools/Config_Handlers/DD_Handler.cpp: - Updated the handler to handle optional parameters - - Tue Mar 14 07:01:28 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - Updated to make it portable in windows - - * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp: - Fixed the entry point. - - Mon Mar 13 23:04:32 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> - - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/ID_Handler.h - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - * tools/Config_Handlers/Utils/XercesString.h - - Fixed linking/warnings on Windows. - - Mon Mar 13 18:27:27 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/TargetManager.mpc: - Changed the projects to depend on NodeManager_Stub. This will fix the - linking errors in Windows. - - Mon Mar 13 17:36:28 UTC 2006 Krishnakumar B <kitty@dre.vanderbilt.edu> - - * CIDLC/ServantSourceGenerator.cpp (namespace): Updated the - generated code to set the component id on the component context - class to allow retrieving the id at run-time from an executor - implementation. - - Mon Mar 13 17:28:44 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Fixes for nameservice discovery of EM. - - * docs/schema/toplevel.xsd - - Minor correction to schema. - - Fri Mar 10 17:03:26 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - - Fixed minor bug in URI interface. - - Thu Mar 9 22:26:17 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_Base.h: - - Added CORBA::String_var member to store the component instance - id, also added a pair of set/get methods called _ciao_instance_id. - - Wed Mar 8 19:07:31 UTC 2006 <wotte@mako.isislab.vanderbilt.edu> - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - - Add error message for connection failure. - - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - - Disabled this project. - - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/TargetManager/TargetManager_exec.h - - Fix entry point problems. - - Wed Mar 8 19:29:20 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Added the structure in the TMExt interface to maintain the - mapping between hostname to NM refs. - - Wed Mar 8 14:40:41 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools//Config_Handlers/Deployment.cpp - * tools//Config_Handlers/Deployment.hpp - * tools//Config_Handlers/GNUmakefile - * tools//Config_Handlers/cdd.cpp - * tools//Config_Handlers/cdd.hpp - * tools//Config_Handlers/pcd.cpp - * tools//Config_Handlers/pcd.hpp - * tools//Config_Handlers/toplevel.cpp - * tools//Config_Handlers/toplevel.hpp - * tools//Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools//Config_Handlers/Package_Handlers/PCD_Handler.h - - New generated code. - - Wed Mar 8 03:11:02 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Implement the Signal Handler for the process NodeManager. And - set the option avoid_zombies=0 - - - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Implement ComponentID to Process Id mapping - - Tue Mar 7 23:26:41 UTC 2006 Nilabja Roy <nilabjar@localhost.localdomain> - - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/TargetManagerExt.idl - * DAnCE/TargetManager/TargetManager.mpc: - Changed to depend on the NodeManager_Stub, so that - CIAO::NodeManager can be used. - - Tue Mar 7 03:14:50 UTC 2006 Nilabja R <nilabjar@dre.vanderbilt.edu> - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Changed to add the Comp_id to Proc_id mapping - - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Changed to add the percentage cpu same as vmstat - - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - Changed to add the Comp_id to Proc_id mapping - - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Changed to add the Comp_id to Proc_id mapping - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - Changed to add interface to RACE - - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Changed to add interface to RACE - - * DAnCE/TargetManager/descriptors/Domain.cdd: - Updated to the latest xsd - - - * docs/schema/cdd.xsd: - Changed the Domain definations - - Mon Mar 6 19:46:54 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/Interfaces/NodeManager.idl - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Added the set_priority method to modify the priority of - NodeApplication process. - - Wed Mar 1 20:56:16 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * DAnCE/TargetManager/TargetManager_exec.h - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/TargetManager/TargetManagerExt.idl: - - Added method to TargetManagerExt interface to obtain references to - the NodeManagers. - - - Fri Feb 24 22:55:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/CRDD_Handler.cpp - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/DP_Handler.h - * tools/Config_Handlers/DataType_Handler.cpp - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/IDREF_Base.h - * tools/Config_Handlers/ID_Handler.cpp - * tools/Config_Handlers/ID_Handler.h - * tools/Config_Handlers/IRDD_Handler.cpp - * tools/Config_Handlers/IRDD_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/RDD_Handler.cpp - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/STD_PCD_Handler.h - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/test.cdp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.h - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.h - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/IAD_Handler.h - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/PCD_Handler.h - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp - * tools/Config_Handlers/Package_Handlers/PC_Intf.h - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - * tools/Config_Handlers/Package_Handlers/test.cpp - * tools/Config_Handlers/Package_Handlers/descriptors/package.tpd - * tools/Config_Handlers/Utils/Exceptions.h - * tools/Config_Handlers/Utils/Functors.h - * tools/Config_Handlers/Utils/XML_Error_Handler.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - * tools/Config_Handlers/XMLSchema/Writer.hpp - - Package handlers and changes necessary to support them. - -Fri Apr 21 08:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * CIDLC/ServantSourceGenerator.cpp: - Removed usage of ACE_NESTED_CLASS - - * DAnCE/RepositoryManager/PC_Updater.cpp: - Fixed compile errors - -Thu Apr 20 13:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/DnC_Dump.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - Fixed compile error - -Thu Apr 20 09:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp: - Fixed compile error - -Wed Apr 19 19:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Fixed usage of sequences. The sequences now return - a pointer on the subscript operators, not _var which was not according - to the spec. - -Wed Apr 19 14:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/XMLSchema/Types.hpp: - Removed vc6 workaround - -Wed Apr 19 13:43:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/schema/xsc-banner.h: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - Removed include of vc6-4786.h - -Wed Apr 19 13:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/STD_PC_Intf.cpp: - * tools/Config_Handlers/XSCRT/XMLSchema.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - Removed vc6 workarounds - -Wed Apr 19 11:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/DnC_Dump.{h,cpp}: - Updated for string manager change in TAO - - * ciao/Servant_Impl_Base.cpp: - Updated for sequence change - -Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.hpp - Removed vc6 workarounds - - * tools/Config_Handlers/vc6-4786.h - Removed - -Tue Apr 18 20:55:05 2006 Wallace Zhang <zhangw@ociweb.com> - - * CIAO version 0.5.1 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp index 5f6e141f48f..7692884e278 100644 --- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp @@ -1,11 +1,10 @@ // $Id$ #include "Deployment_Configuration.h" -#include "ciao/CIAO_common.h" #include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" -#include "ace/Read_Buffer.h" + +const int NAME_BUFSIZE = 1024; CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o) : orb_ (CORBA::ORB::_duplicate (o)) @@ -20,6 +19,8 @@ CIAO::Deployment_Configuration::~Deployment_Configuration (void) int CIAO::Deployment_Configuration::init (const char *filename) { + // @@ We should change to use ACE_Configuration here. + if (filename == 0) { ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp" @@ -33,51 +34,33 @@ CIAO::Deployment_Configuration::init (const char *filename) { ACE_ERROR_RETURN ((LM_ERROR, "DAnCE (%P|%t) Deployment_Configuration.cpp:" - "Fail to open node manager map data file: <%s>\n", + "Fail to open node manager map data file: %s : \n", filename), -1); } - // Get a read buffer, this will close the stream when we are ready - ACE_Read_Buffer reader (inf, true); - - bool first = true; - char* string = 0; + char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE]; + int first = 1; - // Read from the file line by line - while ((string = reader.read ('\n', '\0')) != 0) + while (fscanf (inf, "%s %s", destination, ior ) != EOF) { - // Search from the right to the first space - const char* ior_start = ACE_OS::strrchr (string, ' '); - // Search from the left to the first space - const char* dest_end = ACE_OS::strchr (string, ' '); - // The destination is first followed by some spaces - ACE_CString destination (string, dest_end - string); - // And then the IOR - ACE_CString ior (ior_start + 1, ACE_OS::strlen (ior_start + 1) - 1); - if (this->deployment_info_.bind (destination.c_str (), ior.c_str ()) != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "DAnCE (%P|%t) Deployment_Configuration, " - "failed to bind destination <%s>\n", - destination.c_str ()), - -1); - } - - if (CIAO::debug_level () > 5) + // This should not fail!! + // + if (this->deployment_info_.bind (destination, ior) != 0) { - ACE_DEBUG ((LM_DEBUG, - "DAnCE (%P|%t) Deployment_Configuration, " - "read <%s> <%s>\n", destination.c_str (), ior.c_str ())); + ACE_ERROR ((LM_ERROR, + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Reuse existing node in the cached map: [%s]\n", + destination)); } if (first) { this->default_node_manager_.IOR_ = ior; - first = false; + first = 0; } } - + ACE_OS::fclose (inf); return 0; } @@ -85,7 +68,7 @@ const char * CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const { if (name == 0) - return this->get_default_node_manager_ior (); + return get_default_node_manager_ior (); ACE_Hash_Map_Entry <ACE_CString, @@ -95,8 +78,8 @@ CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const entry) != 0) { ACE_ERROR ((LM_ERROR, - "DAnCE (%P|%t) Deployment_Configuration, " - "get_node_manager_ior, failed to find IOR for destination <%s>\n", + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Failed to find IOR for destination [%s] : \n", name)); return 0; } @@ -126,17 +109,18 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name if (this->deployment_info_.find (ACE_CString (name), entry) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, - "DAnCE (%P|%t) Deployment_Configuration.cpp:" - "Failed to find IOR for destination <%s>\n", - name), - 0); + ACE_ERROR ((LM_ERROR, + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Failed to find IOR for destination [%s] : \n", + name)); + return 0; } if (CORBA::is_nil (entry->int_id_.node_manager_.in ())) { ACE_TRY { + CORBA::Object_var temp = this->orb_->string_to_object (entry->int_id_.IOR_.c_str () ACE_ENV_ARG_PARAMETER); diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h index 16b2edc85f4..f4b828b3f20 100644 --- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h +++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h @@ -23,13 +23,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ciao/Deployment_NodeManagerC.h" +#include "ciao/NodeManagerC.h" +#include "DomainApplicationManager/DomainApplicationManager_Export.h" +#include "ace/SString.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "ace/SString.h" -#include "DomainApplicationManager/DomainApplicationManager_Export.h" - namespace CIAO { /** @@ -64,7 +64,7 @@ namespace CIAO Deployment_Configuration (CORBA::ORB_ptr o); /// Destructor - ~Deployment_Configuration (void); + virtual ~Deployment_Configuration (void); /** * Init method takes the filename to a configuration file which @@ -82,7 +82,7 @@ namespace CIAO * @retval 0 if no valid name were found. When @c name = 0, then * this function behave exactly as get_default_activator_ior. */ - const char *get_node_manager_ior (const char *name) const; + virtual const char *get_node_manager_ior (const char *name) const; /** * Return the default NodeManager the DomainApplicationManager @@ -92,12 +92,12 @@ namespace CIAO * * @retval 0 if no valid daemon is configured. */ - const char *get_default_node_manager_ior () const; + virtual const char *get_default_node_manager_ior () const; /** * @retval nil if no valid name were found. */ - ::Deployment::NodeManager_ptr + virtual ::Deployment::NodeManager_ptr get_node_manager (const char *name ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -108,7 +108,7 @@ namespace CIAO * * @retval nil if no valid daemon is configured. */ - ::Deployment::NodeManager_ptr + virtual ::Deployment::NodeManager_ptr get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc index 0fa9d1eaafb..263fb68e16e 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (DomainApplicationManager): ciao_deployment_svnt, naming { +project (DomainApplicationManager): ciao_deployment_svnt { sharedname = DomainApplicationManager after += ExecutionManager_stub diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 2ccae73ade2..a8b60e4c0f4 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -2,7 +2,7 @@ #include "DomainApplicationManager_Impl.h" #include "ExecutionManager/Execution_Manager_Impl.h" -#include "ciao/Deployment_NodeApplicationManagerC.h" +#include "ciao/NodeApplicationManagerC.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" #include "ace/SString.h" @@ -254,7 +254,7 @@ get_plan_info (void) // Error: If there are no nodes in the plan => No nodes to deploy the // components - CORBA::ULong const length = this->plan_.instance.length (); + const CORBA::ULong length = this->plan_.instance.length (); if (length == 0) { @@ -1464,7 +1464,7 @@ start (ACE_ENV_SINGLE_ARG_DECL) for (i = 0; i < this->num_child_plans_; ++i) { // Get the NodeApplication object reference. - ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0; + ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry; if (this->artifact_map_.find (this->node_manager_names_[i], entry) != 0) @@ -2040,7 +2040,7 @@ purge_connections (Deployment::Connections_var & connections, } } -const Deployment::Properties * +Deployment::Properties * CIAO::DomainApplicationManager_Impl:: get_connection_QoS_configuration (const Deployment::Requirement & requirement) { diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h index cf13d10250c..b628b699462 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h @@ -28,18 +28,16 @@ #include "ace/Vector_T.h" #include "ace/Functor.h" #include "ace/OS_NS_string.h" - -#include "ciao/Deployment_DomainApplicationManagerS.h" +#include "ciao/DomainApplicationManagerS.h" #include "ciao/Deployment_common.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "ciao/CIAO_common.h" -#include "ciao/Deployment_EventsC.h" - #include "Deployment_Configuration.h" #include "DomainApplicationManager_Export.h" +#include "ciao/CIAO_common.h" +#include "ciao/Deployment_EventsC.h" namespace CIAO { @@ -61,9 +59,9 @@ namespace CIAO { public: - /// External_Connections means we search all the connections including - /// the connectiosn for external/shared components of this plan which hold - /// port objrefs of components within this plan + // External_Connections means we search all the connections including + // the connectiosn for external/shared components of this plan which hold + // port objrefs of components within this plan enum Connection_Search_Type { External_Connections, @@ -199,6 +197,7 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)); + /** * Starts the application. Raises the StartError exception if * starting the application fails. @@ -210,7 +209,7 @@ namespace CIAO /** * Terminates a running application. Raises the StopError * exception if an error occurs during termination. Raises the - * InvalidReference exception if the appliction reference is + * InvalidReference exception if the appliction referen is * unknown. */ virtual void destroyApplication (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) @@ -273,8 +272,8 @@ namespace CIAO /** * Construct <Component_Binding_Info> struct for the component instance. * - * @param name component instance name - * @param child_uuid child plan uuid string + * @para name component instance name + * @para child_uuid child plan uuid string */ CIAO::Component_Binding_Info * populate_binding_info (const ACE_CString& name, @@ -285,7 +284,7 @@ namespace CIAO * Fetch the plan_uuid info from the internally cached shared component * list. * - * @param name component instance name + * @para name component instance name */ CIAO::Component_Binding_Info * populate_binding_info (const ACE_CString& name); @@ -300,7 +299,7 @@ namespace CIAO * A helper function to add a list of shared components into * the cached shared component list. * - * @param shared A list of shared components to be added. + * @para shared A list of shared components to be added. */ void add_shared_components (const Deployment::ComponentPlans & shared); @@ -308,7 +307,7 @@ namespace CIAO * A private function to check whether a component is in the shared * component list. * - * @param name The name of a component instance. + * @para name The name of a component instance. */ bool is_shared_component (const char * name); @@ -383,7 +382,7 @@ namespace CIAO void purge_connections (Deployment::Connections_var & connections, const char * inst); - + /** * The first step in finish_launching an application in the * domain-level. We install all the CIAO_Event_Service objects @@ -409,7 +408,7 @@ namespace CIAO * deployment requirement. The deployment requirement only specifies * an identifier/reference to the EventServiceDeploymentDescriptions. */ - virtual const Deployment::Properties * + virtual Deployment::Properties * get_connection_QoS_configuration ( const Deployment::Requirement & requirement); diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/CIAO/DAnCE/ExecutionManager/DAM_Map.h index 73a1d97bed4..1e6914db7f3 100644 --- a/CIAO/DAnCE/ExecutionManager/DAM_Map.h +++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.h @@ -13,7 +13,7 @@ #define CIAO_DAM_MAP_H #include /**/ "ace/pre.h" -#include "ciao/Deployment_DomainApplicationManagerC.h" +#include "ciao/DomainApplicationManagerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc index 736eaa5f885..7e5ffea6540 100644 --- a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc +++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc @@ -1,9 +1,12 @@ // -*- MPC -*- // $Id$ -project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc, ciao_executionmanager_stub { +project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc { exename = Execution_Manager + after += ExecutionManager_stub + libs += ExecutionManager_stub + IDL_Files { } diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp index 71d2280ef31..545da80c14b 100644 --- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp +++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp @@ -168,7 +168,7 @@ namespace CIAO ACE_TRY_CHECK; - if (CORBA::is_nil (poa.in ())) + if (poa.in () == 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) CIAO_ExecutionManager: " "Nil POA panic error, returning \n"), @@ -189,6 +189,9 @@ namespace CIAO daemon_servant->_this (); TAO::Utils::Implicit_Deactivator de (daemon_servant); + + ACE_TRY_CHECK; + bool retval = false; if (register_with_ns_) diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp index 85f7ebd005d..cef9bce35b9 100644 --- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp +++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp @@ -218,7 +218,7 @@ namespace CIAO Deployment::DeploymentPlan_var plan = dam->getPlan (); // If any component is still running, then we return. - CORBA::ULong const inst_lenth = plan->instance.length (); + CORBA::ULong inst_lenth = plan->instance.length (); for (CORBA::ULong i = 0; i < inst_lenth; ++i) { if (this->is_component_running (plan->instance[i].name.in (), diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h index cbbdd3094a1..174fc793c99 100644 --- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h +++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h @@ -166,7 +166,7 @@ namespace CIAO PortableServer::POA_var poa_; /// Path to the initialization file - ACE_CString const init_file_; + const ACE_CString init_file_; /// A map which caches the DomainApplicationManager object ref. DAM_Map map_; diff --git a/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl b/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl index 01942fd3afa..121901c4b21 100644 --- a/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl +++ b/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl @@ -8,7 +8,7 @@ * to terminate the process cleanly. */ -#include "ciao/Deployment_ExecutionManager.idl" +#include "ciao/ExecutionManager.idl" module CIAO { diff --git a/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl b/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl index 617df0f080f..034929e86bf 100644 --- a/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl +++ b/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl @@ -6,8 +6,7 @@ * @brief Controling interface for managing and controling CIAO daemon. */ -#include "ciao/Deployment_NodeManager.idl" -#include "ciao/Deployment_NodeApplicationManager.idl" +#include "ciao/NodeManager.idl" module CIAO { @@ -25,7 +24,7 @@ module CIAO // Shutdown the daemon process. oneway void shutdown (); - + /// RACE specific extension. /// Modify the priority of a node application process. long set_priority (in string plan_id, diff --git a/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h b/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h deleted file mode 100644 index b9ebab3d7cb..00000000000 --- a/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_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 NODEAPPLICATION -// ------------------------------ -#ifndef NODEAPPLICATION_EXPORT_H -#define NODEAPPLICATION_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (NODEAPPLICATION_HAS_DLL) -# define NODEAPPLICATION_HAS_DLL 1 -#endif /* ! NODEAPPLICATION_HAS_DLL */ - -#if defined (NODEAPPLICATION_HAS_DLL) && (NODEAPPLICATION_HAS_DLL == 1) -# if defined (NODEAPPLICATION_BUILD_DLL) -# define NODEAPPLICATION_Export ACE_Proper_Export_Flag -# define NODEAPPLICATION_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NODEAPPLICATION_BUILD_DLL */ -# define NODEAPPLICATION_Export ACE_Proper_Import_Flag -# define NODEAPPLICATION_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NODEAPPLICATION_BUILD_DLL */ -#else /* NODEAPPLICATION_HAS_DLL == 1 */ -# define NODEAPPLICATION_Export -# define NODEAPPLICATION_SINGLETON_DECLARATION(T) -# define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NODEAPPLICATION_HAS_DLL == 1 */ - -// Set NODEAPPLICATION_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NODEAPPLICATION_NTRACE) -# if (ACE_NTRACE == 1) -# define NODEAPPLICATION_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NODEAPPLICATION_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NODEAPPLICATION_NTRACE */ - -#if (NODEAPPLICATION_NTRACE == 1) -# define NODEAPPLICATION_TRACE(X) -#else /* (NODEAPPLICATION_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NODEAPPLICATION_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NODEAPPLICATION_NTRACE == 1) */ - -#endif /* NODEAPPLICATION_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/DAnCE/NodeApplication/Configurator_Factory.h b/CIAO/DAnCE/NodeApplication/Configurator_Factory.h index d80f12c3cee..0dfdf8bbcce 100644 --- a/CIAO/DAnCE/NodeApplication/Configurator_Factory.h +++ b/CIAO/DAnCE/NodeApplication/Configurator_Factory.h @@ -18,13 +18,12 @@ #define CIAO_CONFIGURATOR_FACTORY_H #include /**/ "ace/pre.h" -#include "CIAO_NodeApplication_export.h" +#include "tao/ORB_Core.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ORB_Core.h" #include "tao/ORB.h" #include "ace/Task.h" #include "ace/SString.h" @@ -50,7 +49,7 @@ namespace CIAO * developers can plug in their own system configuration needs into * the whole system. */ - class NODEAPPLICATION_Export NodeApplication_Options + class NodeApplication_Options { public: // default ctor. diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp index 7b57887f458..a0c46092990 100644 --- a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp @@ -1,8 +1,7 @@ // $Id$ #include "Container_Impl.h" -#include "ciao/CCM_StandardConfiguratorC.h" -#include "ciao/CCM_KeylessCCMHomeC.h" +#include "ciao/CCM_ComponentC.h" // for calling StandardConfigurator interface #include "orbsvcs/CosNamingC.h" @@ -45,7 +44,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies { ACE_NEW_THROW_EX (this->container_, CIAO::Session_Container (this->orb_.in (), this), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (-1); } else @@ -53,7 +52,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies ACE_NEW_THROW_EX (this->container_, CIAO::Session_Container (this->orb_.in (), this, 1, this->static_entrypts_maps_), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (-1); } @@ -262,7 +261,7 @@ CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retval, ::Deployment::Properties, - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); *retval = this->properties_; @@ -369,6 +368,35 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name ACE_THROW (::Components::RemoveFailure ()); } +::Components::CCMHomes * +CIAO::Container_Impl::get_homes (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + CIAO_TRACE ("CIAO::Container_Impl::get_homes"); + Components::CCMHomes * tmp = 0; + ACE_NEW_THROW_EX (tmp, + Components::CCMHomes (), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (0); + + Components::CCMHomes_var retval (tmp); + + CORBA::ULong const len = this->home_map_.current_size (); + retval->length (len); + + + CORBA::ULong i = 0; + const Home_Iterator end = this->home_map_.end (); + for (Home_Iterator iter (this->home_map_.begin ()); + iter != end; + ++iter, ++i) + { + retval[i] = Components::CCMHome::_duplicate ( (*iter).int_id_); + } + + return retval._retn (); +} + // Remove all homes and components void CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL) @@ -485,7 +513,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name if (this->naming_map_.find (str, naming_context) == 0) { - bool const result = + bool result = unregister_with_ns ( naming_context.c_str (), this->orb_.in () diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h index 3a6c91ae2b5..0549841ce53 100644 --- a/CIAO/DAnCE/NodeApplication/Container_Impl.h +++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h @@ -19,15 +19,15 @@ #define CIAO_CONTAINER_IMPL_H #include /**/ "ace/pre.h" -#include "CIAO_NodeApplication_export.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ciao/Deployment_ContainerS.h" -#include "ciao/Deployment_NodeApplicationC.h" +#include "ciao/Deployment_CoreS.h" #include "ciao/Container_Base.h" +//#include "ciao/Swapping_Container.h" #include "ace/SString.h" #include "ciao/Server_init.h" // write_IOR function & NameUtility #include "ciao/CIAO_common.h" // CIAO::debug_level @@ -45,7 +45,7 @@ namespace CIAO * interface and is used to manage the lifecycle of the installed * components and homes. */ - class NODEAPPLICATION_Export Container_Impl + class Container_Impl : public virtual POA_Deployment::Container { public: @@ -127,6 +127,11 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); + // Get all homes + virtual ::Components::CCMHomes * + get_homes (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + bool register_with_ns (const char * obj_name, CORBA::ORB_ptr orb, diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc index a801e308c5c..b87578e5a4e 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc +++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc @@ -1,32 +1,26 @@ // -*- MPC -*- // $Id$ -project(NoOp_Configurator): ciao_deployment_stub { - sharedname = CIAO_NoOp_Configurator - dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL - - Source_Files { - NoOp_Configurator.cpp - } -} - -project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_noop_configurator { - sharedname = CIAO_NodeApplication - dynamicflags = NODEAPPLICATION_BUILD_DLL +project(NodeApplication): ciao_server_dnc, ciao_events_dnc { + after += NoOp_Configurator + libs += CIAO_NoOp_Configurator + exename = NodeApplication Source_Files { Configurator_Factory.cpp Container_Impl.cpp NodeApplication_Core.cpp NodeApplication_Impl.cpp + NodeApplication.cpp } } -project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciao_noop_configurator { - exename = NodeApplication +project(NoOp_Configurator): ciao_deployment_stub { + sharedname = CIAO_NoOp_Configurator + dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL Source_Files { - NodeApplication.cpp + NoOp_Configurator.cpp } } diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp index 1b8516dcce8..dedc2ab3e43 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ciao/CIAO_NodeApplication_CallBackC.h" +#include "ciao/NodeApplication_CallBackC.h" #include "ace/Sched_Params.h" #include "NodeApplication_Impl.h" #include "NodeApplication_Core.h" diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h index aceef49209c..3a8795eccea 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h @@ -19,13 +19,12 @@ #define CIAO_NODEAPPLICATION_CORE_H #include /**/ "ace/pre.h" -#include "CIAO_NodeApplication_export.h" +#include "tao/ORB_Core.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ORB_Core.h" #include "tao/ORB.h" #include "ace/Task.h" #include "ace/Auto_Ptr.h" @@ -40,7 +39,7 @@ namespace CIAO * @brief An ACE_Task subclass that allow the ORB thread to be run * as separate thread when RT behaviors are needed. */ - class NODEAPPLICATION_Export NodeApplication_Core + class NodeApplication_Core : public virtual ACE_Task_Base { public: diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 02cc88b3830..6cf9b2b9de7 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -31,7 +31,7 @@ CIAO::NodeApplication_Impl::create_all_containers ( ACE_THROW_SPEC ((CORBA::SystemException)) { // Create all the containers here based on the input node_impl_info. - CORBA::ULong const len = container_infos.length (); + const CORBA::ULong len = container_infos.length (); for (CORBA::ULong i = 0; i < len; ++i) { @@ -88,7 +88,7 @@ CIAO::NodeApplication_Impl::finishLaunch_i ( ACE_TRY { - CORBA::ULong const length = connections.length (); + const CORBA::ULong length = connections.length (); // For every connection struct we finish the connection. for (CORBA::ULong i = 0; i < length; ++i) @@ -311,7 +311,7 @@ CIAO::NodeApplication_Impl::install ( // the ComponentInfo for components installed in each container. // Merge all the returned ComponentInfo, which will be used // as the return value of this method. - CORBA::ULong const num_containers = container_infos.length (); + const CORBA::ULong num_containers = container_infos.length (); for (CORBA::ULong i = 0; i < num_containers; ++i) { Deployment::ComponentInfos_var comp_infos = @@ -333,7 +333,7 @@ CIAO::NodeApplication_Impl::install ( // installed on this NodeApplication. I know we can delegates these to the // undelying containers, but in that case, we should loop // all the containers to find the component object reference. - Gan - CORBA::ULong const comp_len = retv->length (); + const CORBA::ULong comp_len = retv->length (); for (CORBA::ULong len = 0; len < comp_len; ++len) @@ -448,9 +448,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name if (CORBA::is_nil (comp_state.objref_.in ())) { - ACE_ERROR ((LM_ERROR, - "CIAO (%P|%t) - NodeApplication_Impl.cpp, " - "comp is nil\n")); + ACE_DEBUG ((LM_DEBUG, "comp is nil\n")); throw Deployment::StartError (); } @@ -475,33 +473,23 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL) return; // For each container, invoke <remove> operation to remove home and components. - CORBA::ULong const set_size = this->container_set_.size (); + const CORBA::ULong set_size = this->container_set_.size (); for (CORBA::ULong i = 0; i < set_size; ++i) { - if (CIAO::debug_level () > 5) - { - ACE_DEBUG ((LM_DEBUG, "NA: calling remove on container %i\n")); - } - + ACE_DEBUG ((LM_DEBUG, "NA: calling remove on container %i\n")); this->container_set_.at(i)->remove (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } // Remove all containers // Maybe we should also deactivate container object reference. - if (CIAO::debug_level () > 5) - { - ACE_DEBUG ((LM_DEBUG, "NA: remove all\n")); - } - + ACE_DEBUG ((LM_DEBUG, "NA: remove all\n")); this->container_set_.remove_all (); if (CIAO::debug_level () > 1) - { - ACE_DEBUG ((LM_DEBUG, "Removed all containers from this NodeApplication!\n")); - } + ACE_DEBUG ((LM_DEBUG, "Removed all containers from this NodeApplication!\n")); - // For static deployment, ORB will be shutdown in the Static_NodeManager + //For static deployment, ORB will be shutdown in the Static_NodeManager if (this->static_entrypts_maps_ == 0) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -606,6 +594,7 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref ACE_CHECK; // Should we remove the server still, even if the previous call failed. + if (this->container_set_.remove (cref) == -1) { ACE_THROW (::Components::RemoveFailure ()); @@ -633,64 +622,64 @@ ACE_THROW_SPEC ((::CORBA::SystemException, { ACE_DEBUG ((LM_DEBUG, "\nNodeApplication_Impl::install_es() called.\n\n")); - CIAO_Event_Service_var ciao_es = - es_factory_.create (es_info.type, es_info.name.in ()); + CIAO_Event_Service_var ciao_es = + es_factory_.create (es_info.type, es_info.name.in ()); - // Set up the event channel federations - if (es_info.type == CIAO::RTEC) - { - // Narrow the event service to CIAO_RT_Event_Service - ::CIAO::CIAO_RT_Event_Service_var ciao_rtes = - ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es.in ()); - - if (CORBA::is_nil (ciao_rtes.in ())) - ACE_THROW (::Deployment::InstallationFailure ()); - - // Set up the event channel federations - for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j) - { - bool retv = - ciao_rtes->create_addr_serv ( - es_info.addr_servs[j].name.in (), - es_info.addr_servs[j].port, - es_info.addr_servs[j].address); - - if (retv == false) - { - ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n")); - ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); - } - } - - for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j) - { - bool retv = - ciao_rtes->create_sender ( - es_info.senders[j].addr_serv_id.in ()); - - if (retv == false) - { - ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n")); - ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); - } - } - - for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j) - { - bool retv = - ciao_rtes->create_receiver ( - es_info.receivers[j].addr_serv_id.in (), - es_info.receivers[j].is_multicast, - es_info.receivers[j].listen_port); - - if (retv == false) - { - ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n")); - ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); - } - } - } - return ciao_es._retn (); + // Set up the event channel federation configurations + if (es_info.type == CIAO::RTEC) + { + // Narrow the event service to CIAO_RT_Event_Service + ::CIAO::CIAO_RT_Event_Service_var ciao_rtes = + ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es); + + if (CORBA::is_nil (ciao_rtes.in ())) + ACE_THROW (::Deployment::InstallationFailure ()); + + // Set up the event channel federations + for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j) + { + bool retv = + ciao_rtes->create_addr_serv ( + es_info.addr_servs[j].name.in (), + es_info.addr_servs[j].port, + es_info.addr_servs[j].address); + + if (retv == false) + { + ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n")); + ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); + } + } + for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j) + { + bool retv = + ciao_rtes->create_sender ( + es_info.senders[j].addr_serv_id.in ()); + + if (retv == false) + { + ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n")); + ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); + } + } + + for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j) + { + bool retv = + ciao_rtes->create_receiver ( + es_info.receivers[j].addr_serv_id.in (), + es_info.receivers[j].is_multicast, + es_info.receivers[j].listen_port); + + if (retv == false) + { + ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n")); + ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); + } + } + } + + return ciao_es._retn (); } ACE_CATCHANY { diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h index d682b0a58c6..a5e7e256974 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h @@ -15,7 +15,7 @@ #define NODEAPPLICATION_IMPL_H #include /**/ "ace/pre.h" -#include "CIAO_NodeApplication_export.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +26,7 @@ #include "ace/SString.h" #include "ace/Hash_Map_Manager_T.h" #include "tao/ORB.h" -#include "ciao/Deployment_NodeApplicationS.h" +#include "ciao/Deployment_CoreS.h" #include "ciao/Server_init.h" #include "ciao/CIAO_common.h" #include "ciao/Object_Set_T.h" @@ -62,7 +62,7 @@ namespace CIAO // @@ Gan, as we discussed before can you please wrap this // implementation in a namespace Node_Application or whatever to // signify that it belongs to another software piece of CIAO? - class NODEAPPLICATION_Export NodeApplication_Impl + class NodeApplication_Impl : public virtual POA_Deployment::NodeApplication { public: @@ -86,6 +86,8 @@ namespace CIAO virtual ~NodeApplication_Impl (void); /** + * @method finishLaunch + * * @brief This operation dose 2 things. * 1. Get the external connction (facet and Event source) * and connect them to the local receptacle/event sink. @@ -104,6 +106,9 @@ namespace CIAO Deployment::StartError, Deployment::InvalidConnection)); + /** + * @method start + */ virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, @@ -113,16 +118,25 @@ namespace CIAO * *-----------------------------------------------------------*/ + /** + * @method ciao_preactivate + */ virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)); + /** + * @method ciao_postactivate + */ virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)); + /** + * @method ciao_passivate + */ virtual void ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp index 6b899bd345d..40d58ad24ab 100644 --- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp +++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp @@ -249,7 +249,7 @@ CIAO::RTResource_Config_Manager::init_resources const CIAO::DAnCE::PolicySets &sets = server_resource.orb_config.policy_set; for (CORBA::ULong i = 0; i < sets.length (); ++i) { - CORBA::ULong const np = sets[i].policies.length (); + CORBA::ULong np = sets[i].policies.length (); if (np == 0) continue; @@ -309,7 +309,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name { ACE_ERROR ((LM_ERROR, "Invalid name string found in \"find_threadpool_by_name\"\n")); - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); } @@ -335,7 +335,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name { ACE_ERROR ((LM_ERROR, "Invalid name string found in \"find_priority_bands_by_name\"\n")); - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); } PB_MAP::ENTRY *entry = 0; @@ -362,7 +362,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name { ACE_ERROR ((LM_ERROR, "Invalid name string found in \"find_policies_by_name\"\n")); - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); } diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h index 6527b7f607d..a487ea72d98 100644 --- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h +++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h @@ -25,7 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/RTCORBA/RTCORBA.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "ace/Null_Mutex.h" #include "ace/SString.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp b/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp index 741d4263188..1fbf001845d 100644 --- a/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp +++ b/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp @@ -1,7 +1,7 @@ // $Id$ #include "RTNodeApp_Configurator.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "tao/RTPortableServer/RTPortableServer.h" CIAO::RTNodeApp_Configurator::~RTNodeApp_Configurator () diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index e31a2e6bc91..01808650980 100644 --- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -3,17 +3,16 @@ #include "Containers_Info_Map.h" #include "ciao/CIAO_Config.h" #include "ciao/CIAO_common.h" -#include "ciao/CIAO_ServerResourcesC.h" //Added for HTTP #include "URL_Parser.h" //for parsing the URL -#include "tao/HTTP_Client.h" //the HTTP client class to downloading packages +#include "HTTP_Client.h" //the HTTP client class to downloading packages #include "ace/Message_Block.h" //for ACE_Message_Block #include "ace/OS_NS_fcntl.h" //for open #include "ace/OS_NS_unistd.h" //for close #include "ace/OS_NS_sys_stat.h" //for filesize and mkdir #include "ace/OS_NS_string.h" //for string functions -#include "ace/streams.h" + namespace CIAO { @@ -466,6 +465,11 @@ is_shared_component (ACE_CString & name) ACE_CString &arti_name, ACE_CString &path) { + + ACE_DEBUG ((LM_INFO, + "Attempting to download %s\n", + location)); + // Figure out the file name. char* name = const_cast<char*> (location); char* p = 0; @@ -502,22 +506,9 @@ is_shared_component (ACE_CString & name) return false; } -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) - ACE_TString decorator (ACE_LD_DECORATOR_STR); -#endif - ACE_TString prefix (ACE_DLL_PREFIX); - ACE_TString suffix (ACE_DLL_SUFFIX); - - ACE_CString new_name (name); - new_name = prefix + new_name; -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) - new_name += decorator; -#endif - new_name += suffix; - path = HTTP_DOWNLOAD_PATH; path += "/"; - path += new_name; + path += name; if (!this->write_to_disk (path.c_str (), *mb)) { @@ -525,7 +516,7 @@ is_shared_component (ACE_CString & name) return false; } - mb->release (); + mb->release (); return true; } @@ -538,60 +529,12 @@ is_shared_component (ACE_CString & name) CIAO::Containers_Info_Map::retrieve_via_HTTP (const char* URL, ACE_Message_Block &mb) { - ACE_CString loc (URL); - - // Figure out the file name. - char* name_ = const_cast<char*> (URL); - char* p = 0; - - while (true) - { - p = ACE_OS::strstr (name_, "/"); - - if (0 == p) - { - p = ACE_OS::strstr (name_, "\\"); - } - - if (0 == p) - { - break; - } - else - { - name_ = ++p; - continue; - } - } - - ACE_CString name (name_); - loc = loc.substr (0, loc.length() - name.length ()); - -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) - ACE_TString decorator (ACE_LD_DECORATOR_STR); -#endif - ACE_TString prefix (ACE_DLL_PREFIX); - ACE_TString suffix (ACE_DLL_SUFFIX); - - ACE_CString new_name (name); - new_name = prefix + new_name; -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) - new_name += decorator; -#endif - new_name += suffix; - - loc = loc + new_name; - - ACE_DEBUG ((LM_INFO, - "Attempting to download %s\n", - loc.c_str ())); - URL_Parser *parser = TheURL_Parser::instance (); - if (!parser->parseURL (const_cast<char*> (loc.c_str ()))) - return false; + if (!parser->parseURL (const_cast<char*> (URL))) + return false; // Create a client - TAO_HTTP_Client client; + HTTP_Client client; // Open the client if (client.open (parser->filename_, diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h index 93f6b70c5cc..4ef8ef289bc 100644 --- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h +++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h @@ -19,7 +19,6 @@ //added for the HTTP support #include "ace/Message_Block.h" //for ACE_Message_Block -#include "ciao/Deployment_ContainerC.h" #include "ciao/DeploymentC.h" #include "ace/SString.h" #include "CIAO_NAM_Export.h" diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp new file mode 100644 index 00000000000..1b2d6afc519 --- /dev/null +++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp @@ -0,0 +1,55 @@ +// $Id$ + +// HTTP_Client.cpp, Stoyan + +#include "HTTP_Client.h" +#include "HTTP_Handler.h" +#include "ace/OS_NS_string.h" + +HTTP_Client::HTTP_Client (void) +{ +} + +HTTP_Client::~HTTP_Client (void) +{ + this->close (); +} + +// initialize address and filename. No network i/o in open +int +HTTP_Client::open (const ACE_TCHAR *filename, + const ACE_TCHAR *hostname, + u_short port) +{ + filename_ = ACE_OS::strdup (filename); + inet_addr_.set (port, hostname); + return 0; +} + +// read from connection length bytes from offset, into Message block +int +HTTP_Client::read (ACE_Message_Block *mb) +{ + // Create a HTTP_Client Reader + HTTP_Reader HTTP_reader (mb, filename_); + HTTP_Handler *brp = &HTTP_reader; + + // Connect to the server + if (connector_.connect (brp, inet_addr_) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Client::read():Connector error"), -1); + + return HTTP_reader.byte_count (); +} + +// close down the HTTP_Client +int +HTTP_Client::close (void) +{ + if (filename_) + { + ACE_OS::free ((void *) filename_); + filename_ = 0; + } + return 0; +} + diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h new file mode 100644 index 00000000000..1a62fb10bcc --- /dev/null +++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h @@ -0,0 +1,71 @@ + +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file HTTP_Client.h + * + * $Id$ + * + * This is the HTTP_Client class, which is the API for doing file + * uploads/downloads. + * + * @author Stoyan Paunov + */ +//============================================================================= + + +#ifndef HTTP_Client_H +#define HTTP_Client_H + + +#include "ace/INET_Addr.h" +#include "ace/Svc_Handler.h" +#include "ace/SOCK_Connector.h" +#include "ace/Connector.h" +#include "ace/Message_Block.h" +#include "HTTP_Handler.h" + +/** + * @class HTTP_Client + * + * @brief HTTP_Client is intended to provide application API to + * classes that wish to do network i/o at a very + * high level of abstraction. + * + * This class provides the ability to retrieve data from + * the network, of specified length and offset, and potentially + * use any protocol "under the hood" to do so. It currently + * uses HTTP. See HTTP_Handler also. + */ +class HTTP_Client +{ +public: + HTTP_Client (void); + ~HTTP_Client (void); + + /// Initializes the class with the given filename, hostname and port. + /// it should be called with the filename, before any read/write calls + int open (const ACE_TCHAR *filename, + const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST, + u_short port = 80); + + /// Starts a connection, and reads a file from the server into + /// Message_Block mb + int read (ACE_Message_Block *mb); + + /// Frees memory allocated for filename. + int close (); + +private: + /// Store the internet address of the server + ACE_INET_Addr inet_addr_; + + /// The filename + ACE_TCHAR *filename_; + + /// The connector endpoint to initiate the client connection + ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_; +}; + +#endif /* HTTP_Client_H */ diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp new file mode 100644 index 00000000000..de9a339d29d --- /dev/null +++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp @@ -0,0 +1,204 @@ +// $Id$ + +// HTTP_Handler.cpp, Stoyan + +#include "HTTP_Handler.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" + +// Empty constructor for compliance with new Connector behavior. +HTTP_Handler::HTTP_Handler (void) +{ +} + +// Always use this constructor +HTTP_Handler::HTTP_Handler (ACE_Message_Block * mb, + ACE_TCHAR *filename) : + mb_ (mb), + filename_ (ACE_OS::strdup (filename)), + bytecount_ (0) +{ +} + +HTTP_Handler::~HTTP_Handler (void) +{ + if (filename_) + { + ACE_OS::free (filename_); + filename_ = 0; + } +} + +// Called by Connector after connection is established +int +HTTP_Handler::open (void *) +{ + if (this->send_request () != 0) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1); + + if (this->receive_reply () != 0) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1); + return 0; + +} + +// No-op +int +HTTP_Handler::close (u_long) +{ + return 0; +} + +// Always overridden by the derived classes +int +HTTP_Handler::send_request (void) +{ + return -1; +} + +// Always overridden by the derived classes +int +HTTP_Handler::receive_reply (void) +{ + return -1; +} + +// used to retrieve the number of bytes read/written by the +// last operation on the Blob +size_t +HTTP_Handler::byte_count (void) +{ + return bytecount_; +} + +// Reader ************************************************** + +HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb, + ACE_TCHAR *filename, + const char *request_prefix, + const char *request_suffix) : + HTTP_Handler (mb, filename), + request_prefix_ (request_prefix), + request_suffix_ (request_suffix) +{ +} + +// Send the HTTP request +int +HTTP_Reader::send_request (void) +{ + char mesg [MAX_HEADER_SIZE]; + + // Check to see if the request is too big + if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_) + + ACE_OS::strlen (filename_) + + ACE_OS::strlen (request_suffix_) + 4)) + ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1); + + // Create a message to send to the server requesting retrieval of the file + int const len = + ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_); + + // Send the message to server + if (peer ().send_n (mesg, len) != len) + ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1); + + + return 0; +} + +// Recieve the HTTP Reply +int +HTTP_Reader::receive_reply (void) +{ + size_t num_recvd = 0; + char buf [MTU+1]; + char *buf_ptr = 0; + size_t bytes_read = 0; + + // Receive the first MTU bytes and strip the header off. + // Note that we assume that the header will fit into MTU bytes. + + if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0) + { + //Make sure that response type is 200 OK + if (ACE_OS::strstr (buf,"200 OK") == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1); + + // Search for the header termination string "\r\n\r\n", or "\n\n". If + // found, move past it to get to the data portion. + if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0) + buf_ptr += 4; + else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0) //for compatibility with JAWS + buf_ptr += 2; + else + buf_ptr = buf; + + // Determine number of data bytes read. This is equal to the + // total bytes read minus number of header bytes. + bytes_read = num_recvd - (buf_ptr - buf); + + } + else + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1); + + // *************************************************************** + // At this point, we have stripped off the header and are ready to + // process data. buf_ptr points to the data + + //set the size of the ACE_Message_Block to the current bytes read + //NOTE: this function reallocates if necessary + //this->mb_->size (bytes_read); + + ACE_Message_Block* temp = 0; //pointer used temporarily + //for memory allocations before + //chaining to Message_Block + + ACE_Message_Block* curr = this->mb_; + + ACE_NEW_RETURN (temp, ACE_Message_Block (bytes_read), -1); + curr->cont (temp); + + curr = curr->cont (); + + // Copy over all the data bytes into our message buffer. + if (curr->copy (buf_ptr, bytes_read) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", + "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1); + + //read the rest of the data into a number of ACE_Message_Blocks and + //chain them together in a link list fashion + + num_recvd = 0; + + do + { + if (curr->space () == 0) + { + ACE_NEW_RETURN (temp, ACE_Message_Block (MTU), -1); + curr->cont (temp); + curr = curr->cont (); + } + + if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0) + { + //move the write pointer + curr->wr_ptr (num_recvd); + + //increment bytes_read + bytes_read += num_recvd; + + } + else + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1); + + }while (num_recvd != 0); + + // Set the byte count to number of bytes received + this->bytecount_ = bytes_read; + + return 0; +} + diff --git a/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h new file mode 100644 index 00000000000..d1e9aae2894 --- /dev/null +++ b/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h @@ -0,0 +1,86 @@ + +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file HTTP_Handler.h + * + * $Id$ + * + * HTTP_Handler is a base class for HTTP_Reader and + * HTTP_Writer which are created in response to calls to + * read/write, as appropriate + * + * + * @author Stoyan Paunov + */ +//============================================================================= + + +#ifndef HTTP_HANDLER_H +#define HTTP_HANDLER_H + +#include "ace/SOCK_Stream.h" +#include "ace/Svc_Handler.h" +#include "ace/Message_Block.h" + +/** + * @class HTTP_Handler + * class to retrieve data via HTTP + */ +class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH> +{ +public: + /// Null constructor, insures that it works properly with Connector + HTTP_Handler (void); + + /// Always use this constructor to make HTTP_Handlers + HTTP_Handler (ACE_Message_Block *mb, + ACE_TCHAR *filename); + + /// returns the number of bytes read/written in the last operation. + size_t byte_count (void); + + /// Activate this instance of the <HTTP_Handler> + virtual int open (void * = 0); + + /// Close down the Blob + virtual int close (u_long flags = 0); + + ~HTTP_Handler (void); + +protected: + virtual int send_request (void); + virtual int receive_reply (void); + + ACE_Message_Block *mb_; + ACE_TCHAR *filename_; + size_t bytecount_; + enum + { + /// The handler assumes that the first 2048 bytes of a server response + /// contains the header + MAX_HEADER_SIZE = 2048, + + /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS + MTU = BUFSIZ + }; +}; + +class HTTP_Reader : public HTTP_Handler +{ +public: + HTTP_Reader (ACE_Message_Block *mb, + ACE_TCHAR *filename, + const char *request_prefix = "GET", + const char *request_suffix = "HTTP/1.0\r\n\r\n"); + +private: + //NOTE: these functions return -1 on error + int send_request (void); + int receive_reply (void); + const char *request_prefix_; + const char *request_suffix_; +}; + +#endif /* HTTP_HANDLER_H */ diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp index af905369dcf..436715588c4 100644 --- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp @@ -3,7 +3,6 @@ #define CIAO_IMPLEMENTATION_INFO_CPP #include "ImplementationInfo.h" -#include "ciao/CIAO_ServerResourcesC.h" #include "ace/SString.h" CIAO::NodeImplementationInfoHandler:: @@ -31,9 +30,11 @@ CIAO::NodeImplementationInfoHandler::node_impl_info (void) const void CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void) { - CORBA::ULong const instance_len = plan_.instance.length (); + const CORBA::ULong instance_len = plan_.instance.length (); const char * target_resource_id = 0; + CORBA::ULong i; + // Iterate over the instance list to find whether any server resource // has been specified // TODO: We shoud do some sanity check here, since all the component @@ -47,7 +48,7 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void) // ServerResource file will be deployed in the same NA. However, // those using different ServerResource files should be deployed to // different NAs. Something to be fixed later. - for (CORBA::ULong i = 0; i < instance_len; ++i) + for (i = 0; i < instance_len; ++i) { if (this->plan_.instance[i].deployedResource.length () != 0) { diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h index 2b935d9d637..de6fc2d8cab 100644 --- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h +++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ciao/Deployment_NodeApplicationC.h" +#include "ciao/DeploymentC.h" #include "ace/SString.h" #include "ace/Hash_Map_Manager.h" #include "Containers_Info_Map.h" diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc index a145a6f09f2..0d06d8c4154 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc @@ -1,17 +1,30 @@ // -*- MPC -*- // $Id$ -project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub, ciao_nodeapplication { +project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub { sharedname = NodeApplicationManager after += NodeManager_stub CIAO_TargetManager_stub + idlflags += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export dynamicflags = CIAO_NAM_BUILD_DLL + dynamicflags += NOOP_CONFIGURATOR_BUILD_DLL +// @@TODO: This ../NodeApplication business need to go. It would be better +// to factor that stuff into a separate lib, ie. NodeApplication_Impl +// and link it in. For the time being, since the release is so close, +// i will leave it the way it is. Source_Files { NodeApplicationManager_Impl.cpp ImplementationInfo.cpp Containers_Info_Map.cpp URL_Parser.cpp + HTTP_Handler.cpp + HTTP_Client.cpp + ../NodeApplication/NodeApplication_Core.cpp + ../NodeApplication/NodeApplication_Impl.cpp + ../NodeApplication/Container_Impl.cpp + ../NodeApplication/Configurator_Factory.cpp + ../NodeApplication/NoOp_Configurator.cpp } Header_Files { @@ -19,6 +32,8 @@ project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_ex ImplementationInfo.h Containers_Info_Map.h URL_Parser.h - CIAO_NAM_Export.h + HTTP_Handler.h + HTTP_Client.h + NodeApplicationManager_Export.h } } diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index 82398062b5f..203d3db3a71 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -8,7 +8,6 @@ #include "ace/Sched_Params.h" #include "ace/Vector_T.h" #include "ciao/Container_Base.h" -#include "ciao/CIAO_ServerResourcesC.h" #include "NodeApplication/NodeApplication_Impl.h" #include "ace/Reactor.h" @@ -60,7 +59,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (retv, Deployment::Connections (), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); CORBA::ULong len = retv->length (); @@ -78,15 +77,15 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL) // Get all the facets first Components::FacetDescriptions_var facets; - if (this->is_shared_component (comp_name)) + if (is_shared_component (comp_name)) { - ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is shared\n", + ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n", comp_name.c_str ())); facets = this->node_manager_->get_all_facets (comp_name); } else { - ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting " + ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting" "all facets\n", comp_name.c_str ())); facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -106,15 +105,15 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL) // Get all the event consumers Components::ConsumerDescriptions_var consumers; - if (this->is_shared_component (comp_name)) + if (is_shared_component (comp_name)) { - ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is shared\n", + ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n", comp_name.c_str ())); consumers = this->node_manager_->get_all_consumers (comp_name); } else { - ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting " + ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting" "all facets\n", comp_name.c_str ())); consumers = @@ -132,10 +131,10 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL) comp_name.c_str ())); } - CORBA::ULong const facet_len = facets->length (); - CORBA::ULong const consumer_len = consumers->length (); + CORBA::ULong facet_len = facets->length (); + CORBA::ULong consumer_len = consumers->length (); - CORBA::ULong const curr_len = retv->length (); + CORBA::ULong curr_len = retv->length (); retv->length (curr_len + facet_len + consumer_len); CORBA::ULong i = 0; @@ -941,7 +940,7 @@ create_node_application (const ACE_CString & options ACE_NEW_THROW_EX (prop, Deployment::Properties, - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (Deployment::NodeApplication::_nil()); // @@ Create a new callback servant. @@ -1220,8 +1219,3 @@ create_node_application (const ACE_CString & options return nodeapp_obj._retn (); } - -CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void) -{ -} - diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index fdaa59ba216..c0312cd6384 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -30,7 +30,7 @@ #include "ace/OS_NS_sys_wait.h" #include "ace/Process_Manager.h" #include "ciao/NodeApp_CB_Impl.h" -#include "ciao/Deployment_NodeApplicationManagerS.h" +#include "ciao/NodeApplicationManagerS.h" #include "ciao/CIAO_common.h" #include "CIAO_NAM_Export.h" #include "ImplementationInfo.h" @@ -364,6 +364,7 @@ namespace CIAO }; + struct Static_Config_EntryPoints_Maps; /** diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl index e744e953876..5bf4e642a0e 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl @@ -20,6 +20,11 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o, } ACE_INLINE +CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void) +{ +} + +ACE_INLINE void CIAO::NodeApplicationManager_Impl_Base:: parse_config_value (ACE_CString & str diff --git a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp index 5d211603614..f79e086dd89 100644 --- a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp @@ -111,5 +111,8 @@ void URL_Parser::Error (void) URL_Parser::~URL_Parser (void) { delete [] this->hostname_; + this->hostname_ = 0; + ACE_OS::free (this->filename_); + this->filename_ = 0; } diff --git a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h index 0aec98cec65..aaaeab4960c 100644 --- a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h +++ b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h @@ -9,6 +9,7 @@ * * Parses a URL into its logical chunks * + * * @author Stoyan Paunov */ //============================================================================= @@ -34,10 +35,10 @@ public: friend class ACE_Singleton <URL_Parser, ACE_Null_Mutex>; - /// Parses commandline arguments + /// parses commandline arguments bool parse_args (int argc, ACE_TCHAR *argv[]); - // Return false on failure + //return false on failure bool parseURL (char* url); void Error (void); @@ -54,12 +55,12 @@ public: /// turns on verbosity int debug_; - /// Destructor + //destructor ~URL_Parser (void); protected: - /// protected constructor, singleton URL_Parser (void); + // protected constructor, singleton }; diff --git a/CIAO/DAnCE/NodeManager/BaseMonitor.h b/CIAO/DAnCE/NodeManager/BaseMonitor.h index d05e798b523..fc34383aa06 100644 --- a/CIAO/DAnCE/NodeManager/BaseMonitor.h +++ b/CIAO/DAnCE/NodeManager/BaseMonitor.h @@ -13,7 +13,7 @@ #ifndef MONITOR_BASEH #define MONITOR_BASEH #include "tao/ORB.h" -#include "ciao/Deployment_TargetManagerC.h" +#include "TargetManagerC.h" namespace CIAO { @@ -23,33 +23,33 @@ namespace CIAO public: virtual ~MonitorBase () {}; - /** - * This function is called by the controller to initialize - * parameters. - * @param domain The Initital domain for this host - * @param target_manager TargetManager_ptr - * @param interval The time interval after which updates need to be send. + /** @function initialize_params + * @param domain The Initital domain for this host + * @param target_manager TargetManager_ptr + * @param interval The time interval after whic updates need to be send. + * @description This function is called by the controller to initialize + * parameters. */ virtual int initialize_params ( ::Deployment::Domain& domain, ::Deployment::TargetManager_ptr target_manager, int interval )=0; - /** - * This function is called by the controller - * to start up the monitor. - * @param orb The ORB pointer + /** @function start + * @param ORB_ptr The ORB pointer + * @description This function is called by the controller + * to start up the monitor. */ - virtual int start (CORBA::ORB_ptr orb) = 0; - /** - * This function is called by the controller - * to stop the monitor. + virtual int start (CORBA::ORB_ptr)=0; + /** @function stop + * @description This function is called by the controller + * to stop the monitor. */ virtual int stop ()=0; - /** - * This function is called by the controller - * to get the current data. - * @return The current Domain data + /** @function get_current_data + * @return ::Deployment::Domain* The current Domain data + * @description This function is called by the controller + * to get the current data. */ virtual ::Deployment::Domain* get_current_data ()=0; }; diff --git a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp index 9d9417da520..cbd494ac776 100644 --- a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp +++ b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp @@ -14,11 +14,10 @@ #include "CIAO_common.h" #include "ace/OS_NS_stdio.h" + extern "C" ACE_Proper_Export_Flag CIAO::MonitorBase * CIAO::createMonitor () { - CIAO::CIAO_Monitor* monitor = 0; - ACE_NEW_RETURN (monitor, CIAO::CIAO_Monitor, 0); - return monitor; + return new CIAO::CIAO_Monitor (); } CIAO::CIAO_Monitor::CIAO_Monitor () @@ -99,11 +98,19 @@ int CIAO::CIAO_Monitor::stop () //read the cpu in idle time .. fscanf (load_file, "%ld", &idle_time); + + if (CIAO::debug_level () > 9) + { + // ACE_DEBUG ((LM_DEBUG , "Current load is %d\n",current_load)); + } + ACE_OS::fclose (load_file); - // Calculate the percent CPU - long const current_user_cpu = user_cpu - prev_user_cpu_; - long const total_cpu_usage = user_cpu + user_cpu_low + sys_cpu + + + // Calculate the percent CPU + + long current_user_cpu = user_cpu - prev_user_cpu_; + long total_cpu_usage = user_cpu + user_cpu_low + sys_cpu + idle_time - prev_user_cpu_ - prev_idle_time_ - prev_sys_cpu_ - prev_user_cpu_low_; @@ -131,17 +138,19 @@ int CIAO::CIAO_Monitor::stop () i < current_domain_->node[0].resource.length (); i++) { - if (!ACE_OS::strcmp (current_domain_->node[0].resource[i].name, "Processor")) + if (!strcmp (current_domain_->node[0].resource[i].name, "Processor")) { + // ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::The Resource found\n")); for (unsigned int j = 0; j < current_domain_->node[0].resource[i].property.length (); j++) { - if (!ACE_OS::strcmp ( + if (!strcmp ( current_domain_ ->node[0].resource[i].property[j].name.in (), "LoadAverage")) { + //ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::The property found\n")); current_domain_->node[0].resource[i].property[j].kind = ::Deployment::Quantity; current_domain_->node[0].resource[i].property[j].value = @@ -151,5 +160,11 @@ int CIAO::CIAO_Monitor::stop () } } + + if (CIAO::debug_level () > 9) + { + //ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::Exiting from the get_current_data function\n")); + } + return current_domain_.get (); } diff --git a/CIAO/DAnCE/NodeManager/CIAO_Monitor.h b/CIAO/DAnCE/NodeManager/CIAO_Monitor.h index 5a134538701..e317288b02a 100644 --- a/CIAO/DAnCE/NodeManager/CIAO_Monitor.h +++ b/CIAO/DAnCE/NodeManager/CIAO_Monitor.h @@ -18,6 +18,7 @@ #include "BaseMonitor.h" #include "ace/Auto_Ptr.h" +#include <memory> /** * @namespace CIAO @@ -43,12 +44,12 @@ namespace CIAO */ CIAO_Monitor (); - /** - * This function is called by the controller to initialize - * parameters. - * @param domain The Initial Domain for this host - * @param target_manager TargetManager_ptr - * @param interval The time interval after whic updates need to be send. + /** @function initialize_params + * @param domain The Initial Domain for this host + * @param target_manager TargetManager_ptr + * @param interval The time interval after whic updates need to be send. + * @description This function is called by the controller to initialize + * parameters. */ virtual int initialize_params ( ::Deployment::Domain& domain, @@ -56,25 +57,30 @@ namespace CIAO int interval ); /** - * Destructor + * @function Destructor */ virtual ~CIAO_Monitor (); - /** - * This method will starts up the Monitor in this case, - * @param orb The orb needed for resolving. - * @return -1 on error + /** @function start. + * @brief This method will starts up the Monitor + * in this case, + * @param orb The orb needed for resolving. + * @return -1 on error */ int start (CORBA::ORB_ptr orb); /** - * This method will stop the Monitor in this case + * @function stop. + * @brief This method will starts up the Monitor + * in this case * @return -1 on error */ int stop (); /** - * This function retrieves the current Domain data + * @function get_current_date. + * @brief This function retrieves the current + * Domain data * @return -1 on error */ ::Deployment::Domain* get_current_data (); diff --git a/CIAO/DAnCE/NodeManager/Monitor.mpc b/CIAO/DAnCE/NodeManager/Monitor.mpc index 9ccc91f0025..b4f5f55cd31 100644 --- a/CIAO/DAnCE/NodeManager/Monitor.mpc +++ b/CIAO/DAnCE/NodeManager/Monitor.mpc @@ -8,7 +8,7 @@ project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc { includes += $(CIAO_ROOT)/DAnCE/TargetManager sharedname = ciaomonlib - libs += TargetManager_stub CIAO_Deployment_stub NodeManager_stub + libs += TargetManager_stub CIAO_Deployment_stub IDL_Files { } diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/CIAO/DAnCE/NodeManager/MonitorCB.cpp index e7893327b8a..e1bef3e8144 100644 --- a/CIAO/DAnCE/NodeManager/MonitorCB.cpp +++ b/CIAO/DAnCE/NodeManager/MonitorCB.cpp @@ -15,13 +15,12 @@ #include "CIAO_common.h" -CIAO::MonitorCB::MonitorCB ( - CORBA::ORB_ptr orb, - Deployment::TargetManager_ptr target, - int interval) : - orb_ (orb), - target_mgr_ (target), - interval_ (interval) +CIAO::MonitorCB::MonitorCB (CORBA::ORB_ptr orb, + Deployment::TargetManager_ptr target, + int interval + ):orb_ (orb), + target_mgr_ (target), + interval_ (interval) { } diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.h b/CIAO/DAnCE/NodeManager/MonitorCB.h index 777625bc9e0..66cb25db287 100644 --- a/CIAO/DAnCE/NodeManager/MonitorCB.h +++ b/CIAO/DAnCE/NodeManager/MonitorCB.h @@ -14,7 +14,9 @@ #ifndef MONITOR_CBH #define MONITOR_CBH -#include "ciao/Deployment_TargetManagerC.h" +#include "TargetManagerC.h" + + /** * @namespace CIAO @@ -36,28 +38,27 @@ namespace CIAO { public: /** - * @param orb The ORB pointer - * @param target The TargetManager reference + * @constructor + * @param _orb The ORB pointer + * @param The TargetManager reference * @param interval The time interval to sent update */ - MonitorCB (CORBA::ORB_ptr orb, Deployment::TargetManager_ptr target, int interval); + MonitorCB (CORBA::ORB_ptr _orb,Deployment::TargetManager_ptr,int interval); /** - * This function is called by the monitor to - * update Domain data, which is then sent to - * TM. + * @function update_data * @param data Contains the updated Domain data * @return int indicates success. - * @todo Check return value, seems not used at this moment + * @description This function is called by the monitor to + * update Domain data, which is then sent to + * TM. */ int update_data (::Deployment::Domain& data); private: /// The ORB pointer - /// @todo Make this a _var CORBA::ORB_ptr orb_; /// The Target Manager pointer to send back the /// update - /// @todo Make this a _var ::Deployment::TargetManager_ptr target_mgr_; /// The interval after which updates need to be send diff --git a/CIAO/DAnCE/NodeManager/MonitorController.cpp b/CIAO/DAnCE/NodeManager/MonitorController.cpp index 76bd148613b..cff6b86df1b 100644 --- a/CIAO/DAnCE/NodeManager/MonitorController.cpp +++ b/CIAO/DAnCE/NodeManager/MonitorController.cpp @@ -48,16 +48,14 @@ CIAO::MonitorController::MonitorController ( orb_ (orb), initial_domain_ (domain), node_mgr_ (node_mgr), - monitor_cpu_usage_ (false), - add_component_pid_ (true) + monitor_cpu_usage_ (0), + add_component_pid_ (1) { } int CIAO::MonitorController::svc (void) { - // @todo. Investigate whether we can't use the reactor with a timer - // eventhandler for this monitor controller, would safe us a thread ACE_DLL dll; // Forming the library name. @@ -107,12 +105,13 @@ CIAO::MonitorController::svc (void) for (unsigned int i = 0;i < initial_domain_.node[0].resource.length ();i++) { if (!strcmp (initial_domain_.node[0].resource[i].name, "Processor")) - monitor_cpu_usage_ = true; + monitor_cpu_usage_ = 1; } // Wait for system to stabilize itself ACE_OS::sleep (interval); + // The loop in which UpdateData is called while (!terminating ()) { @@ -122,13 +121,15 @@ CIAO::MonitorController::svc (void) // if monitoring of cpu is enable , monitor , else dont do // anything - ::Deployment::Domain* domain = 0; + ::Deployment::Domain* domain; if (monitor_cpu_usage_) domain = monitor_->get_current_data (); else domain = &initial_domain_; + + // ****** add component data ******************* NodeManager_Impl_Base::Component_Ids cids = @@ -173,7 +174,7 @@ CIAO::MonitorController::svc (void) // CORBA::Long (cids.process_id_))); } // set the add_component_pid_ to 0 - add_component_pid_ = false; + add_component_pid_ = 0; } //******add compoennt data diff --git a/CIAO/DAnCE/NodeManager/MonitorController.h b/CIAO/DAnCE/NodeManager/MonitorController.h index 4da2dfb322f..83714d682ef 100644 --- a/CIAO/DAnCE/NodeManager/MonitorController.h +++ b/CIAO/DAnCE/NodeManager/MonitorController.h @@ -18,7 +18,7 @@ #include "NodeManager_svnt_export.h" #include "Deployment_BaseC.h" -#include "TargetManager/TargetManagerImplC.h" +#include "TargetManager/TargetManagerC.h" #include "ace/Task.h" #include "ace/Auto_Ptr.h" @@ -53,6 +53,7 @@ namespace CIAO { public: /** + * @function svc. * @brief The main function containing the * entire activity. * @@ -62,6 +63,7 @@ namespace CIAO */ int svc (void); /** + * @function terminate. * @brief The terminate function * * This function is called to terminate the @@ -81,8 +83,9 @@ namespace CIAO protected: /** + * @function terminating. * @brief returns the terminating flag - * @return bool The terminating state of the thread + * @return bool The terminting state of the thread */ bool terminating (); @@ -98,11 +101,10 @@ namespace CIAO /// The terminate flag_ bool terminate_flag_; - /// Thread Mutex for synchronizing call + //Thread Mutex for synchronizing call ACE_SYNCH_MUTEX lock_; - /// the ORB pointer .. - /// @todo Make this a _var + // the ORB pointer .. CORBA::ORB_ptr orb_; /// The initial domain @@ -111,10 +113,10 @@ namespace CIAO /// The Node Manager ::CIAO::NodeManager_Impl_Base* node_mgr_; - /// Flag tells ; what to monitor + /// flag tells ; what to monitor bool monitor_cpu_usage_; - /// To add component pid or not .. + /// TO add component pid or not .. bool add_component_pid_; }; diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc index e58cc2d27d4..01b11fa563a 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager.mpc +++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc @@ -2,8 +2,11 @@ // $Id$ //For static D&C, the NodeManager should be available as a linkable library -project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc, ciao_nodeapplicationmanager, ciao_nodemanager_stub { +project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc { sharedname = NodeManager + after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator + libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator + includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/Interfaces $(CIAO_ROOT)/DAnCE/TargetManager dynamicflags = NODEMANAGER_SVNT_BUILD_DLL IDL_Files { @@ -18,9 +21,10 @@ project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, i } } -project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub, ciao_nodeapplicationmanager, ciao_targetmanager_stub, ciao_nodemanager_stub { - after += NodeManager_svnt - libs += NodeManager +project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub { + after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_svnt + libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator + includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/TargetManager exename = NodeManager IDL_Files { diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp index 7ef8a09de85..4c3a7d3437c 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp +++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp @@ -1,8 +1,9 @@ // $Id$ #include "NodeManager_Impl.h" -#include "DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h" +#include "../NodeApplicationManager/NodeApplicationManager_Impl.h" #include "ace/Log_Msg.h" +#include <errno.h> CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name, CORBA::ORB_ptr orb, @@ -31,7 +32,7 @@ CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - // Create the call back poa for NAM. + //create the call back poa for NAM. PortableServer::POAManager_var mgr = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -99,9 +100,8 @@ CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain, { ACE_DEBUG ((LM_DEBUG , "Before Activate\n")); } - - // Activate the Monitor Controller to - // start the monitoring + /// Activate the Monitor Controller to + //start the monitoring monitor_controller_->activate (); if (CIAO::debug_level () > 9) @@ -163,10 +163,8 @@ get_all_facets (ACE_CString & name) Component_Facets_Map::ENTRY *entry = 0; if (this->comp_facets_map_.find (name.c_str (), entry) != 0) - { - ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - " - "No component with name [%s] was found in the NodeManager\n", name.c_str ())); - } + ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - " + "No component with name [%s] was found in the NodeManager\n", name.c_str ())); CORBA::ULong const facet_len = entry->int_id_->length (); @@ -192,10 +190,8 @@ get_all_consumers (ACE_CString & name) Component_Consumers_Map::ENTRY *entry = 0; if (this->comp_consumers_map_.find (name.c_str (), entry) != 0) - { - ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - " - "Component [%s] was not found in the NodeManager\n", name.c_str ())); - } + ACE_ERROR ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - " + "Component [%s] was not found in the NodeManager\n", name.c_str ())); CORBA::ULong const consumer_len = entry->int_id_->length (); @@ -527,7 +523,7 @@ CIAO::NodeManager_Impl_Base::get_shared_components_i (void) iter != end; ++iter) { - CORBA::ULong const curr_len = retv->length (); + CORBA::ULong curr_len = retv->length (); retv->length (curr_len + 1); (*retv)[curr_len].name = (*iter).c_str (); @@ -555,20 +551,17 @@ CIAO::NodeManager_Impl_Base::get_shared_components_i (void) CORBA::StringSeq * CIAO::NodeManager_Impl_Base::shared_components_seq (void) { - CORBA::StringSeq * retv = 0; + CORBA::StringSeq * retv; ACE_NEW_RETURN (retv, CORBA::StringSeq, 0); retv->length (0); - // @todo rewrite to just set the length once and then copy the strings - // to reduce allocations - ACE_Unbounded_Set<ACE_CString>::iterator end = this->shared_components_.end (); for (ACE_Unbounded_Set<ACE_CString>::iterator iter = this->shared_components_.begin (); iter != end; ++iter) { - CORBA::ULong const curr_len = retv->length (); + CORBA::ULong curr_len = retv->length (); retv->length (curr_len + 1); (*retv)[curr_len] = (*iter).c_str (); } @@ -605,7 +598,7 @@ validate_plan (const Deployment::DeploymentPlan &plan) for (i = 0; i < plan.instance.length (); ++i) { - const char * my_resource_id = 0; + const char * my_resource_id; if (plan.instance[i].deployedResource.length () == 0) { continue; @@ -660,7 +653,7 @@ create_node_app_manager (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0; + CIAO::NodeApplicationManager_Impl_Base *app_mgr; ACE_NEW_THROW_EX (app_mgr, CIAO::NodeApplicationManager_Impl (orb, poa), @@ -692,11 +685,9 @@ create_node_app_manager (CORBA::ORB_ptr orb, ACE_THROW_SPEC ((CORBA::SystemException)) { if (CIAO::debug_level () > 10) - { - ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n")); - } + ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n")); - CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0; + CIAO::NodeApplicationManager_Impl_Base *app_mgr; ACE_NEW_THROW_EX (app_mgr, CIAO::Static_NodeApplicationManager_Impl (orb, poa, diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h index fbf9d42177d..6881a53c1e2 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h +++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h @@ -184,7 +184,7 @@ namespace CIAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))=0; - /// Actual implementation of the @c get_shared_components IDL operation + /// Actual implementation of the <get_shared_components> IDL operation virtual ::Deployment::ComponentPlans * get_shared_components_i (void); diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp index 2ee63eef187..889a53d826d 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp +++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp @@ -183,7 +183,7 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_DEBUG, "Use -s <NodeApplicationPath> to specify \ executable path\n")); - ACE_OS::exit (1); + exit (1); } // Get reference to Root POA. @@ -248,11 +248,11 @@ main (int argc, char *argv[]) { char name [MAXHOSTNAMELEN + 1]; - if (ACE_OS::hostname (name, MAXHOSTNAMELEN + 1) == -1) + if (ACE_OS::hostname (name, 100) == -1) { ACE_ERROR ((LM_ERROR, "gethostname call failed! \n")); - ACE_OS::exit (1); + exit (1); } // Register this name with the Naming Service diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitor.h b/CIAO/DAnCE/Plan_Generator/PCVisitor.h index 8417bc8a630..2560c95e68c 100644 --- a/CIAO/DAnCE/Plan_Generator/PCVisitor.h +++ b/CIAO/DAnCE/Plan_Generator/PCVisitor.h @@ -11,7 +11,7 @@ * PackagingData.idl * * author Stoyan Paunov <spaunov@isis.vanderbilt.edu> - * Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + * Shanshan Jiang <shanshan.jiang@vanderbilt.edu> */ //======================================================================== @@ -35,12 +35,12 @@ class PCVisitor : public PCVisitorBase { public: - /// Constructor + //constructor PCVisitor (Deployment::DeploymentPlan &plan, Deployment::PackageConfiguration &pc, bool modify); - /// Entry point to protected Visitor functions + ///Entry point to protected Visitor functions int Visit (); protected: @@ -115,7 +115,7 @@ protected: protected: void update_execParameter (Deployment::ImplementationArtifactDescription& iad, Deployment::ArtifactDeploymentDescription& add); - + private: Deployment::DeploymentPlan& plan_; Deployment::PackageConfiguration& pc_; diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h index ac34dc4d261..bd68eb18ca5 100644 --- a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h +++ b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h @@ -13,7 +13,7 @@ * operations which involve sequences and delegates the calls to * the operations which handle single elements from the sequence type. * - * author Stoyan Paunov <spaunov@isis.vanderbilt.edu> + * author Stoyan Paunov <spaunov@isis.vanderbilt.edu> */ //======================================================================== @@ -40,13 +40,14 @@ class PCVisitorBase { public: - /// Constructor + //constructor PCVisitorBase (void); - /// Destructor - virtual ~PCVisitorBase (void); + //destructor + virtual + ~PCVisitorBase (void); - /// Function what dispatches sequences + ///function what dispatches sequences template <typename SEQ> friend void visit_sequence (SEQ &seq, PCVisitorBase& v); @@ -57,7 +58,7 @@ public: void Visit (Deployment::PackageConfiguration &pc) = 0; void Visit (Deployment::PackageConfigurations &pcs); - /// ComponentPackageDescription descendents + //ComponentPackageDescription descendents virtual void Visit (Deployment::ComponentPackageDescription &cpd) = 0; void Visit (Deployment::ComponentPackageDescriptions &cpds); @@ -154,7 +155,7 @@ void Accept (PCVisitorBase &v, T& element_to_visit) template <typename SEQ> void visit_sequence (SEQ &seq, PCVisitorBase& v) { - CORBA::ULong const size = seq.length (); + const CORBA::ULong size = seq.length (); for (CORBA::ULong i = 0; i < size; ++i) { diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp index 10b0d3b0ee3..d3dc5f7f5d8 100644 --- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp +++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp @@ -13,7 +13,6 @@ namespace CIAO { namespace Plan_Generator { - // @todo make this a private method static CORBA::Object_ptr fetch_reference_naming (CORBA::ORB_ptr orb, const char *repoman_name = 0 @@ -29,14 +28,9 @@ namespace CIAO ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (CORBA::is_nil (pns.in ())) - { - return CORBA::Object::_nil (); - } - CosNaming::Name name (1); name.length (1); - + name[0].id = CORBA::string_dup (repoman_name); return pns->resolve (name @@ -58,19 +52,22 @@ namespace CIAO if (rm_use_naming) { obj = fetch_reference_naming (orb, rm_name ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } else { obj = orb->string_to_object (rm_name ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } this->rm_ = Deployment::RepositoryManager::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + ACE_CHECK; if (CORBA::is_nil (this->rm_.in ())) { ACE_ERROR ((LM_ERROR, - "(%P|%t) CIAO_PlanGenerator: nil Repository " - "Manager reference, narrow failed\n")); + "(%P|%t) CIAO_PlanGenerator: nil Repository" + " Manager reference, narrow failed\n")); return false; } @@ -113,7 +110,7 @@ namespace CIAO { CORBA::StringSeq_var seq = this->rm_->findNamesByType (package); - for (CORBA::ULong i = 0; i < seq->length (); ++i) + for (size_t i = 0; i < seq->length (); ++i) { pc = this->rm_->findPackageByName (seq[i]); @@ -142,9 +139,9 @@ namespace CIAO } ::Deployment::PackageConfiguration_var pc; - + CORBA::StringSeq_var seq = rm_->findNamesByType (specific_type); - for (CORBA::ULong i = 0; i < seq->length (); ++i) + for (size_t i = 0; i < seq->length (); ++i) { pc = rm_->findPackageByName (seq[i]); diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h index 3fbfef3a9c6..78acb005d72 100644 --- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h +++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h @@ -1,7 +1,7 @@ /** * $Id$ * @file Plan_Generator_Impl.h - * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu> * * Contains the Plan_Generator_i class, which can be used to generate/modify * DeploymentPlans. @@ -10,7 +10,7 @@ #ifndef PLAN_GENERATOR_IMPL_H #define PLAN_GENERATOR_IMPL_H -#include "ciao/Deployment_RepositoryManagerC.h" +#include "ciao/RepositoryManagerC.h" #include "Plan_Generator_Impl_Export.h" namespace CIAO @@ -53,7 +53,7 @@ namespace CIAO bool generate_plan (Deployment::DeploymentPlan &plan, const char *package_uri, bool use_package_name); - + /** * @fn generate_plan * @brief Use the specific type of a package to get the PackageConfiguration diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp index 1d023c774bc..73f208c72b1 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp @@ -202,7 +202,7 @@ namespace CIAO if (mode == pl_mode_start || mode == pl_mode_interactive) // initial deployment { - CORBA::String_var uuid; + const char* uuid = 0; if (package_names != 0) uuid = launcher.launch_plan (deployment_plan_url, @@ -215,14 +215,14 @@ namespace CIAO use_package_name, use_repoman); - if (uuid.in () == 0) + if (uuid == 0) { ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error launching plan\n")); return -1; } - ACE_DEBUG ((LM_DEBUG, "Plan_Launcher returned UUID is %s\n", uuid.in ())); - dapp_mgr = launcher.get_dam (uuid.in ()); + ACE_DEBUG ((LM_DEBUG, "Plan_Launcher returned UUID is %s\n", uuid)); + dapp_mgr = launcher.get_dam (uuid); // Write out DAM ior if requested if (mode == pl_mode_start) @@ -238,7 +238,7 @@ namespace CIAO // Tear down the assembly ACE_DEBUG ((LM_DEBUG, - "Plan_Launcher: destroy the application.....\n")); + "Plan_Launcher: destroy the application.....")); if (! launcher.teardown_plan (uuid)) ACE_DEBUG ((LM_DEBUG, "(%P|%t) CIAO_PlanLauncher:tear down assembly failed: " @@ -248,9 +248,9 @@ namespace CIAO else if (mode == pl_mode_redeployment && new_deployment_plan_url != 0) // do redeployment { ACE_DEBUG ((LM_DEBUG, - "Plan_Launcher: reconfigure application assembly.....\n")); + "Plan_Launcher: reconfigure application assembly.....")); - CORBA::String_var uuid; + const char* uuid; if (package_names != 0) uuid = launcher.re_launch_plan (new_deployment_plan_url, @@ -263,7 +263,7 @@ namespace CIAO use_package_name, use_repoman); - if (uuid.in () == 0) + if (uuid == 0) { ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error re-launching plan\n")); return -1; @@ -285,14 +285,14 @@ namespace CIAO // Tear down the assembly ACE_DEBUG ((LM_DEBUG, - "Plan_Launcher: destroy the application.....\n")); + "Plan_Launcher: destroy the application.....")); launcher.teardown_plan (dapp_mgr.in ()); } else if (mode == pl_mode_stop_by_uuid) // tear down by plan_uuid { // Tear down the assembly ACE_DEBUG ((LM_DEBUG, - "Plan_Launcher: destroy the application.....\n")); + "Plan_Launcher: destroy the application.....")); if (! launcher.teardown_plan (plan_uuid)) { ACE_ERROR ((LM_ERROR, @@ -336,5 +336,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + //ACE_DEBUG ((LM_DEBUG, "NEW PLAN LAUNCHER\n")); + return run_main_implementation (argc, argv); } diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index 73d1890288b..7a8793ec559 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -4,11 +4,13 @@ #include "Config_Handlers/XML_File_Intf.h" #include "Config_Handlers/DnC_Dump.h" +#include <iostream> +#include <string> + namespace CIAO { namespace Plan_Launcher { - // @todo make this a private method static CORBA::Object_ptr fetch_reference_naming (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) @@ -23,11 +25,6 @@ namespace CIAO ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (CORBA::is_nil (pns.in ())) - { - return CORBA::Object::_nil (); - } - CosNaming::Name name (1); name.length (1); @@ -55,15 +52,19 @@ namespace CIAO // EM if (em_ior == 0) { - obj = fetch_reference_naming (orb); + obj = fetch_reference_naming (orb ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } else { - obj = orb->string_to_object (em_ior); + obj = orb->string_to_object (em_ior + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + ACE_CHECK; if (CORBA::is_nil (this->em_.in ())) { @@ -81,13 +82,9 @@ namespace CIAO } if (use_repoman) - { - return pg_.init (orb, rm_use_naming, rm_name); - } - else - { - return true; - } + return pg_.init (orb, rm_use_naming, rm_name); + + return true; } @@ -99,10 +96,7 @@ namespace CIAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure)) { - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG, "Parsing plan...\n")); - } + ACE_DEBUG ((LM_DEBUG, "Parsing plan...\n")); CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri); @@ -113,14 +107,10 @@ namespace CIAO // artifacts in DeploymentPlan. if (use_repoman) { - // @todo check return value pg_.generate_plan (plan, package_uri, use_package_name); } - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG, "Parsing complete....\n")); - } + ACE_DEBUG ((LM_DEBUG, "Parsing complete....\n")); return this->launch_plan (plan.in ()); } @@ -139,50 +129,50 @@ namespace CIAO return 0; } - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("CIAO::Plan_Launcher_i: " ) - ACE_TEXT ("about to call this->em_->preparePlan\n"))); - } - - ::Deployment::DomainApplicationManager_var dam (this->em_->preparePlan (plan, 1)); - - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("CIAO::Plan_Launcher_i: " ) - ACE_TEXT ("after to call this->em_->preparePlan\n"))); - } + if (CIAO::debug_level () > 9) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CIAO::Plan_Launcher_i: " ) + ACE_TEXT ("about to call this->em_->preparePlan\n"))); + } - if (CORBA::is_nil (dam.in ())) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) CIAO_PlanLauncher:preparePlan call failed: " - "nil DomainApplicationManager reference\n")); - return 0; - } + ::Deployment::DomainApplicationManager_var dam (this->em_->preparePlan (plan, 1)); - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG, - "CIAO_PlanLauncher: Obtained DAM ref \n")); - } + if (CIAO::debug_level () > 9) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CIAO::Plan_Launcher_i: " ) + ACE_TEXT ("after to call this->em_->preparePlan\n"))); + } - ::Deployment::Properties_var properties; - ACE_NEW_RETURN (properties, - Deployment::Properties, - 0); + if (CORBA::is_nil (dam.in ())) + { + ACE_ERROR ((LM_ERROR, + "(%P|%t) CIAO_PlanLauncher:preparePlan call failed: " + "nil DomainApplicationManager reference\n")); + return 0; + } - if (CIAO::debug_level ()) + if (CIAO::debug_level () > 9) { ACE_DEBUG ((LM_DEBUG, - "CIAO_PlanLauncher: start Launch application...\n")); + "CIAO_PlanLauncher: Obtained DAM ref \n")); } - // Dont not start the Application immediately since it violates - // the semantics of component activation sequence - int start = 0; + ::Deployment::Properties_var properties; + ACE_NEW_RETURN (properties, + Deployment::Properties, + 0); + + if (CIAO::debug_level ()) + { + ACE_DEBUG ((LM_DEBUG, + "CIAO_PlanLauncher: start Launch application...\n")); + } + + // Dont not start the Application immediately since it vialtes + // the semantics of component activation sequence + int start = 0; dam->startLaunch (properties.in (), 0); @@ -270,7 +260,9 @@ namespace CIAO ACE_ENDTRY; ACE_CHECK_RETURN (0); - return CORBA::string_dup (plan.UUID.in ()); + std::string * retv = new std::string (plan.UUID.in ()); + + return (*retv).c_str (); } ::Deployment::DomainApplicationManager_ptr @@ -299,23 +291,20 @@ namespace CIAO this->em_->getManager (uuid); if (!::CORBA::is_nil (dapp_mgr.in ())) - { - dapp_mgr->destroyApplication (); - - if (CIAO::debug_level ()) - { - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - } - - // Note that we should ask the DAM to tell EM whether the DAM should - // be destroyed - this->destroy_dam_by_plan (uuid); - } + { + dapp_mgr->destroyApplication (); + if (CIAO::debug_level ()) + { + ACE_DEBUG ((LM_DEBUG, "[success]\n")); + } + + // Note that we should ask the DAM to tell EM whether the DAM should + // be destroyed + this->destroy_dam_by_plan (uuid); + } } ACE_CATCHANY { - // @todo the destroy_dam_by_plan could give a stoperror exception - // we should handle ACE_ERROR ((LM_ERROR, "Unable to find DomainApplicationManager " "for plan with uuid: %s\n", uuid)); return false; @@ -370,17 +359,13 @@ namespace CIAO ACE_ENV_ARG_DECL) { if (CIAO::debug_level ()) - { - ACE_DEBUG ((LM_DEBUG, - "CIAO_PlanLauncher: destroy the manager.....\n")); - } + ACE_DEBUG ((LM_DEBUG, + "CIAO_PlanLauncher: destroy the manager.....\n")); this->em_->destroyManagerByPlan (plan_uuid); if (CIAO::debug_level ()) - { - ACE_DEBUG ((LM_DEBUG, "[success]\n")); - } + ACE_DEBUG ((LM_DEBUG, "[success]\n")); } const char * @@ -400,10 +385,11 @@ namespace CIAO // artifacts in DeploymentPlan. if (use_repoman) { - // @todo use return value pg_.generate_plan (plan, package_uri, use_package_name); } + //::Deployment::DnC_Dump::dump (plan.in ()); + return this->re_launch_plan (plan.in ()); } @@ -423,12 +409,12 @@ namespace CIAO this->em_->perform_redeployment (plan); if (CIAO::debug_level ()) - { - ACE_DEBUG ((LM_DEBUG, - "CIAO_PlanLauncher: new plan redeployed ...\n")); - } + ACE_DEBUG ((LM_DEBUG, + "CIAO_PlanLauncher: new plan redeployed ...\n")); + + std::string * retv = new std::string (plan.UUID.in ()); - return CORBA::string_dup (plan.UUID.in ()); + return (*retv).c_str (); } } } diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h index 23ea6abc722..085ee4d8c0c 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h @@ -10,6 +10,7 @@ #define PLAN_LAUNCHER_IMPL_H #include "Plan_Launcher_Impl_Export.h" +#include "ciao/DeploymentS.h" #include "ciao/CIAO_common.h" #include "DAnCE/ExecutionManager/DAM_Map.h" #include "DAnCE/Interfaces/ExecutionManagerDaemonC.h" @@ -32,7 +33,7 @@ namespace CIAO : error_ (error) { } - + ACE_CString error_; }; @@ -41,31 +42,33 @@ namespace CIAO bool init (const char *em_ior, CORBA::ORB_ptr orb, - bool use_repoman = false, - bool rm_use_naming = false, + bool use_repoman = 0, + bool rm_use_naming = 0, const char *rm_name = 0 ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** + * @fn launch_plan * @brief Launch a plan, given a deployment plan URI - * @param deployment_plan_uri A uri that points ot a valid deployment plan + * @param plan_uri A uri that points ot a valid deployment plan * @returns a string containing the UUID of the plan. Null indicates failure. */ const char * launch_plan (const char *deployment_plan_uri, const char *package_uri = 0, - bool use_package_name = true, - bool use_repoman = false + bool use_package_name = 1, + bool use_repoman = 0 ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Deployment_Failure)); const char * re_launch_plan (const char *deployment_plan_uri, const char *package_uri = 0, - bool use_package_name = true, - bool use_repoman = false + bool use_package_name = 1, + bool use_repoman = 0 ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Deployment_Failure)); /** + * @fn launch_plan * @brief Launch a plan, given an IDL deployment plan * @param plan A valid IDL deployment plan * @returns a string containing the UUID of the plan. Null indicates failure. diff --git a/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp new file mode 100644 index 00000000000..edef34a145c --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp @@ -0,0 +1,154 @@ +// $Id$ + +#include "ciao/NodeApplication_CallBackC.h" +#include "ciao/CIAO_common.h" +#include "tao/RTPortableServer/RTPortableServer.h" +#include "ace/Null_Mutex.h" +#include "NodeApplication_Task.h" +#include "RTServer_Impl.h" + +#if !defined (__ACE_INLINE__) +# include "NodeApplication_Task.inl" +#endif /* __ACE_INLINE__ */ + +int +CIAO::NodeApplication_Task::svc () +{ + ACE_TRY_NEW_ENV + { + 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; + + object = + this->orb_->resolve_initial_references ("RootPOA" + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (object.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + // ... + CIAO::RTServer::RTNodeApplication_Impl *nodeapp_servant; + + ACE_NEW_RETURN (nodeapp_servant, + CIAO::RTServer::RTNodeApplication_Impl (this->orb_.in (), + rt_orb.in (), + root_poa.in ()), + -1); + + PortableServer::ServantBase_var safe_servant (nodeapp_servant); + + // Configuring NodeApplication. + PortableServer::ObjectId_var cs_oid + = root_poa->activate_object (nodeapp_servant + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + object = root_poa->id_to_reference (cs_oid.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + Deployment::NodeApplication_var nodeapp_obj = + Deployment::NodeApplication::_narrow (object.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (CORBA::is_nil (nodeapp_obj.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to activate RTNodeApplication object\n"), + -1); + + /** @@ We need to call NodeApplication servant's init method. + * But it's not sure to me where exactly we can get the + * Properties needed by the init method at this moment. There are two + * ways to set the property of the NodeApplication: + * 1. call init remotely from NodeApplicationManager + * 2. call init locally on the servant of NodeApplication. + */ + bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (retval) + { + ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\ + initializing the session container!")); + return 1; + } + + CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (this->options_.ior_output_filename_.length () != 0) + CIAO::Utility::write_IOR (this->options_.ior_output_filename_.c_str (), + str.in ()); + + // End Deployment part + if (CIAO::debug_level () > 10) + { + ACE_DEBUG ((LM_INFO, "RTNodeApplication IOR: %s\n", str.in ())); + + } + + Deployment::NodeApplicationManager_var nodeapp_man; + Deployment::Properties_var prop = new Deployment::Properties; + + if (this->options_.use_callback_) + { + object = this->orb_->string_to_object (this->options_.callback_ior_.c_str () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + CIAO::NodeApplication_Callback_var nam_callback + = CIAO::NodeApplication_Callback::_narrow (object.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + Deployment::Properties_out properties_out (prop.out ()); + + nodeapp_man + = nam_callback->register_node_application (nodeapp_obj.in (), + properties_out + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + + ACE_DEBUG ((LM_DEBUG, + "Running RTNodeApplication...\n")); + + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + return -1; + } + ACE_ENDTRY; + + ACE_DEBUG ((LM_DEBUG, + "Exiting RTNodeApplication...\n")); + return 0; +} diff --git a/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h new file mode 100644 index 00000000000..521dd9a4806 --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h @@ -0,0 +1,82 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file NodeApplication_Task.h + * + * $Id$ + * + * An ACE_Task subclass that manages the RT-ORB thread for CIAO's RT + * NodeApplication. + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + + +#ifndef CIAO_NODEAPPLICATION_TASK_H +#define CIAO_NODEAPPLICATION_TASK_H +#include /**/ "ace/pre.h" + +#include "tao/ORB_Core.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/ORB.h" +#include "ace/Task.h" +#include "ace/SString.h" + +namespace CIAO +{ + /** + * @class NodeApplication_task + * + * @brief An ACE_Task subclass that manages the RT-ORB therad + */ + class NodeApplication_Task + : public ACE_Task_Base + { + public: + // We can add a rt-task configuration facility here. + typedef struct _options + { + // default ctor. + _options () : use_callback_ (1) {} + + // The name of the file to write stringified IOR to. + ACE_CString ior_output_filename_; + + // Stringified IOR of a CIAO's callback object. + ACE_CString callback_ior_; + + // CIAO ComponentServer uses the callback object to pass it's + // own object reference back to NodeApplicationManager. + int use_callback_; + + // RTCAD extension filename. + ACE_CString rtcad_filename_; + } Options; + + NodeApplication_Task (ACE_Thread_Manager &thread_manager, + CORBA::ORB_ptr orb, + Options &opts); + + int svc (void); + + protected: + CORBA::ORB_var orb_; + + // ComponentServer config options. + Options options_; + }; + +} + +#if defined (__ACE_INLINE__) +# include "NodeApplication_Task.inl" +#endif /* __ACE_INLINE__ */ + +#include /**/ "ace/post.h" +#endif /* CIAO_NODEAPPLICAITON_TASK_H */ diff --git a/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl new file mode 100644 index 00000000000..b2923cde8aa --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl @@ -0,0 +1,11 @@ +// -*- C++ -*- $Id$ + +ACE_INLINE +CIAO::NodeApplication_Task::NodeApplication_Task (ACE_Thread_Manager &tm, + CORBA::ORB_ptr o, + CIAO::NodeApplication_Task::Options &opts) + : ACE_Task_Base (&tm), + orb_ (CORBA::ORB::_duplicate (o)), + options_ (opts) +{ +} diff --git a/CIAO/DAnCE/RTNodeApplication/README b/CIAO/DAnCE/RTNodeApplication/README new file mode 100644 index 00000000000..b7d013f07b5 --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/README @@ -0,0 +1,40 @@ +$Id$ + +This directory contains the deprecated RTNodeApplication +implementation. It will be removed shortly. + +* Currently, the RTNodeApplication does not support configuring of any + RT policies. + +* RTNodeApplication supports the following command line flags: + + * -n : Do not try to call back NodeApplicationManager. This is only + useful when testing the server and the server is not created + by a NodeApplicationManager. + + * -o <filename> : Specify the filename NodeApplication will write + IOR to. This is only useful when debugging also. + + * -k <IOR> : Specify the callback IOR to the NodeApplicationManager. + +* Corresponding files to old RTNodeApplication: + + RTNodeApplication.cpp: Main program + + NodeApplication_Task.*: ACE_Task class for spawning the thread for + RT-NodeApplication using the right scheduling + strategy. + + RTNodeApplication_Impl.* : Actual RTNodeApplication server implementation. + + senv.sh: A simple shell script for setting up the run-time + environment when starting NodeDaemon with sudo. + This is necessary because the RTNodeApplication needs to + spawn threads with real-time scheduling class. This + operation requires the process to be run by privileged user. + You may need to tweak this shell script to suit your need. + Here's an example of how to use the script: + + $ sudo senv.sh $CIAO_ROOT/DAnCE/NodeManager/NodeManager \ + -ORBEndpoint iiop://localhost:10000 \ + -s $CIAO_ROOT/DAnCE/RTNodeApplication/RTNodeApplication diff --git a/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp b/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp new file mode 100644 index 00000000000..86e56f99cb3 --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp @@ -0,0 +1,171 @@ +// $Id$ + +#include "ace/Get_Opt.h" +#include "ace/Sched_Params.h" +#include "NodeApplication_Task.h" +#include "ciao/Server_init.h" + +int +parse_args (int argc, + char *argv[], + CIAO::NodeApplication_Task::Options &opts) +{ + ACE_Get_Opt get_opts (argc, argv, "nk:o:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'n': + opts.use_callback_ = 0; + break; + + case 'o': // get the file name to write to + opts.ior_output_filename_ = get_opts.opt_arg (); + break; + + case 'k': // get the activator callback IOR + opts.callback_ior_ = get_opts.opt_arg (); + break; + + case '?': // display help for use of the server. + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-n Don't not try to callback NodeApplicationManager (testing)\n" + "-o <ior_output_file>\n" + "-k <activator_callback_ior>\n" + "\n", + argv [0]), + -1); + } + + if (opts.use_callback_ && opts.callback_ior_.length () == 0) + ACE_ERROR_RETURN ((LM_ERROR, "Callback IOR to NodeApplicationManager is required.\n"), + -1); + + return 0; +} + +const char * +sched_policy_name (int sched_policy) +{ + const char *name = 0; + + switch (sched_policy) + { + case ACE_SCHED_OTHER: + name = "SCHED_OTHER"; + break; + case ACE_SCHED_RR: + name = "SCHED_RR"; + break; + case ACE_SCHED_FIFO: + name = "SCHED_FIFO"; + break; + } + + return name; +} + +/// The following check is taken from $(TAO_ROOT)/tests/RTCORBA/ +void +check_supported_priorities (CORBA::ORB_ptr orb) +{ + int sched_policy = + orb->orb_core ()->orb_params ()->ace_sched_policy (); + + // Check that we have sufficient priority range to run, + // i.e., more than 1 priority level. + int max_priority = + ACE_Sched_Params::priority_max (sched_policy); + int min_priority = + ACE_Sched_Params::priority_min (sched_policy); + + if (max_priority == min_priority) + { + ACE_DEBUG ((LM_DEBUG, + "Not enough priority levels with the %s scheduling policy\n" + "on this platform to run, terminating program....\n" + "Check svc.conf options\n", + sched_policy_name (sched_policy))); + + ACE_OS::exit (2); + } +} + + +int +main (int argc, char **argv) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, + argv, + "" + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + // Register value factories for the server side. + CIAO::Server_init (orb.in ()); + + CIAO::NodeApplication_Task::Options options; + + int result = + parse_args (argc, argv, options); + + if (result != 0) + return result; + + // Make sure we can support multiple priorities that are required + // for this test. + // check_supported_priorities (orb.in()); + + // Thread Manager for managing task. + ACE_Thread_Manager thread_manager; + + // Create task. + CIAO::NodeApplication_Task cs_task (thread_manager, + orb.in (), + options); + + // Task activation flags. + long flags = + THR_NEW_LWP | + THR_JOINABLE | + orb->orb_core ()->orb_params ()->thread_creation_flags (); + + // Activate task. + result = + cs_task.activate (flags); + if (result == -1) + { + if (errno == EPERM) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot create thread with scheduling policy %s\n" + "because the user does not have the appropriate privileges, terminating program....\n" + "Check svc.conf options and/or run as root\n", + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), + 2); + } + else + // Unexpected error. + ACE_ASSERT (0); + } + + // Wait for task to exit. + result = + thread_manager.wait (); + ACE_ASSERT (result != -1); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + return -1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp new file mode 100644 index 00000000000..597b8c76d6d --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp @@ -0,0 +1,13 @@ +// $Id$ + +#include "RTServer_Impl.h" +#include "ciao/CIAO_common.h" + +#if !defined (__ACE_INLINE__) +# include "RTServer_Impl.inl" +#endif /* __ACE_INLINE__ */ + +CIAO::RTServer::RTNodeApplication_Impl::~RTNodeApplication_Impl () +{ +} + diff --git a/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h new file mode 100644 index 00000000000..fdcca084ed5 --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h @@ -0,0 +1,77 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file RTServer_Impl.h + * + * $Id$ + * + * This file contains real-time extended implementations for the + * servants of + * Deployment::NodeApplication + * + * It will also contain the real-time extended version of + * CIAO::Session_Container. + * + * Currently, they are only used in the RTComponentServer + * implementation. + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + + +#ifndef CIAO_RTSERVER_IMPL_H +#define CIAO_RTSERVER_IMPL_H +#include /**/ "ace/pre.h" + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ciao/NodeApplication_Impl.h" +#include "ciao/Container_Base.h" +#include "tao/RTCORBA/RTCORBA.h" + +namespace CIAO +{ + namespace RTServer + { + /** + * @class RTNodeApplication + * + * @brief Real-time extention servant implementation of + * Deployment::NodeApplication + * + * This class implements the Deployment::NodeApplication + * interface as defined by the DnC spcification. As the interface + * implies, this is actually part of the deployment interface and is + * used to manage the lifecycle of containers running on the server. + */ + class RTNodeApplication_Impl + : public virtual CIAO::NodeApplication_Impl + { + public: + /// Constructor + RTNodeApplication_Impl (CORBA::ORB_ptr o, + RTCORBA::RTORB_ptr rto, + PortableServer::POA_ptr p); + + /// Destructor + virtual ~RTNodeApplication_Impl (void); + + protected: + RTCORBA::RTORB_var rtorb_; + }; + + } +} + +#if defined (__ACE_INLINE__) +# include "RTServer_Impl.inl" +#endif /* __ACE_INLINE__ */ + +#include /**/ "ace/post.h" +#endif /* CIAO_RTSERVER_IMPL_H */ diff --git a/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.inl b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.inl new file mode 100644 index 00000000000..aa1679b88a3 --- /dev/null +++ b/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.inl @@ -0,0 +1,13 @@ +/* -*- C++ -*- */ +// $Id$ + +ACE_INLINE +CIAO::RTServer::RTNodeApplication_Impl::RTNodeApplication_Impl (CORBA::ORB_ptr o, + RTCORBA::RTORB_ptr rto, + PortableServer::POA_ptr p) + : NodeApplication_Impl (o, p), + rtorb_ (RTCORBA::RTORB::_duplicate (rto)) +{ +} + + diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp b/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp new file mode 100644 index 00000000000..73a8071f305 --- /dev/null +++ b/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp @@ -0,0 +1,59 @@ +// $Id$ + +// HTTP_Client.cpp, Stoyan + +#include "HTTP_Client.h" +#include "HTTP_Handler.h" +#include "ace/OS_NS_string.h" + +HTTP_Client::HTTP_Client (void) +{ +} + +HTTP_Client::~HTTP_Client (void) +{ + this->close (); +} + +// initialize address and filename. No network i/o in open +int +HTTP_Client::open (const ACE_TCHAR *filename, + const ACE_TCHAR *hostname, + u_short port) +{ + filename_ = ACE_OS::strdup (filename); + inet_addr_.set (port, hostname); + return 0; +} + +// read from connection length bytes from offset, into Message block +int +HTTP_Client::read (ACE_Message_Block *mb) +{ + + // Create a HTTP_Client Reader + HTTP_Reader HTTP_reader (mb, filename_); + HTTP_Handler *brp = &HTTP_reader; + + // Connect to the server + if (connector_.connect (brp, inet_addr_) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Client::read():Connector error"), -1); + + return HTTP_reader.byte_count (); + +} + +// close down the HTTP_Client +int +HTTP_Client::close (void) +{ + + if (filename_) + { + ACE_OS::free ((void *) filename_); + filename_ = 0; + } + return 0; + +} + diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Client.h b/CIAO/DAnCE/RepositoryManager/HTTP_Client.h new file mode 100644 index 00000000000..ac0f9cbea92 --- /dev/null +++ b/CIAO/DAnCE/RepositoryManager/HTTP_Client.h @@ -0,0 +1,72 @@ + +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file HTTP_Client.h + * + * $Id$ + * + * This is the HTTP_Client class, which is the API for doing file + * uploads/downloads. + * + * @author Stoyan Paunov + */ +//============================================================================= + + +#ifndef HTTP_Client_H +#define HTTP_Client_H + + +#include "ace/INET_Addr.h" +#include "ace/Svc_Handler.h" +#include "ace/SOCK_Connector.h" +#include "ace/Connector.h" +#include "ace/Message_Block.h" +#include "HTTP_Handler.h" + +/** + * @class HTTP_Client + * + * @brief HTTP_Client is intended to provide application API to + * classes that wish to do network i/o at a very + * high level of abstraction. + * + * This class provides the ability to retrieve data from + * the network, of specified length and offset, and potentially + * use any protocol "under the hood" to do so. It currently + * uses HTTP. See HTTP_Handler also. + */ +class HTTP_Client +{ +public: + HTTP_Client (void); + ~HTTP_Client (void); + + /// Initializes the class with the given filename, hostname and port. + /// it should be called with the filename, before any read/write calls + int open (const ACE_TCHAR *filename, + const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST, + u_short port = 80); + + /// Starts a connection, and reads a file from the server into + /// Message_Block mb + int read (ACE_Message_Block *mb); + + /// Frees memory allocated for filename. + int close (); + +private: + /// Store the internet address of the server + ACE_INET_Addr inet_addr_; + + /// The filename + ACE_TCHAR *filename_; + + /// The connector endpoint to initiate the client connection + ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_; + +}; + +#endif /* HTTP_Client_H */ diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp new file mode 100644 index 00000000000..ffd85ca1ebf --- /dev/null +++ b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp @@ -0,0 +1,203 @@ +// $Id$ + +// HTTP_Handler.cpp, Stoyan + +#include "HTTP_Handler.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" + +// Empty constructor for compliance with new Connector behavior. +HTTP_Handler::HTTP_Handler (void) +{ +} + +// Always use this constructor +HTTP_Handler::HTTP_Handler (ACE_Message_Block * mb, + ACE_TCHAR *filename) : + mb_ (mb), + filename_ (ACE_OS::strdup (filename)), + bytecount_ (0) +{ +} + +HTTP_Handler::~HTTP_Handler (void) +{ + if (filename_) + { + ACE_OS::free (filename_); + filename_ = 0; + } +} + +// Called by Connector after connection is established +int +HTTP_Handler::open (void *) +{ + if (this->send_request () != 0) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1); + + if (this->receive_reply () != 0) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1); + return 0; + +} + +// No-op +int +HTTP_Handler::close (u_long) +{ + return 0; +} + +// Always overridden by the derived classes +int +HTTP_Handler::send_request (void) +{ + return -1; +} + +// Always overridden by the derived classes +int +HTTP_Handler::receive_reply (void) +{ + return -1; +} + +// used to retrieve the number of bytes read/written by the +// last operation on the Blob +size_t +HTTP_Handler::byte_count (void) +{ + return bytecount_; +} + +// Reader ************************************************** + +HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb, + ACE_TCHAR *filename, + const char *request_prefix, + const char *request_suffix) : + HTTP_Handler (mb, filename), + request_prefix_ (request_prefix), + request_suffix_ (request_suffix) +{ +} + +// Send the HTTP request +int +HTTP_Reader::send_request (void) +{ + char mesg [MAX_HEADER_SIZE]; + + // Check to see if the request is too big + if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_) + + ACE_OS::strlen (filename_) + + ACE_OS::strlen (request_suffix_) + 4)) + ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1); + + // Create a message to send to the server requesting retrieval of the file + int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_); + + // Send the message to server + if (peer ().send_n (mesg, len) != len) + ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1); + + + return 0; +} + +// Recieve the HTTP Reply +int +HTTP_Reader::receive_reply (void) +{ + size_t num_recvd = 0; + char buf [MTU+1]; + char *buf_ptr = 0; + size_t bytes_read = 0; + + // Receive the first MTU bytes and strip the header off. + // Note that we assume that the header will fit into MTU bytes. + + if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0) + { + //Make sure that response type is 200 OK + if (ACE_OS::strstr (buf,"200 OK") == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1); + + // Search for the header termination string "\r\n\r\n", or "\n\n". If + // found, move past it to get to the data portion. + if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0) + buf_ptr += 4; + else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0) //for compatibility with JAWS + buf_ptr += 2; + else + buf_ptr = buf; + + // Determine number of data bytes read. This is equal to the + // total bytes read minus number of header bytes. + bytes_read = num_recvd - (buf_ptr - buf); + + } + else + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1); + + // *************************************************************** + // At this point, we have stripped off the header and are ready to + // process data. buf_ptr points to the data + + //set the size of the ACE_Message_Block to the current bytes read + //NOTE: this function reallocates if necessary + //this->mb_->size (bytes_read); + + ACE_Message_Block* temp; //pointer used temporarily + //for memory allocations before + //chaining to Message_Block + + ACE_Message_Block* curr = this->mb_; + + ACE_NEW_RETURN (temp, ACE_Message_Block (bytes_read), -1); + curr->cont (temp); + + curr = curr->cont (); + + // Copy over all the data bytes into our message buffer. + if (curr->copy (buf_ptr, bytes_read) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", + "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1); + + //read the rest of the data into a number of ACE_Message_Blocks and + //chain them together in a link list fashion + + num_recvd = 0; + + do + { + if (curr->space () == 0) + { + ACE_NEW_RETURN (temp, ACE_Message_Block (MTU), -1); + curr->cont (temp); + curr = curr->cont (); + } + + if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0) + { + //move the write pointer + curr->wr_ptr (num_recvd); + + //increment bytes_read + bytes_read += num_recvd; + + } + else + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1); + + }while (num_recvd != 0); + + // Set the byte count to number of bytes received + this->bytecount_ = bytes_read; + + return 0; +} + diff --git a/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h new file mode 100644 index 00000000000..d1e9aae2894 --- /dev/null +++ b/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h @@ -0,0 +1,86 @@ + +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file HTTP_Handler.h + * + * $Id$ + * + * HTTP_Handler is a base class for HTTP_Reader and + * HTTP_Writer which are created in response to calls to + * read/write, as appropriate + * + * + * @author Stoyan Paunov + */ +//============================================================================= + + +#ifndef HTTP_HANDLER_H +#define HTTP_HANDLER_H + +#include "ace/SOCK_Stream.h" +#include "ace/Svc_Handler.h" +#include "ace/Message_Block.h" + +/** + * @class HTTP_Handler + * class to retrieve data via HTTP + */ +class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH> +{ +public: + /// Null constructor, insures that it works properly with Connector + HTTP_Handler (void); + + /// Always use this constructor to make HTTP_Handlers + HTTP_Handler (ACE_Message_Block *mb, + ACE_TCHAR *filename); + + /// returns the number of bytes read/written in the last operation. + size_t byte_count (void); + + /// Activate this instance of the <HTTP_Handler> + virtual int open (void * = 0); + + /// Close down the Blob + virtual int close (u_long flags = 0); + + ~HTTP_Handler (void); + +protected: + virtual int send_request (void); + virtual int receive_reply (void); + + ACE_Message_Block *mb_; + ACE_TCHAR *filename_; + size_t bytecount_; + enum + { + /// The handler assumes that the first 2048 bytes of a server response + /// contains the header + MAX_HEADER_SIZE = 2048, + + /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS + MTU = BUFSIZ + }; +}; + +class HTTP_Reader : public HTTP_Handler +{ +public: + HTTP_Reader (ACE_Message_Block *mb, + ACE_TCHAR *filename, + const char *request_prefix = "GET", + const char *request_suffix = "HTTP/1.0\r\n\r\n"); + +private: + //NOTE: these functions return -1 on error + int send_request (void); + int receive_reply (void); + const char *request_prefix_; + const char *request_suffix_; +}; + +#endif /* HTTP_HANDLER_H */ diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp index d2ce75e8666..164a151cd6f 100644 --- a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp +++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp @@ -6,6 +6,10 @@ #include "PC_Updater_T.h" #include "ace/Containers_T.h" //for ACE_Double_Linked_List + +#include <iostream> +using namespace std; + namespace { const size_t TEMP_LEN = 1024; @@ -167,9 +171,7 @@ void PC_Updater::clear_list () void PC_Updater::update (::Deployment::ImplementationArtifactDescription &iad) { - const char* location = CORBA::string_dup (iad.location[0]); - - //create an iterator + //create an interator ACE_Double_Linked_List_Iterator<ZIP_File_Info> iter (this->file_list_); //find the correct path and return @@ -188,8 +190,8 @@ void PC_Updater::clear_list () if (name) { ACE_CString loc (this->server_path_); - loc += "/implementations/"; - loc += location; + loc += "/"; + loc += full_path; iad.location[0] = CORBA::string_dup (loc.c_str ()); @@ -199,6 +201,7 @@ void PC_Updater::clear_list () } iter++; } + const char* location = iad.location[0]; ACE_ERROR ((LM_ERROR, "[PC_Updater::update] Unable to update: %s!\n", diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp index cd4b92669d0..2a1639a8d35 100644 --- a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp +++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp @@ -1,6 +1,9 @@ // $Id$ #include "RM_Helper.h" +#include "ciao/Packaging_DataC.h" //for the PackageConfiguration declaration +#include "tao/CDR.h" //for TAO CDR classes +#include "ace/Message_Block.h" //for ACE_Message_Block #include "ace/Auto_Ptr.h" //for Auto_Ptr #include "ace/OS_NS_fcntl.h" //for open #include "ace/OS_NS_unistd.h" //for close diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.h b/CIAO/DAnCE/RepositoryManager/RM_Helper.h index f76764e3b11..f52e7deaaf2 100644 --- a/CIAO/DAnCE/RepositoryManager/RM_Helper.h +++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.h @@ -19,9 +19,9 @@ #define RM_HELPER_H_ -#include "ciao/Deployment_Packaging_DataC.h" -#include "tao/CDR.h" -#include "ace/Message_Block.h" +#include "ciao/Packaging_DataC.h" //for the PackageConfiguration declaration +#include "tao/CDR.h" //for TAO CDR classes +#include "ace/Message_Block.h" //for ACE_Message_Block class RM_Helper diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp index 61803ce1347..03ebc62a370 100644 --- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp +++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp @@ -1,3 +1,4 @@ + /* -*- C++ -*- */ /*** @@ -17,10 +18,12 @@ #include "ace/OS_NS_fcntl.h" //for open #include "ace/OS_NS_unistd.h" //for close #include "ace/OS_NS_sys_stat.h" //for filesize and fstat and mkdir -#include "ace/streams.h" #include "Config_Handlers/DnC_Dump.h" +#include <iostream> +using namespace std; + #include "RM_Helper.h" //to be able to externalize/internalize a PackageConfiguration #include "tao/CDR.h" //for TAO CDR classes #include "ace/Message_Block.h" //for ACE_Message_Block @@ -100,9 +103,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } if (options->shutdown_) - { - rm->shutdown (); - } + { + rm->shutdown (); + } else if (options->all_names_) { try diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp index fe8c009efa6..cb99ca7f3f1 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp @@ -34,10 +34,10 @@ namespace CIAO const char * RMior = "RepositoryManagerDaemon.ior"; // Name of RepoMan - const char * repoman_name_ = "RepositoryManager"; + char * repoman_name_ = "RepositoryManager"; //Name service of the RM - const char * RMname_service = "RepositoryManager"; + char * RMname_service = "RepositoryManager"; /// Default number of worker threads to run in the multi-threaded RM static unsigned int nthreads = 3; @@ -48,7 +48,7 @@ namespace CIAO } } -// Forward declaration +//forward declaration bool parse_args (int argc, char *argv[]); /** @@ -143,18 +143,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (!parse_args (argc, argv)) return -1; - // Get the root POA object + //Get the root POA object CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); - // Downcast to POA type + //downcast to POA type PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()); //activate the POA manager PortableServer::POAManager_var mgr = root_poa->the_POAManager (); mgr->activate (); - // Create a servant - CIAO_RepositoryManagerDaemon_i* repo = 0; + //create a servant + CIAO_RepositoryManagerDaemon_i* repo; ACE_NEW_RETURN (repo, CIAO_RepositoryManagerDaemon_i ( orb.in (), @@ -162,7 +162,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CIAO::RepositoryManager::repoman_name_), 1); - //transfer ownership to the POA + //trasfer ownership to the POA PortableServer::ServantBase_var owner_transfer(repo); //register and implicitly activate servant @@ -202,10 +202,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - // done + //done return 0; - // todo shutdown orb + //Start accepting requests + orb->run (); + + //allow objects registered with the POA ot get cleaned-up + root_poa->destroy (1, 1); + + //shutdown the orb + orb->shutdown (1); + + return 0; } catch (CORBA::Exception &ex) { cerr << "CORBA Exception: " << ex << endl; diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc index b20b77e2d6c..a39395f3862 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc @@ -6,13 +6,13 @@ project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib { - includes += $(CIAO_ROOT)/tools/Config_Handlers $(ACE_ROOT)/contrib/minizip + includes += $(CIAO_ROOT)/tools/Config_Handlers $(ACE_ROOT)/contrib/minizip //to circumvent an improper include resolution //in the Package_Handlers/PC_Intf.h exename = RepositoryManagerDaemon requires += zlib after += minizip - libs += Package_Config_Handlers minizip + libs += Package_Config_Handlers minizip IDL_Files { RepositoryManagerDaemon.idl @@ -26,6 +26,8 @@ project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib { RepositoryManager_Impl.cpp RM_Helper.cpp URL_Parser.cpp + HTTP_Handler.cpp + HTTP_Client.cpp PC_Updater_T.cpp PC_Updater.cpp } diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl b/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl index 7f28e7d5683..3cd410d2575 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl @@ -1,6 +1,6 @@ // $Id$ -#include "ciao/Deployment_RepositoryManager.idl" +#include "ciao/RepositoryManager.idl" module CIAO { diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp index e031c81854f..02e31b897b0 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -32,7 +32,7 @@ //for the PackageConfiguration parsing #include "ciao/Deployment_DataC.h" -#include "ciao/Deployment_Packaging_DataC.h" +#include "ciao/Packaging_DataC.h" #include "Package_Handlers/PCD_Handler.h" #include "RM_Helper.h" //to be able to externalize/internalize a PackageConfiguration @@ -42,12 +42,15 @@ #include "ace/OS_NS_stdlib.h" //for itoa () #include "URL_Parser.h" //for parsing the URL -#include "tao/HTTP_Client.h" //the HTTP client class to downloading packages +#include "HTTP_Client.h" //the HTTP client class to downloading packages #include "PC_Updater.h" //A visitor class to walk through the elements of the PC #include "ace/Configuration_Import_Export.h" +#include <iostream> +using namespace std; + namespace { static const char* PC_EXTENSION = ".epc"; @@ -63,7 +66,7 @@ namespace //----------------------------------------------------------------- CIAO_RepositoryManagerDaemon_i::CIAO_RepositoryManagerDaemon_i - (CORBA::ORB_ptr the_orb, const char* server, const char* install_dir) + (CORBA::ORB_ptr the_orb, const char* server, char* install_dir) : the_orb_ (CORBA::ORB::_duplicate (the_orb)), install_root_ (""), HTTP_server_ ("http://"), @@ -251,8 +254,8 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( { //TODO: how can I incorporate a Auto_Ptr is explicit release is needed - ACE_Message_Block* mb = 0; - ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ()); + ACE_Message_Block* mb; + ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); //get the remote file @@ -456,7 +459,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( { //TODO: how can I incorporate a Auto_Ptr is explicit release is needed ACE_Message_Block* mb; - ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); //get the remote file @@ -589,7 +592,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name) Deployment::PackageConfiguration_var pc; ACE_NEW_THROW_EX (pc, Deployment::PackageConfiguration (), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); @@ -630,7 +633,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID) Deployment::PackageConfiguration_var pc; ACE_NEW_THROW_EX (pc, Deployment::PackageConfiguration (), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); @@ -661,7 +664,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID) { //return an empty sequence CORBA::StringSeq_var seq; - ACE_NEW_THROW_EX (seq, CORBA::StringSeq (0), CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (seq, CORBA::StringSeq (0), CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); return seq._retn (); @@ -676,7 +679,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID) CORBA::StringSeq_var seq; ACE_NEW_THROW_EX (seq, CORBA::StringSeq (len), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); seq->length (len); //store the elements in the string sequence @@ -719,7 +722,7 @@ CIAO_RepositoryManagerDaemon_i::getAllNames () ++num_entries; CORBA::StringSeq_var seq; - ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); @@ -767,7 +770,7 @@ CIAO_RepositoryManagerDaemon_i::getAllNames () CORBA::StringSeq_var seq; ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); @@ -832,7 +835,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage ( Deployment::PackageConfiguration_var pc; ACE_NEW_THROW_EX (pc, Deployment::PackageConfiguration (), - CORBA::NO_MEMORY ()); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); @@ -947,7 +950,7 @@ int CIAO_RepositoryManagerDaemon_i::HTTP_Get (const char* URL, ACE_Message_Block return 0; // Create a client - TAO_HTTP_Client client; + HTTP_Client client; // Open the client if (client.open (parser->filename_, diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h index 0c371d7c758..b35dd6a94f6 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h @@ -55,7 +55,7 @@ public: /// Constructor CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb, const char* server = "localhost:5432", - const char* install_dir = "RepositoryManager"); + char* install_dir = "RepositoryManager"); /// Destructor virtual ~CIAO_RepositoryManagerDaemon_i (void); @@ -163,6 +163,7 @@ protected: /// stores the file in the passed preallocated ACE_Message_Block /// @retval 1 success /// @retval 0 error + int HTTP_Get (const char* URL, ACE_Message_Block &mb); /// Function to extract all necessary files for parsing the @@ -171,42 +172,47 @@ protected: /// @retval 0 error /// /// @note ACE_CString& pcd_name is an out parameter + int extract_descriptor_files (char* package, ACE_CString& pcd_name); - /// Function to remove the files extracted for parsing the PackageConfiguration - /// descriptor and populating the idl struct. It reads the names of the files - /// from the package. They correspond to the names on disk. - /// @retval 1 on success - /// @retval 0 on error + ///function to remove the files extracted for parsing the PackageConfiguration + ///descriptor and populating the idl struct. It reads the names of the files + ///from the package. They correspond to the names on disk. + ///return 1 on success + /// 0 on error + int remove_descriptor_files (char* package); - /// Function to remove the files extracted from the package upon istallation - /// It reads the names of the files from the package. They correspond to the - /// names on disk. It deletes each file, then it deletes the directories that - /// contain them. - /// @note extraction location is path/*archive_name*/ - /// @retval 1 on success - /// @retval 0 on error + ///function to remove the files extracted from the package upon istallation + ///It reads the names of the files from the package. They correspond to the + ///names on disk. It deletes each file, then it deletes the directories that + ///contain them. + ///NOTE: extraction location is path/*archive_name*/ + ///returns 1 on success + /// 0 on error + int remove_extracted_package (const char* package_path, const char* extraction_location); - /// Function to extract the type of the component from - /// the PackageConfiguration and update the interface map - /// @retval 1 on success - /// @retval 0 on error + ///function to extract the type of the component from + ///the PackageConfiguration and update the interface map + ///returns 1 on success + /// 0 on error + int add_type (::Deployment::PackageConfiguration& pc, const char* name); - /// Function to remove the interface type of the component - /// being removed from the interface map - /// @retval 1 on success - /// @retval 0 on error + ///function to remove the interface type of the component + ///being removed from the interface map + ///returns 1 on success + /// 0 on error + int remove_type (::Deployment::PackageConfiguration& pc, const char* name); - /// Function to dump the state of the RepositoryManager + ///function to dump the state of the RepositoryManager void dump (void); private: @@ -249,32 +255,25 @@ private: typedef CIEntry::VALUE_SET CISet; typedef CIEntry::VALUE_SET_ITERATOR CISet_Iterator; - /// A hash map that associates the names of - /// PackageConfigurations with their location + //a hash map that associates the names of + //PackageConfigurations with their location PCMap names_; /// a hash map that associates the UUIDs of /// PackageConfigurations with their location PCMap uuids_; - /// a hash map which associates Component Interface - /// UUIDs with their implementations + //a hash map which associates Component Interface + //UUIDs with their implementations CIMap types_; - /// The ORB + //the ORB CORBA::ORB_var the_orb_; - /// Will hold the current working directory - char cwd_ [TEMP_LEN]; - - /// Full path for the install directory - ACE_CString install_root_; - - /// Location of the server - ACE_CString HTTP_server_; - - /// Directory where the packages will be stored locally - ACE_CString install_path; + char cwd_ [TEMP_LEN]; //will hold the current working directory + ACE_CString install_root_; //full path for the install directory + ACE_CString HTTP_server_; //location of the server + ACE_CString install_path; //directory where the packages will be stored locally }; #endif /* REPOSITORYMANAGER_H_ */ diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp index 37187ebff61..aa346504a20 100644 --- a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp +++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp @@ -4,7 +4,6 @@ #include "ace/ARGV.h" #include "URL_Parser.h" -#include "ace/ACE.h" #include "ace/OS_NS_string.h" bool @@ -21,24 +20,21 @@ URL_Parser::parse_args (int argc, ACE_TCHAR *argv[]) case 'd': this->debug_ = true; break; - case 'u': - success = parseURL (get_opt.opt_arg ()); - break; + case 'u': + success = parseURL (get_opt.opt_arg ()); + break; // Usage fallthrough. default: success = false; } - if (this->hostname_ == 0 || this->filename_ == 0) - { - success = false; - } + success = false; return success; } URL_Parser::URL_Parser (void) - : hostname_ (ACE::strnew ("127.0.0.1")), + : hostname_ ("127.0.0.1"), port_ (ACE_DEFAULT_HTTP_SERVER_PORT), filename_ (0), debug_ (false) @@ -47,55 +43,61 @@ URL_Parser::URL_Parser (void) bool URL_Parser::parseURL (char* url) { - char* ptr = 0; + char* ptr; bool success = true; ptr = ACE_OS::strstr (url, "http://"); if (ptr) url += ACE_OS::strlen ("http://"); if (url[0] == '/') - { - this->filename_ = ACE_OS::strdup (url); - } + { + this->filename_ = ACE_OS::strdup (url); + } else + { ptr = ACE_OS::strstr (url, ":"); + if (ptr) + this->port_ = ACE_OS::atoi (ptr + 1); + else + ptr = ACE_OS::strstr (url, "/"); + + if(!ptr) + success = false; + else { - ptr = ACE_OS::strstr (url, ":"); + size_t host_len = ptr - url; + ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false); + ACE_OS::strncpy (this->hostname_, url, host_len); + this->hostname_ [host_len] = '\0'; + ptr = ACE_OS::strstr (ptr, "/"); if (ptr) - this->port_ = ACE_OS::atoi (ptr + 1); + { + this->filename_ = ACE_OS::strdup(ptr); + } else - ptr = ACE_OS::strstr (url, "/"); - - if(!ptr) success = false; - else - { - size_t host_len = ptr - url; - ACE::strdelete (this->hostname_); - ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false); - ACE_OS::strncpy (this->hostname_, url, host_len); - this->hostname_ [host_len] = '\0'; - ptr = ACE_OS::strstr (ptr, "/"); - if (ptr) - { - this->filename_ = ACE_OS::strdup(ptr); - } - else - { - success = false; - } - } } - return success; + } + return success; } void URL_Parser::Error (void) { ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n")); -} -URL_Parser::~URL_Parser() -{ - delete [] this->hostname_; - ACE_OS::free (this->filename_); } + + + URL_Parser::~URL_Parser() + { + if(this->hostname_) + { + delete [] this->hostname_; + this->hostname_ =0; + } + if (this->filename_) + { + ACE_OS::free (this->filename_); + this->filename_ = 0; + } + } diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp index b318af0ad13..d5148bd178a 100644 --- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp +++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp @@ -8,7 +8,7 @@ * Purpose: implementing the ZIP_Wrapper class * * @author Stoyan Paunov, Vipul Singh - * + * */ //=============================================================================== @@ -23,6 +23,7 @@ #include "ace/OS_Memory.h" //for ACE_NEW* macros #include <string> +#include <memory> //for auto_ptr #include "unzip.h" #define MAXFILENAME (256) #define CASESENSITIVITY (0) @@ -47,15 +48,15 @@ ZIP_File_Info::ZIP_File_Info () prev_ (0) { } - + /// Gets a list of the files in the archive. int ZIP_Wrapper::file_list_info (char* zip_name, ACE_Double_Linked_List<ZIP_File_Info> &list) { - unzFile uf=0; + unzFile uf=NULL; char filename_try[MAXFILENAME+16] = ""; - if (zip_name!=0) + if (zip_name!=NULL) { strncpy(filename_try, zip_name, MAXFILENAME-1); /* strncpy doesnt append the trailing NULL, if the string is too long. */ @@ -63,14 +64,14 @@ int ZIP_Wrapper::file_list_info (char* zip_name, /* open the zip file */ uf = unzOpen(zip_name); /* if zipfile could not be opened, try appending .zip to name */ - if (uf==0) - { - ACE_OS::strcat(filename_try, ".zip"); - uf = unzOpen(filename_try); - } + if (uf==NULL) + { + strcat(filename_try, ".zip"); + uf = unzOpen(filename_try); + } } - /* If zipfile could not be opened still, return */ - if (uf==0) + /* If zipfile could not be opened still, return */ + if (uf==NULL) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening" " %s or %s.zip using unzOpen \n"), zip_name, zip_name)); @@ -90,19 +91,19 @@ int ZIP_Wrapper::file_list_info (char* zip_name, unz_file_info file_info; /* get information about the current file in zip file */ err = unzGetCurrentFileInfo(uf, &file_info, filename_inzip, - sizeof(filename_inzip), 0, 0, 0, 0); + sizeof(filename_inzip), NULL, 0, NULL, 0); if (err!=UNZ_OK) - { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" - " while trying to get information" - " about current file\n"), err)); - break; - } - ZIP_File_Info* next = 0; - ACE_NEW_RETURN (next, ZIP_File_Info (filename_inzip, + { + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" + " while trying to get information" + " about current file\n"), err)); + break; + } + ZIP_File_Info* next; + ACE_NEW_RETURN (next, ZIP_File_Info (filename_inzip, sizeof(filename_inzip)), -1); /* add information about current file to the list */ - list.insert_tail (next); + list.insert_tail (next); if ((i+1)<gi.number_entry) { err = unzGoToNextFile(uf); @@ -124,66 +125,66 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename, ACE_Message_Block &file) { bool return_code = true; - unzFile uf=0; + unzFile uf=NULL; uf = unzOpen(archive_path); /* locate the desired file in the zip file and set it as current file*/ int j=unzLocateFile(uf, filename, 0); - if (j==UNZ_END_OF_LIST_OF_FILE) + if (j==UNZ_END_OF_LIST_OF_FILE) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("File not found in zip archive"))); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("File not found in zip archive"))); return false; } else if (j==UNZ_OK) { int k=unzOpenCurrentFile(uf); if (k!=UNZ_OK) - { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current" - " file using unzOpenCurrentFile"))); - return false; - } + { + ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current" + " file using unzOpenCurrentFile"))); + return false; + } else - { - int num_read = 0; - ACE_Message_Block* head = &file; + { + int num_read = 0; + ACE_Message_Block* head = &file; - //read the file into the ACE_Message_Block - do - { - if (head->space () == 0) - { - ACE_Message_Block* next = 0; - ACE_NEW_RETURN (next, ACE_Message_Block (BUFSIZ), false); - head->cont (); - head = head->cont (); - } - num_read = unzReadCurrentFile(archive_path, head->wr_ptr(), - head->space()); - if (num_read > 0) - head->wr_ptr (num_read); - } while (num_read > 0); - if (num_read < 0) - return_code = false; - unzCloseCurrentFile(uf); - unzClose(uf); - return return_code; - } + //read the file into the ACE_Message_Block + do + { + if (head->space () == 0) + { + ACE_Message_Block* next; + ACE_NEW_RETURN (next, ACE_Message_Block (BUFSIZ), false); + head->cont (); + head = head->cont (); + } + num_read = unzReadCurrentFile(archive_path, head->wr_ptr(), + head->space()); + if (num_read > 0) + head->wr_ptr (num_read); + } while (num_read > 0); + if (num_read < 0) + return_code = false; + unzCloseCurrentFile(uf); + unzClose(uf); + return return_code; + } } return return_code; } /// uncompress the zip file -/// The zip file will be uncompressed into a directory +/// The zip file will be uncompressed into a directory /// with the name of zip archive. /// the path is assumed to be an existing directory bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) { //open the zip archive - unzFile uf=0; + unzFile uf=NULL; uf = unzOpen(zip_archive); - if (uf==0) + if (uf==NULL) { ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the" " zipfile\n"))); @@ -195,7 +196,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) //get only the name of the archive; remove path info char* n = ACE_OS::strstr (zip_archive, "/"); char* zip_name = 0; - while (n != 0) + while (n != NULL) { zip_name = ++n; n = ACE_OS::strstr (n, "/"); @@ -204,7 +205,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) //NOTE: Assumes .zip or cpk extension arch_dir = arch_dir.substring (0, arch_dir.length () - 4); //create directory with the name of zip archive - ACE_OS::mkdir(arch_dir.c_str()); + ACE_OS::mkdir(arch_dir.c_str()); //if dir exists -1 is returned and ignored unz_global_info gi; int err = unzGetGlobalInfo(uf, &gi); @@ -216,7 +217,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) } err =unzGoToFirstFile(uf); if (err!=UNZ_OK) - { + { ACE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in" " unzGoToFirstFile \n"), err)); return false; @@ -225,43 +226,43 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) a non existing directory whereas if it is a file, write the file at the proper path in the directory structure */ for (uLong i=0;i<gi.number_entry;i++) - { + { char filename_inzip[256]; unz_file_info file_info; err = unzGetCurrentFileInfo(uf, &file_info, filename_inzip, - sizeof(filename_inzip), 0, 0, 0, 0); + sizeof(filename_inzip), NULL, 0, NULL, 0); if (err!=UNZ_OK) - { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" - " while trying to get information" - " about currentfile\n"), err)); - break; - } - int direc = checkdir(filename_inzip); + { + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" + " while trying to get information" + " about currentfile\n"), err)); + break; + } + int direc=checkdir(filename_inzip); /* If it is a directory, we create directory structure */ if (direc==1) - { - makethedir(filename_inzip, arch_dir); - } - /* If it is a file, we read its data and write the uncompressed + { + makethedir(filename_inzip, arch_dir); + } + /* If it is a file, we read its data and write the uncompressed data to the file with proper path.*/ else if (direc==0) - { - handlethefile(filename_inzip, uf, file_info, verbose, arch_dir); - } + { + handlethefile(filename_inzip, uf, file_info, verbose, arch_dir); + } if ((i+1)<gi.number_entry) - { - err = unzGoToNextFile(uf); - if (err!=UNZ_OK) - { - ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed" - " while trying to go to" - " nextfile\n"), err)); - break; - } - } + { + err = unzGoToNextFile(uf); + if (err!=UNZ_OK) + { + ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzGoToNextFile failed" + " while trying to go to" + " nextfile\n"), err)); + break; + } + } } - unzClose(uf); + unzClose(uf); return true; } @@ -270,21 +271,21 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) ///try to find if it is a directory OR file int ZIP_Wrapper::checkdir (char* filename_inzip) { - int direc = 0; + int direc=0; char* dircheck = ACE_OS::strstr (filename_inzip, "/"); - /* We assume that a directory will have its entry terminating in a / + /* We assume that a directory will have its entry terminating in a / We also assume that the directory entries in the zip file use forward slash for both unix and windows */ - while (dircheck != 0) - { - int i = ACE_OS::strcmp(dircheck, "/"); - if (i == 0) - { - direc = 1; - break; - } - ++dircheck; - dircheck = ACE_OS::strstr (dircheck, "/"); + while (dircheck != NULL) + { + int i=ACE_OS::strcmp(dircheck, "/"); + if (i==0) + { + direc=1; + break; + } + dircheck++; + dircheck = ACE_OS::strstr (dircheck, "/"); } return direc; } @@ -295,18 +296,18 @@ int ZIP_Wrapper::makethedir (char* filename_inzip, ACE_CString arch_dir) //let's try to create the directory structure for the package char dir_name [2048]; char* next = ACE_OS::strstr (filename_inzip, "/"); - while (next != 0) + while (next != NULL) { ACE_CString location (arch_dir); ACE_OS::strncpy (dir_name, filename_inzip, next - filename_inzip + 1); - + dir_name[next - filename_inzip + 1] = '\0'; location += "/"; location += dir_name; ACE_stat stat; if (ACE_OS::stat (location.c_str (), &stat) == -1) - ACE_OS::mkdir (location.c_str ()); + ACE_OS::mkdir (location.c_str ()); next++; next = ACE_OS::strstr (next, "/"); } @@ -319,57 +320,56 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf, unz_file_info file_info, bool verbose, ACE_CString arch_dir) { - int k = unzOpenCurrentFile(uf); + int k =unzOpenCurrentFile(uf); if (k!=UNZ_OK) { - ACE_ERROR((LM_ERROR,ACE_TEXT("unzOpenCurrentFile failed in" + ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpenCurrentFile failed in" " opening the current file"))); return false; } else - { - size_t const file_size = file_info.uncompressed_size; + { + size_t file_size = file_info.uncompressed_size; char* temp = 0; ACE_NEW_RETURN (temp, char [file_size], false); - ACE_Auto_Basic_Array_Ptr<char> buffer (temp); + ACE_Auto_Basic_Array_Ptr<char> buffer (temp); //read in the data unzReadCurrentFile(uf, &(*buffer), file_size); //close the zip handle - unzCloseCurrentFile(uf); + unzCloseCurrentFile(uf); //create file name + path to open - std::string file_path (arch_dir.c_str ()); + std::string file_path (arch_dir.c_str ()); //NOTE: need the c-style char to stop at '\0' file_path += "/"; file_path += filename_inzip; //print out the file to be uncompressed if (verbose) - { - ACE_OS::write(ACE_STDOUT, file_path.c_str (), - file_path.length () ); - ACE_OS::write(ACE_STDOUT, "\n", 1); - } + { + ACE_OS::write(ACE_STDOUT, file_path.c_str (), + file_path.length () ); + ACE_OS::write(ACE_STDOUT, "\n", 1); + } // Open a file handle to the local filesystem ACE_HANDLE handle = ACE_OS::open (file_path.c_str (), O_CREAT | O_TRUNC | O_WRONLY); if (handle == ACE_INVALID_HANDLE) - { - unzClose(uf); - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), + { + unzClose(uf); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("[uncompress] file creation error")), 0); - } - //write the uncompressed data to the file + } + //write the uncompressed data to the file if (ACE_OS::write (handle, &(*buffer), file_size) == -1) - { - unzClose(uf); - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("[uncompress] file write error")), - 0); - } + { + unzClose(uf); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("[uncompress] file write error")), + 0); + } // Close the file handle - ACE_OS::close (handle); + ACE_OS::close (handle); } return 0; } diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h index 918a60f6352..d95f1b7f575 100644 --- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h +++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h @@ -12,8 +12,8 @@ * class that allows a program to become ZIP-aware * * @author Stoyan Paunov, Vipul Singh - * - * + * + * */ //======================================================================= @@ -28,6 +28,7 @@ #include "ace/OS_NS_fcntl.h" //for open #include "ace/OS_NS_sys_stat.h" //for filesize and mkdir +#include <string> #include "unzip.h" @@ -58,30 +59,30 @@ public: class ZIP_Wrapper { public: - + /// Get file and store it into an ACE_Message_Block. The function - /// averts subdirectory traversal problems. + /// averts subdirectory traversal problems. /// NOTE: Be sure to release the message block even if the function returns - /// false becuase the return value might be due to unsuccessful allocation - + /// false becuase the return value might be due to unsuccessful allocation + ///archive_path is the zip archive with the path ///filename is the name of the file to be looked for in the zip archive. ///the file is stored in ACE message block. - static bool get_file (char* archive_path, char* filename, - ACE_Message_Block &file); + static bool get_file (char* archive_path, char* filename, + ACE_Message_Block &file); /// uncompress the zip file - /// The zip file will be uncompressed into a directory with the + /// The zip file will be uncompressed into a directory with the ///name of zip archive. /// The path is assumed to be an existing directory - + ///zip_archive is the arcive to be uncompressed with full path. ///path is used for creating a directory with the name of zip archive. static bool uncompress (char* zip_archive, char* path = "", bool verbose = true); /// Get a list of the files in the archive - + ///zip_name is the name of zipfile with fullpath. ///list stores information about each entry in zip file. static int file_list_info (char* zip_name, @@ -90,25 +91,25 @@ public: ///Check if an entry of a zip file is a file or directory ///We assume a directoryname terminates with a forward slash ///Returns 1 for directory while 0 for file. - + ///filename_inzip is an entry in a zipfile - static int checkdir (char* filename_inzip); + static int checkdir (char* filename_inzip); ///Create directory structure if entry in zipfile is a directory - + ///filename_inzip is an entry in a zipfile ///arch_dir stores the name of the directory to be created static int makethedir (char* filename_inzip, ACE_CString arch_dir); ///If entry in zipfile is a file, then read the file and write /// the uncompressed data at the proper filepath. - + ///filename_inzip is an entry in a zipfile ///uf refers to the zip archive ///file_info is used to get information about current file ///verbose decides if the details are to be printed or not - ///arch_dir is the name of file with full path where it is to be - ///uncompressed + ///arch_dir is the name of file with full path where it is to be + ///uncompressed static int handlethefile (char* filename_inzip, unzFile uf, unz_file_info file_info, bool verbose, ACE_CString arch_dir); diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp index b2499812711..a74f5ee377e 100644 --- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp +++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp @@ -16,7 +16,7 @@ */ //============================================================================= -#include "DAnCE/NodeApplicationManager/ImplementationInfo.h" +#include "NodeApplicationManager/ImplementationInfo.h" #include "ace/OS_NS_stdio.h" #include "ace/streams.h" #include "ace/Get_Opt.h" @@ -24,6 +24,8 @@ #include "tao/CDR.h" #include "Config_Handlers/XML_File_Intf.h" +using namespace CIAO; + static void usage (const ACE_TCHAR* program) { @@ -75,11 +77,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ::Deployment::ComponentPlans dummy; dummy.length (0); - CIAO::NodeImplementationInfoHandler handler (plan, dummy); + NodeImplementationInfoHandler handler (plan, dummy); - Deployment::NodeImplementationInfo_var node_impl_info (handler.node_impl_info ()); + Deployment::NodeImplementationInfo * node_impl_info = + handler.node_impl_info (); - if (node_impl_info.ptr() == 0) + if (!node_impl_info) { ACE_ERROR_RETURN ((LM_ERROR, "DAnCE (%P|%t) StaticParser -" @@ -87,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - Deployment::ContainerImplementationInfos& impl_infos = node_impl_info->impl_infos; + Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos; FILE* fp = ACE_OS::fopen ("plan.h", "w"); diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc index 1234b0a03bb..6ff77c3e1fa 100644 --- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc +++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc @@ -1,8 +1,11 @@ // -*- MPC -*- // $Id$ -project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, ciao_server_dnc, ciao_nodeapplicationmanager { +project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc { exename = StaticDAnCEParser + includes += .. + libs += NodeApplicationManager + after += NodeApplicationManager NodeManager Source_Files { StaticDAnCEParser.cpp diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp index 12deaa5ac80..130eba88be1 100644 --- a/CIAO/DAnCE/TargetManager/CmpClient.cpp +++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp @@ -1,4 +1,4 @@ -// $Id$ +// CmpClient.cpp,v 1.3 2006/01/25 00:10:27 dengg Exp /** * @file CmpClient.cpp * @@ -9,8 +9,8 @@ * TM to getAllResources and getAvailable resources */ -#include "ciao/Deployment_DataC.h" -#include "DAnCE/TargetManager/TargetManagerImplC.h" +#include "Deployment_DataC.h" +#include "TargetManagerC.h" #include "ace/streams.h" #include "Config_Handlers/DnC_Dump.h" @@ -105,7 +105,7 @@ int main (int argc, char* argv[]) plan.instance[1] = instance_; - bool resource_available = true; + bool resource_available = 1; try { @@ -141,11 +141,11 @@ int main (int argc, char* argv[]) // Make a call to release resources , if resource < 0 try { - if (!resource_available) - { - targetI->releaseResources(plan); - ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n")); - } + if (resource_available == 0) + { + targetI->releaseResources(plan); + ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n")); + } } catch(CORBA::NO_IMPLEMENT &) { @@ -171,7 +171,7 @@ int main (int argc, char* argv[]) ::CORBA::StringSeq elements; elements.length (0); - bool Add = true; + bool Add = 1; Add = ACE_OS::atoi (argv[3]); if (Add) @@ -212,7 +212,7 @@ int main (int argc, char* argv[]) Deployment::Domain_var domainV = targetI->getAvailableResources(); // here write things to file ... - write_to_file (domainV.in()); + write_to_file (domainV); ACE_DEBUG ((LM_DEBUG , "\n\nGetAvailableResources Returned \n")); ::Deployment::DnC_Dump::dump (domainV); diff --git a/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp b/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp new file mode 100644 index 00000000000..6b5325e840c --- /dev/null +++ b/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp @@ -0,0 +1,152 @@ +// $Id$ + +#include "Deployment_Configuration.h" + +#include "ace/OS_NS_stdio.h" + +const int NAME_BUFSIZE = 1024; + +CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o) + : orb_ (CORBA::ORB::_duplicate (o)) +{ +} + +CIAO::Deployment_Configuration::~Deployment_Configuration (void) +{ + this->deployment_info_.unbind_all (); +} + +int +CIAO::Deployment_Configuration::init (const char *filename) +{ + // @@ We should change to use ACE_Configuration here. + + if (filename == 0) + { + ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp" + ": Unable to identify the file name \n")); + return -1; + } + + FILE *inf = ACE_OS::fopen (filename, "r"); + + if (inf == NULL) + { + ACE_ERROR_RETURN ((LM_ERROR, + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Fail to open node manager map data file: %s : \n", + filename), + -1); + } + + char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE]; + int first = 1; + + while (fscanf (inf, "%s %s", destination, ior ) != EOF) + { + // This should not fail!! + // + if (this->deployment_info_.bind (destination, ior) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Failed to bind destination [%s] : \n", + destination), + -1); + } + + if (first) + { + this->default_node_manager_.IOR_ = ior; + first = 0; + } + } + return 0; +} + +const char * +CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) +{ + if (name == 0) + return get_default_node_manager_ior (); + + ACE_Hash_Map_Entry + <ACE_CString, + CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0; + + if (this->deployment_info_.find (ACE_CString (name), + entry) != 0) + { + ACE_ERROR ((LM_ERROR, + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Failed to find IOR for destination [%s] : \n", + name)); + return 0; + } + + return entry->int_id_.IOR_.c_str (); +} + +const char * +CIAO::Deployment_Configuration::get_default_node_manager_ior (void) +{ + if (this->default_node_manager_.IOR_.length () == 0) + return 0; + return this->default_node_manager_.IOR_.c_str (); +} + +::Deployment::NodeManager_ptr +CIAO::Deployment_Configuration::get_node_manager (const char *name + ACE_ENV_ARG_DECL) +{ + if (name == 0) + return get_default_node_manager (ACE_ENV_SINGLE_ARG_PARAMETER); + + ACE_Hash_Map_Entry + <ACE_CString, + CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0; + + if (this->deployment_info_.find (ACE_CString (name), + entry) != 0) + { + ACE_ERROR ((LM_ERROR, + "DAnCE (%P|%t) Deployment_Configuration.cpp:" + "Failed to find IOR for destination [%s] : \n", + name)); + return 0; + } + + if (CORBA::is_nil (entry->int_id_.node_manager_.in ())) + { + CORBA::Object_var temp = this->orb_->string_to_object + (entry->int_id_.IOR_.c_str () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + entry->int_id_.node_manager_ = + ::Deployment::NodeManager::_narrow (temp.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + } + return ::Deployment::NodeManager::_duplicate + (entry->int_id_.node_manager_.in ()); +} + +::Deployment::NodeManager_ptr +CIAO::Deployment_Configuration::get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL) +{ + if (CORBA::is_nil (this->default_node_manager_.node_manager_.in ())) + { + CORBA::Object_var temp = this->orb_->string_to_object + (this->default_node_manager_.IOR_.c_str () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + this->default_node_manager_.node_manager_ = + ::Deployment::NodeManager::_narrow (temp.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + } + return ::Deployment::NodeManager::_duplicate + (this->default_node_manager_.node_manager_.in ()); +} diff --git a/CIAO/DAnCE/TargetManager/Deployment_Configuration.h b/CIAO/DAnCE/TargetManager/Deployment_Configuration.h new file mode 100644 index 00000000000..effca979a4c --- /dev/null +++ b/CIAO/DAnCE/TargetManager/Deployment_Configuration.h @@ -0,0 +1,129 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Deployment_Configuration.h + * + * $Id$ + * + * The Deployment_Configuration provides abstraction for the + * deployment mechanisms. + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + * @author Gan Deng <gan.deng@vanderbilt.edu> + */ +//============================================================================= +#ifndef CIAO_DEPLOYMENT_CONFIGURATION_H +#define CIAO_DEPLOYMENT_CONFIGURATION_H +#include /**/ "ace/pre.h" + +#include "ace/Hash_Map_Manager_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ciao/NodeManagerC.h" +#include "tao/Valuetype/ValueBase.h" +#include "tao/Valuetype/Valuetype_Adapter_Impl.h" +#include "ace/SString.h" + +#include "DomainApplicationManager/DomainApplicationManager_Export.h" + +namespace CIAO +{ + /** + * @class Deployment_Configuration + * + * @brief A class that provides strategies on deployment topology. + * + * This class provides strategies on how the DomainApplicationManager + * should deploy an deployment plan at domain-level. This is achieved + * by providing mappings from deployment destination names to actually + * NodeManager daemon IORs, and the strategy for which default NodeManager + * daemons a deployment mechanism should use. + * + * This is a trivial implementation of the deployment configuration + * strategy. We can enhance this class later on to provide + * different deployment location strategies, such as naming service. + */ + class DomainApplicationManager_Export Deployment_Configuration + { + public: + typedef struct _node_manager_info + { + _node_manager_info (const char *ior = 0) + { + IOR_ = ior; + } + + ACE_CString IOR_; + ::Deployment::NodeManager_var node_manager_; + } Node_Manager_Info; + + Deployment_Configuration (CORBA::ORB_ptr o); + + /// Destructor + virtual ~Deployment_Configuration (void); + + /** + * Init method takes the filename to a configuration file which + * has a simple line format of name, ior string delimited by a + * space in each line. + * + * name IOR-string + * + * @retval 0 on success. + * @retval -1 otherwise. + */ + int init (const char *filename); + + /** + * @retval 0 if no valid name were found. When @c name = 0, then + * this function behave exactly as get_default_activator_ior. + */ + virtual const char *get_node_manager_ior (const char *name); + + /** + * Return the default NodeManager the DomainApplicationManager + * should use to deploy a component. In this implementation, the + * first entry in the deployment configuration data file is always + * the entry for default activator. + * + * @retval 0 if no valid daemon is configured. + */ + virtual const char *get_default_node_manager_ior (); + + /** + * @retval nil if no valid name were found. + */ + virtual ::Deployment::NodeManager_ptr + get_node_manager (const char *name + ACE_ENV_ARG_DECL_WITH_DEFAULTS); + + /** + * Return the reference to the default NodeManager the + * DomainApplicationManager should use to deploy a node-level + * deployment plan.. + * + * @retval nil if no valid daemon is configured. + */ + virtual ::Deployment::NodeManager_ptr + get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + + protected: + CORBA::ORB_var orb_; + + ACE_Hash_Map_Manager_Ex<ACE_CString, + Node_Manager_Info, + ACE_Hash<ACE_CString>, + ACE_Equal_To<ACE_CString>, + ACE_Null_Mutex> deployment_info_; + + Node_Manager_Info default_node_manager_; + }; + +} + +#include /**/ "ace/post.h" +#endif /* CIAO_DEPLOYMENT_CONFIGURATION_H */ diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp index 4d3f01dde1f..708996663d7 100644 --- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp +++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp @@ -33,15 +33,13 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb, } -CIAO::DomainDataManager* -CIAO::DomainDataManager::get_data_manager () +CIAO::DomainDataManager* CIAO::DomainDataManager::get_data_manager () { return global_data_manager_; } -void -CIAO::DomainDataManager::delete_data_manger () +void CIAO::DomainDataManager::delete_data_manger () { if (global_data_manager_) delete global_data_manager_; @@ -167,17 +165,18 @@ int CIAO::DomainDataManager::call_all_node_managers () return 0; } - CORBA::ULong const length = initial_domain_.node.length (); + int length = initial_domain_.node.length (); if (CIAO::debug_level () > 9) { ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length)); } - for (CORBA::ULong i=0;i < length;i++) + for (int i=0;i < length;i++) { ::Deployment::NodeManager_var node_manager; + try { node_manager = @@ -303,7 +302,7 @@ CORBA::Long CIAO::DomainDataManager::get_pid (ACE_CString cmp) for (unsigned int j = 0;j < current_domain_.node[i].resource.length ();j++) { // The resource - if (!ACE_OS::strcmp( + if (!strcmp( current_domain_.node[i].resource[j].name, "Component") && ACE_CString (current_domain_.node[i].resource[j].property[0].name) == @@ -382,14 +381,12 @@ releaseResources ( { for (unsigned int j = 0;j < provisioned_data_.node.length ();j++) { - if (!ACE_OS::strcmp (plan.instance[i].node.in () , - provisioned_data_.node[j].name.in ())) + if (!strcmp (plan.instance[i].node.in () , + provisioned_data_.node[j].name.in ())) { if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG , - "TM::commitResource::Host name matched\n")); - } + ACE_DEBUG ((LM_DEBUG , + "TM::commitResource::Host name matched\n")); match_requirement_resource ( plan.instance[i].deployedResource, @@ -410,11 +407,11 @@ match_requirement_resource ( { // here match the deployed to the available - for (CORBA::ULong i = 0;i < deployed.length ();i++) + for (unsigned int i = 0;i < deployed.length ();i++) { // for each deployed resource ....search the corresponding // available resource - for (CORBA::ULong j = 0;j < available.length ();j++) + for (unsigned int j = 0;j < available.length ();j++) { if (!strcmp (deployed[i].requirementName, available[j].name)) { @@ -422,7 +419,7 @@ match_requirement_resource ( ACE_DEBUG ((LM_DEBUG , "TM::commitResource::Requirement name matched\n")); // search for the resourcename in the resourceType - for (CORBA::ULong k = 0;k < available[j].resourceType.length ();k++) + for (unsigned int k = 0;k < available[j].resourceType.length ();k++) { if (!strcmp (deployed[i].resourceName, available[j].resourceType[k])) @@ -457,10 +454,10 @@ match_properties ( ::Deployment::Properties deployed, ::Deployment::SatisfierProperties & available) { - for (CORBA::ULong i = 0;i < deployed.length ();i++) + for (unsigned int i = 0;i < deployed.length ();i++) { - for (CORBA::ULong j = 0;j < available.length ();j++) - if (!ACE_OS::strcmp (deployed[i].name , available[j].name)) + for (unsigned int j = 0;j < available.length ();j++) + if (!strcmp (deployed[i].name , available[j].name)) { // check kind here ....and then subtract .... // accordingly , ..this is complex ... better to write @@ -519,7 +516,6 @@ void CIAO::DomainDataManager::commit_release_resource ( else { //must be release - // @todo check return value of >>= CORBA::Long required_d; deployed.value >>= required_d; CORBA::Long available_d; @@ -527,6 +523,7 @@ void CIAO::DomainDataManager::commit_release_resource ( available_d = available_d + required_d; + // Should we check for bin > 100 ?????? if (CIAO::debug_level () > 9) @@ -540,16 +537,18 @@ void CIAO::DomainDataManager::commit_release_resource ( void CIAO::DomainDataManager::stop_monitors () { - CORBA::ULong length = initial_domain_.node.length (); + int length = initial_domain_.node.length (); if (CIAO::debug_level () > 9) { ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length)); } - for (CORBA::ULong i=0;i < length;i++) + for (int i=0;i < length;i++) { + ::Deployment::NodeManager_var node_manager; + try { node_manager = @@ -637,7 +636,7 @@ find_in_initial_domain (const char* node_name, i < this->initial_domain_.node.length (); i++) { - if (ACE_OS::strcmp (node_name, this->initial_domain_.node[i].name.in ()) == 0) + if (strcmp (node_name, this->initial_domain_.node[i].name.in ()) == 0) { node = this->initial_domain_.node[i]; return true; @@ -657,7 +656,7 @@ find_in_provisioned_domain (const char* node_name, i < this->provisioned_data_.node.length (); i++) { - if (ACE_OS::strcmp (node_name, this->provisioned_data_.node[i].name.in ()) == 0) + if (strcmp (node_name, this->provisioned_data_.node[i].name.in ()) == 0) { node = this->provisioned_data_.node[i]; return true; @@ -684,20 +683,21 @@ int CIAO::DomainDataManager::delete_from_domain ( // if not found add it to the updated nodes list ::Deployment::Nodes updated_nodes; - bool found = false; + bool found = 0; + for (CORBA::ULong j = 0; j < this->provisioned_data_.node.length (); j++) { - found = false; + found = 0; for (CORBA::ULong i = 0;i < domain.node.length ();i++) { if (strcmp (domain.node[i].name.in (), this->provisioned_data_.node[j].name.in ()) == 0) { - found = true; + found = 1; break; // found the node } } @@ -726,7 +726,7 @@ int CIAO::DomainDataManager::intimate_planner ( { // use the connection with the planner and get a reference to the planner // make a call top the planner - Deployment::Domain d = domain; + Deployment::Domain d = domain; return 0; } diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h index d75e314606d..43f0870c1e5 100644 --- a/CIAO/DAnCE/TargetManager/DomainDataManager.h +++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h @@ -5,7 +5,7 @@ * * @brief Maintains the Domain Information * - * It contains the entire Domain information. Both the + * It contains the entire Domain information.Both the * initial domain as well as the current available domain. * * @author Nilabja Roy nilabjar@dre.vanderbilt.edu @@ -14,8 +14,8 @@ #ifndef DOMAIN_DATA_MGRH #define DOMAIN_DATA_MGRH -#include "TargetManagerImplC.h" -#include "DAnCE/DomainApplicationManager/Deployment_Configuration.h" +#include "TargetManagerC.h" +#include "Deployment_Configuration.h" /** * @namespace CIAO @@ -38,6 +38,7 @@ namespace CIAO public : /** + * @operation updateDomain * @brief This function is called by the other classes to update * current domain data. * @param elements The string sequence of elements @@ -51,6 +52,7 @@ namespace CIAO ::Deployment::DomainUpdateKind updateKind ); /** + * @operation getInitialDomain * @brief This function is called the Executor code * to get the Original Domain data. * @return Domain* The Initial Domain @@ -59,6 +61,7 @@ namespace CIAO ::Deployment::Domain* get_initial_domain (); /** + * @operation getCurrentDomain * @brief This function is called the Executor code * to get the Current Domain data. * @return Domain* The Current Domain @@ -67,18 +70,20 @@ namespace CIAO /** - * This function calls the constructor of the - * class Domain Data Manager - * @brief This function is called to create the Datamanager + * @operation create + * @brief This function is called to create the Datamanager * @param orb The orb pointer * @param target The Target Manager Object Reference * + * @description This function calls the constructor of the + * class Domain Data Manager */ static DomainDataManager * create (CORBA::ORB_ptr orb, ::Deployment::TargetManager_ptr target ); /** + * @operation get_data_manager * @brief Returns the static pointer to the * data manager. * @return DomainDataManager* @@ -88,18 +93,23 @@ namespace CIAO static DomainDataManager* get_data_manager (); /** + * @operation delete_data_manager * @brief deletes the data manager */ + static void delete_data_manger (); /** + * @operation get_node_managers * @brief returns the sequence of node managers * object reference */ + CIAO::Host_NodeManager_seq * get_node_managers (); /** + * @operation get_cpu_info * @brief returns the node specific cpu utilization * * @return CIAO::Host_Infos* @@ -108,6 +118,7 @@ namespace CIAO CIAO::Host_Infos* get_cpu_info (); /** + * @operation get_pid * @brief returns the pid of the component id submitted * @param cmp The component id * @@ -116,6 +127,7 @@ namespace CIAO CORBA::Long get_pid (ACE_CString cmp); /** + * @operation commitResources * @brief commits the resources that are specified * in the plan. * @param plan ::Deployment::DeploymentPlan @@ -130,39 +142,49 @@ namespace CIAO const ::Deployment::DeploymentPlan & plan); /** + * @operation releaseResources * @brief The function releases the resources held by a plan - * @param plan ::Deployment::DeploymentPlan the plan whose + * + * @param argname ::Deployment::DeploymentPlan the plan whose * resources are to be released */ void releaseResources ( const ::Deployment::DeploymentPlan& plan); /** - * The node manager in turn stops the monitor + * @operation stop_monitors * @brief The function makes a call on the leaveDomain on the * NodeManager + * + * @description The node manager in turn stops the monitor + * */ + void stop_monitors (); protected: + /** - * The constructor made protected so that no one can create - * it. + * @operation Constructor * @param orb The orb pointer * @param target The Target Manager Object Reference + * @description The constructor made proteccted so that no one can create + * it. */ DomainDataManager (CORBA::ORB_ptr orb, ::Deployment::TargetManager_ptr target ); /** + * @operation readinDomainData * @brief It will read the initial Domain data from * XML files. */ int readin_domain_data (); /** + * @operation match_requirement_resource * @brief Match the deployed resources to the * available resource */ @@ -172,20 +194,23 @@ namespace CIAO ); /** + * @operation match_properties * @brief Match the properties of a Requirement to the * properties of available resource * @param deployed The deployed Properties * @param available The available Properties */ + void match_properties ( ::Deployment::Properties deployed, ::Deployment::SatisfierProperties& available); - /// The different actiona that can take place - enum Action {commit , release}; + /// The different actiona that can take place + enum Action {commit , release}; /** + * @operation commit_release_resource * @brief Either commits or releases the given resource * based on the current Action set. * @param deployed ::Deployment::Property is the resource @@ -196,16 +221,19 @@ namespace CIAO * when the deployed resources exceeds * the available resource. */ - void commit_release_resource ( ::Deployment::Property & deployed, + + void commit_release_resource ( ::Deployment::Property & deployed, ::Deployment::SatisfierProperty & available); /** + * @operation call_all_node_managers * @brief This function calls all NM and gives them * the sub-domain */ int call_all_node_managers (); /** + * @operation add_to_domain * @brief This function add new elements to the * already existing domain * @@ -215,6 +243,7 @@ namespace CIAO int add_to_domain (const ::Deployment::Domain& domain); /** + * @operation delete_from_domain * @brief This function deletes elements from the domain * * @param domain ::Deployment::Domain contains the new elements @@ -223,6 +252,7 @@ namespace CIAO int delete_from_domain (const ::Deployment::Domain& domain); /** + * @operation intimate_planner * @brief This function intimates the planner about a domain * change * @@ -232,6 +262,7 @@ namespace CIAO int intimate_planner (const ::Deployment::Domain& domain); /** + * @operation find_in_initial_domain * @brief This function finds a new node in the initial_domain * * @param node The name of the node which is to be searched @@ -240,16 +271,20 @@ namespace CIAO bool find_in_initial_domain (const char* node_name, ::Deployment::Node& node); /** + * @operation find_in_provisioned_domain * @brief This function finds a new node in the proviosiond_domain * * @param node The name of the node which is to be searched */ + bool find_in_provisioned_domain (const char* node_name, ::Deployment::Node& node); /** + * @operation update_node_status * @brief updates the node status by reading it from a file */ + bool update_node_status (); /// The ORB pointer @@ -281,7 +316,7 @@ namespace CIAO */ ::Deployment::Domain provisioned_data_; - /// The current action + ///The current action Action current_action_; }; diff --git a/CIAO/DAnCE/TargetManager/DomainEvents.idl b/CIAO/DAnCE/TargetManager/DomainEvents.idl index 4fe089a86a6..88fba054dbb 100644 --- a/CIAO/DAnCE/TargetManager/DomainEvents.idl +++ b/CIAO/DAnCE/TargetManager/DomainEvents.idl @@ -3,15 +3,12 @@ * @brief Contains Events in the Domain * * @author Nilabja R <nilabjar@dre.vanderbilt.edu> - * - * $Id$ */ #ifndef DOMAIN_CHANGE_IDL #define DOMAIN_CHANGE_IDL -#include "ciao/Deployment_TargetManager.idl" -#include "ciao/CCM_Events.idl" +#include "ciao/Target_Data.idl" module CIAO { diff --git a/CIAO/DAnCE/TargetManager/TM_Client.mpc b/CIAO/DAnCE/TargetManager/TM_Client.mpc index 0a203ab1476..e332b49bb27 100644 --- a/CIAO/DAnCE/TargetManager/TM_Client.mpc +++ b/CIAO/DAnCE/TargetManager/TM_Client.mpc @@ -2,7 +2,14 @@ // Client.mpc,v 1.6 2005/02/18 09:07:06 jwillemsen Exp -project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers, ciao_events_dnc, ciao_targetmanager_stub { + +project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers, ciao_events_dnc { + after += CIAO_TargetManager_stub + includes += $(CIAO_ROOT)/DAnCE $(TAO_ROOT)/orbsvcs + includes += $(CIAO_ROOT)/DAnCE/TargetManager + libs += TargetManager_stub NodeManager_stub + + IDL_Files { } diff --git a/CIAO/DAnCE/TargetManager/TargetManager.cidl b/CIAO/DAnCE/TargetManager/TargetManager.cidl index 6e880c069e9..39fda73366e 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager.cidl +++ b/CIAO/DAnCE/TargetManager/TargetManager.cidl @@ -9,7 +9,8 @@ #ifndef TARGETMANAGER_CIDL #define TARGETMANAGER_CIDL -#include "TargetManagerImpl.idl" + +#include "TargetManager.idl" /* * @composition TargetManager_i diff --git a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/CIAO/DAnCE/TargetManager/TargetManager.idl index 705a3146a75..2f3ff9c9446 100644 --- a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl +++ b/CIAO/DAnCE/TargetManager/TargetManager.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @file TargetManagerImpl.idl + * @file TargetManager.idl * @brief TargetManager interface defintion * * @author Nilabja R <nilabjar@dre.vanderbilt.edu> @@ -10,11 +10,15 @@ #ifndef TARGETMGR_IDL #define TARGETMGR_IDL + + #include "ciao/Components.idl" -#include "ciao/Deployment_Target_Data.idl" +#include "ciao/Target_Data.idl" #include "TargetManagerExt.idl" + #include "DomainEvents.idl" + /** * @module CIAO * diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc index 11d1bd518b9..a6591816a5c 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -1,6 +1,7 @@ // $Id$ -project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_nodemanager_stub { +project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub { + after += NodeManager_stub sharedname = TargetManager_stub idlflags += -Wb,stub_export_macro=TARGETMANAGER_STUB_Export \ -Wb,stub_export_include=TargetManager_stub_export.h \ @@ -8,25 +9,28 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_no -Wb,skel_export_include=TargetManager_svnt_export.h dynamicflags = TARGETMANAGER_STUB_BUILD_DLL + libs += NodeManager_stub + IDL_Files { - TargetManagerImpl.idl + TargetManager.idl TargetManagerExt.idl DomainEvents.idl } Source_Files { - TargetManagerImplC.cpp + TargetManagerC.cpp TargetManagerExtC.cpp DomainEventsC.cpp } } -project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub { +project(CIAO_TargetManager_svnt) : ciao_servant_dnc { + after += CIAO_TargetManager_stub sharedname = TargetManager_svnt + libs += TargetManager_stub NodeManager_stub idlflags += -Wb,export_macro=TARGETMANAGER_SVNT_Export \ -Wb,export_include=TargetManager_svnt_export.h - dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL CIDL_Files { @@ -39,7 +43,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub { Source_Files { TargetManagerEC.cpp - TargetManagerImplS.cpp + TargetManagerS.cpp TargetManagerExtS.cpp TargetManager_svnt.cpp DomainEventsS.cpp @@ -47,9 +51,13 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub { } -project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc, ciao_targetmanager_svnt { +project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc { + after += CIAO_TargetManager_svnt sharedname = TargetManager_exec + libs += TargetManager_stub TargetManager_svnt NodeManager_stub + idlflags += -Wb,export_macro=TARGETMANAGER_EXEC_Export \ + -Wb,export_include=TargetManager_exec_export.h dynamicflags = TARGETMANAGER_EXEC_BUILD_DLL Source_Files { diff --git a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl index 025d8188e39..3336f3ffe5c 100644 --- a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl +++ b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl @@ -18,6 +18,7 @@ * @brief The CIAO module */ +//#include <ciao/Deployment.idl> #include "DAnCE/Interfaces/NodeManagerDaemon.idl" module CIAO diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp index f947e1944d7..2c22d608ecb 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp +++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp @@ -16,6 +16,8 @@ #include "DomainEventsC.h" +using namespace std; + namespace CIDL_TargetManager_i { //================================================================== @@ -28,7 +30,7 @@ namespace CIDL_TargetManager_i TargetManagerImpl_Context *context ) : _exec (exec), - orb_ (CORBA::ORB::_duplicate (orb)), + orb_ (orb), context_ (context) { // The DomainDataManager created here ... @@ -60,7 +62,7 @@ namespace CIDL_TargetManager_i ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - return CIAO::DomainDataManager:: + return CIAO::DomainDataManager:: get_data_manager ()->get_initial_domain (); } @@ -106,10 +108,9 @@ namespace CIDL_TargetManager_i { // Your code here. if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n")); - } - + { + ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n")); + } CIAO::DomainDataManager:: get_data_manager ()->update_domain ( elements, @@ -125,10 +126,7 @@ namespace CIDL_TargetManager_i if (updateKind == ::Deployment::Delete || updateKind == ::Deployment::Add) { - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n")); - } + ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n")); CIAO::Domain_Changed_Event_var changed_event = new OBV_CIAO::Domain_Changed_Event (); @@ -136,25 +134,13 @@ namespace CIDL_TargetManager_i ::Deployment::Domain_var temp_domain = new ::Deployment::Domain (domainSubset); - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n")); - } - + ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n")); changed_event->changes (temp_domain); changed_event->change_kind (updateKind); - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n")); - } - + ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n")); context_->push_changes (changed_event); - - if (CIAO::debug_level () > 9) - { - ACE_DEBUG ((LM_DEBUG , "TM::After Sending the event to the Planner_Manager\n")); - } + ACE_DEBUG ((LM_DEBUG , "TM::After Sending the event to the Planner_Manager\n")); } } @@ -204,9 +190,6 @@ namespace CIDL_TargetManager_i { // Your code here. ACE_DEBUG ((LM_DEBUG, "Get component cpu :: Skeleton Impl")); - - // todo - return 0; } @@ -249,15 +232,14 @@ namespace CIDL_TargetManager_i ACE_DEBUG ((LM_DEBUG , "Calling TM constructor")); } - if (CORBA::is_nil (this->exec_ext_object_.in ())) - { - this->exec_object_ = new TargetManager_exec_i(this, - context_->_ciao_the_Container()->the_ORB(), - context_ - ); - } - - return ::Deployment::CCM_TargetManager::_duplicate (this->exec_object_.in ()); + if (this->exec_object_.in () == 0) + { + this->exec_object_ = new TargetManager_exec_i(this, + context_->_ciao_the_Container()->the_ORB(), + context_ + ); + } + return this->exec_object_.in (); } ::CIAO::CCM_TargetManagerExt_ptr TargetManagerImpl_exec_i @@ -265,12 +247,11 @@ namespace CIDL_TargetManager_i ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (CORBA::is_nil (this->exec_ext_object_.in ())) - { - this->exec_ext_object_ = new TargetManagerExt_exec_i(); - } - - return ::CIAO::CCM_TargetManagerExt::_duplicate (this->exec_ext_object_.in ()); + if (this->exec_ext_object_.in () == 0) + { + this->exec_ext_object_ = new TargetManagerExt_exec_i(); + } + return this->exec_ext_object_.in (); } // Operations from Components::SessionComponent @@ -328,7 +309,7 @@ namespace CIDL_TargetManager_i { ACE_DEBUG ((LM_DEBUG , "Inside CCM_ACTIVATE\n")); } - this->get_targetMgr (); + get_targetMgr (); } void @@ -388,7 +369,7 @@ namespace CIDL_TargetManager_i ::Components::CCMException)) { ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); + ::Components::EnterpriseComponent::_nil (); ACE_NEW_THROW_EX ( retval, @@ -403,7 +384,7 @@ namespace CIDL_TargetManager_i create_CIAO_TargetManagerHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = - ::Components::HomeExecutorBase::_nil (); + ::Components::HomeExecutorBase::_nil (); ACE_NEW_RETURN ( retval, diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h index 7c23c047992..1b3b7b0e470 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h +++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h @@ -190,7 +190,7 @@ namespace CIDL_TargetManager_i TargetManagerImpl_exec_i * _exec; ///The pointer to the Domain Manager - auto_ptr<CIAO::DomainDataManager> dataManager_; + std::auto_ptr<CIAO::DomainDataManager> dataManager_; /// The CORBA ORB ... CORBA::ORB_var orb_; diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp index a6038303961..e8032ba7f57 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp @@ -3,7 +3,7 @@ // This test tries to install a set of components in 2 different containers, which // is hosted in the same NodeApplication. -#include "Deployment_NodeApplicationC.h" +#include "Deployment_CoreC.h" #include "Client_init.h" #include "NodeAppTest_RoundTripC.h" #include "ace/Get_Opt.h" @@ -239,7 +239,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Return values did not match: on Component: %d \n", i)); - ACE_OS::exit (1); + exit (1); } } diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp index 11a53732939..33f74f55976 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Deployment_NodeApplicationC.h" +#include "Deployment_CoreC.h" #include "Client_init.h" #include "NodeAppTest_RoundTripC.h" #include "ace/Get_Opt.h" @@ -127,7 +127,7 @@ main (int argc, char *argv[]) else { ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n")); - ACE_OS::exit (1); + exit (1); } // Install another set of components diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp index 31e8ee8eb6d..d984de8860b 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ciao/Deployment_NodeApplicationC.h" +#include "ciao/Deployment_CoreC.h" #include "ciao/Client_init.h" #include "NodeAppTest_RoundTripC.h" #include "ace/Get_Opt.h" @@ -159,7 +159,7 @@ main (int argc, char *argv[]) else { ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n")); - ACE_OS::exit (1); + exit (1); } } diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp index 7c6f2bd8792..8b6d23887fb 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Deployment_NodeApplicationC.h" +#include "Deployment_CoreC.h" #include "Client_init.h" #include "NodeAppTest_RoundTripC.h" #include "ace/Get_Opt.h" @@ -128,7 +128,7 @@ main (int argc, char *argv[]) else { ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n")); - ACE_OS::exit (1); + exit (1); } ACE_DEBUG ((LM_DEBUG, "Try removing test component and its home\n")); diff --git a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl index 59d86f5c9f1..d5521d0554f 100755 --- a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl +++ b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib "../../../../../../bin"; use PerlACE::Run_Test; $status = 0; diff --git a/CIAO/MPC/config/ciao_client_dnc.mpb b/CIAO/MPC/config/ciao_client_dnc.mpb deleted file mode 100644 index 8e12607cf37..00000000000 --- a/CIAO/MPC/config/ciao_client_dnc.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ifr_client, valuetype, pi, codecfactory { - after += CIAO_DnC_Client - includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao - idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao - libs += CIAO_DnC_Client -} diff --git a/CIAO/MPC/config/ciao_component_dnc.mpb b/CIAO/MPC/config/ciao_component_dnc.mpb deleted file mode 100644 index 9cabf46cf83..00000000000 --- a/CIAO/MPC/config/ciao_component_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver, ciao_server_dnc, ciao_events_dnc { - after += CIAO_DnC_Container - libs += CIAO_DnC_Container -} diff --git a/CIAO/MPC/config/ciao_config_handlers.mpb b/CIAO/MPC/config/ciao_config_handlers.mpb deleted file mode 100644 index 69412b873f1..00000000000 --- a/CIAO/MPC/config/ciao_config_handlers.mpb +++ /dev/null @@ -1,25 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_config_handlers_base, dynamicany, typecodefactory { - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - after += CIAO_XML_Utils \ - XSC_DynAny_Handler \ - XSC_Config_Handlers \ - XSC_XML_Handlers \ - RT_CCM_Config_Handlers \ - CIAO_Events_Handlers \ - Package_Config_Handlers \ - XSC_Config_Handlers_Common - - libs += CIAO_XML_Utils \ - XSC_Config_Handlers \ - RT_CCM_Config_Handlers \ - CIAO_Events_Handlers \ - Package_Config_Handlers \ - XSC_XML_Handlers \ - XSC_Config_Handlers_Common \ - XSC_DynAny_Handler -} diff --git a/CIAO/MPC/config/ciao_config_handlers_base.mpb b/CIAO/MPC/config/ciao_config_handlers_base.mpb deleted file mode 100644 index 4b5e001febb..00000000000 --- a/CIAO/MPC/config/ciao_config_handlers_base.mpb +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ - -project : ciao_xml_utils, dynamicany, typecodefactory, exceptions, ciao_events_dnc { - after += XSC_XML_Handlers - libs += XSC_XML_Handlers - macros += XML_USE_PTHREADS - includes += $(CIAO_ROOT)/tools/Config_Handlers - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - -} diff --git a/CIAO/MPC/config/ciao_container_dnc.mpb b/CIAO/MPC/config/ciao_container_dnc.mpb deleted file mode 100644 index 43365e736e3..00000000000 --- a/CIAO/MPC/config/ciao_container_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro { - after += CIAO_DnC_Container - libs += CIAO_DnC_Container -} diff --git a/CIAO/MPC/config/ciao_deployment_stub.mpb b/CIAO/MPC/config/ciao_deployment_stub.mpb deleted file mode 100644 index 45e0fb77341..00000000000 --- a/CIAO/MPC/config/ciao_deployment_stub.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_client_dnc, ciao_events_base_dnc { - after += Deployment_stub - libs += CIAO_Deployment_stub - includes += $(CIAO_ROOT)/DAnCE - idlflags += -I$(CIAO_ROOT)/DAnCE -} diff --git a/CIAO/MPC/config/ciao_deployment_svnt.mpb b/CIAO/MPC/config/ciao_deployment_svnt.mpb deleted file mode 100644 index 644feb7f2b6..00000000000 --- a/CIAO/MPC/config/ciao_deployment_svnt.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub, portableserver, ciao_events_dnc { - after += Deployment_svnt - libs += CIAO_Deployment_svnt - idlflags += -I$(CIAO_ROOT)/DAnCE -} diff --git a/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb b/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb deleted file mode 100644 index 31731a84d5d..00000000000 --- a/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_svnt { - includes += $(CIAO_ROOT)/DomainApplicationManager - libs += DomainApplicationManager - after += DomainApplicationManager -} diff --git a/CIAO/MPC/config/ciao_events_base_dnc.mpb b/CIAO/MPC/config/ciao_events_base_dnc.mpb deleted file mode 100644 index de2c8d5a7b9..00000000000 --- a/CIAO/MPC/config/ciao_events_base_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : orbsvcslib, ciao_container_dnc, ciao_client_dnc { - libs += CIAO_DnC_Events_Base - after += CIAO_DnC_Events_Base -} diff --git a/CIAO/MPC/config/ciao_events_dnc.mpb b/CIAO/MPC/config/ciao_events_dnc.mpb deleted file mode 100644 index 50ec7aad402..00000000000 --- a/CIAO/MPC/config/ciao_events_dnc.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc, naming { - includes += $(CIAO_ROOT)/ciaosvcs/Events - idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events - libs += CIAO_DnC_Events - after += CIAO_DnC_Events -} diff --git a/CIAO/MPC/config/ciao_executionmanager_stub.mpb b/CIAO/MPC/config/ciao_executionmanager_stub.mpb deleted file mode 100644 index bea046abd2d..00000000000 --- a/CIAO/MPC/config/ciao_executionmanager_stub.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - includes += $(CIAO_ROOT)/DAnCE/ExecutionManager - libs += ExecutionManager_stub - after += ExecutionManager_stub -} diff --git a/CIAO/MPC/config/ciao_nodeapplication.mpb b/CIAO/MPC/config/ciao_nodeapplication.mpb deleted file mode 100644 index 7c47eb723c6..00000000000 --- a/CIAO/MPC/config/ciao_nodeapplication.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub, ciao_noop_configurator { - libs += CIAO_NodeApplication - after += NodeApplicationLib -} diff --git a/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb b/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb deleted file mode 100644 index e7d313f0617..00000000000 --- a/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_targetmanager_stub, ciao_nodeapplication { - includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager - libs += NodeApplicationManager - after += NodeApplicationManager -} diff --git a/CIAO/MPC/config/ciao_nodemanager_stub.mpb b/CIAO/MPC/config/ciao_nodemanager_stub.mpb deleted file mode 100644 index f69e5881091..00000000000 --- a/CIAO/MPC/config/ciao_nodemanager_stub.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - includes += $(CIAO_ROOT)/DAnCE/Interfaces - includes += $(CIAO_ROOT)/DAnCE/NodeManager - libs += NodeManager_stub - after += NodeManager_stub -} diff --git a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb b/CIAO/MPC/config/ciao_nodemanager_svnt.mpb deleted file mode 100644 index b3740720386..00000000000 --- a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_nodemanager_stub { - libs += NodeManager CIAO_NoOp_Configurator - after += NodeManager_svnt -} diff --git a/CIAO/MPC/config/ciao_noop_configurator.mpb b/CIAO/MPC/config/ciao_noop_configurator.mpb deleted file mode 100644 index 67b3508ee38..00000000000 --- a/CIAO/MPC/config/ciao_noop_configurator.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - libs += CIAO_NoOp_Configurator - after += NoOp_Configurator -} diff --git a/CIAO/MPC/config/ciao_plan_generator.mpb b/CIAO/MPC/config/ciao_plan_generator.mpb deleted file mode 100644 index e234ead3e67..00000000000 --- a/CIAO/MPC/config/ciao_plan_generator.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_component_dnc { - includes += $(CIAO_ROOT)/DAnCE/Plan_Generator - libs += Plan_Generator - after += Plan_Generator -} diff --git a/CIAO/MPC/config/ciao_race_component.mpb b/CIAO/MPC/config/ciao_race_component.mpb deleted file mode 100644 index dc78b44764f..00000000000 --- a/CIAO/MPC/config/ciao_race_component.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -project : ciaocidldefaults { - after += RACE_common_stub - libs += RACE_common_stub CIAO_Deployment_stub - includes += $(CIAO_ROOT)/RACE - idlflags += -I$(CIAO_ROOT)/RACE -} diff --git a/CIAO/MPC/config/ciao_race_default.mpb b/CIAO/MPC/config/ciao_race_default.mpb deleted file mode 100644 index 93b11d6f426..00000000000 --- a/CIAO/MPC/config/ciao_race_default.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciaocidldefaults { - includes += $(CIAO_ROOT)/RACE - idlflags += -I$(CIAO_ROOT)/RACE -} diff --git a/CIAO/MPC/config/ciao_race_monitor.mpb b/CIAO/MPC/config/ciao_race_monitor.mpb deleted file mode 100644 index d59196c131d..00000000000 --- a/CIAO/MPC/config/ciao_race_monitor.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_race_default { - after += Local_Monitor - libs += Local_Monitor -} diff --git a/CIAO/MPC/config/ciao_rtevent_dnc.mpb b/CIAO/MPC/config/ciao_rtevent_dnc.mpb deleted file mode 100644 index 78fa520bb5d..00000000000 --- a/CIAO/MPC/config/ciao_rtevent_dnc.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : rtevent_serv, ciao_events_base_dnc, naming { - includes += $(CIAO_ROOT)/ciaosvcs/Events - idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events - libs += CIAO_RTEvent - after += CIAO_RTEvent -} diff --git a/CIAO/MPC/config/ciao_servant_dnc.mpb b/CIAO/MPC/config/ciao_servant_dnc.mpb deleted file mode 100644 index 6bc5c8d52a0..00000000000 --- a/CIAO/MPC/config/ciao_servant_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming { - after += CIAO_DnC_Server - libs += CIAO_DnC_Server -} diff --git a/CIAO/MPC/config/ciao_server_dnc.mpb b/CIAO/MPC/config/ciao_server_dnc.mpb deleted file mode 100644 index c35042c2c4a..00000000000 --- a/CIAO/MPC/config/ciao_server_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += CIAO_DnC_Server - libs += CIAO_DnC_Server -} diff --git a/CIAO/MPC/config/ciao_static_dnc_app.mpb b/CIAO/MPC/config/ciao_static_dnc_app.mpb deleted file mode 100644 index f6792f1f9eb..00000000000 --- a/CIAO/MPC/config/ciao_static_dnc_app.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_component_dnc, iortable, ciao_nodeapplicationmanager, ciao_nodemanager_svnt { -} diff --git a/CIAO/MPC/config/ciao_targetmanager_stub.mpb b/CIAO/MPC/config/ciao_targetmanager_stub.mpb deleted file mode 100644 index 59d2a646212..00000000000 --- a/CIAO/MPC/config/ciao_targetmanager_stub.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_nodemanager_stub { - includes += $(CIAO_ROOT)/DAnCE/TargetManager - libs += TargetManager_stub - after += CIAO_TargetManager_stub -} diff --git a/CIAO/MPC/config/ciao_targetmanager_svnt.mpb b/CIAO/MPC/config/ciao_targetmanager_svnt.mpb deleted file mode 100644 index 6b6ea42cd7e..00000000000 --- a/CIAO/MPC/config/ciao_targetmanager_svnt.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_targetmanager_stub { - libs += TargetManager_svnt - after += CIAO_TargetManager_svnt -} diff --git a/CIAO/MPC/config/ciao_xml_utils.mpb b/CIAO/MPC/config/ciao_xml_utils.mpb deleted file mode 100644 index 1167281994f..00000000000 --- a/CIAO/MPC/config/ciao_xml_utils.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : xerces, exceptions { - includes += $(CIAO_ROOT)/tools - after += CIAO_XML_Utils - libs += CIAO_XML_Utils -} diff --git a/CIAO/MPC/config/ciaocidldefaults.mpb b/CIAO/MPC/config/ciaocidldefaults.mpb deleted file mode 100644 index 3521ffebf88..00000000000 --- a/CIAO/MPC/config/ciaocidldefaults.mpb +++ /dev/null @@ -1,24 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project { - // Set the cidl compiler and flags as template values - specific { - cidlc = $(CIAO_ROOT)/bin/cidlc - cidlc_dep = $(CIAO_ROOT)/bin/cidlc - cidlc_flags = -I $(CIAO_ROOT) -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs - } - - Define_Custom(CIDL) { - automatic = 0 - dependent = $(CIDLC_DEP) - command = $(CIDLC) - commandflags = $(CIDLC_FLAGS) - inputext = .cidl - source_outputext = _svnt.cpp - header_outputext = _svnt.h - generic_outputext = E.idl - keyword cidlflags = commandflags - } - -} diff --git a/CIAO/MPC/config/cidlc.mpb b/CIAO/MPC/config/cidlc.mpb deleted file mode 100644 index 38fa6d65e0d..00000000000 --- a/CIAO/MPC/config/cidlc.mpb +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -project: boost_filesystem, boost_regex, exceptions { - requires += cidl - includes += $(CIAO_ROOT) $(CIAO_ROOT)/CCF $(ACE_ROOT)/contrib/utility - libpaths += $(CIAO_ROOT)/CCF/CCF $(ACE_ROOT)/lib - - specific(nmake, vc71, vc8) { - compile_flags += /wd4290 /wd4800 /wd4250 /wd4355 - } - - verbatim(gnuace, top) { - include $(CIAO_ROOT)/CCF/Config.rules - } -} diff --git a/CIAO/MPC/config/dance_extension_stub.mpb b/CIAO/MPC/config/dance_extension_stub.mpb deleted file mode 100644 index 4f5353b87bb..00000000000 --- a/CIAO/MPC/config/dance_extension_stub.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - includes += $(CIAO_ROOT)/DAnCE/Interfaces -} diff --git a/CIAO/MPC/config/taoidl3toidl2defaults.mpb b/CIAO/MPC/config/taoidl3toidl2defaults.mpb deleted file mode 100644 index 58e2fb2f896..00000000000 --- a/CIAO/MPC/config/taoidl3toidl2defaults.mpb +++ /dev/null @@ -1,23 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project { - // Set the idl3_to_idl2 compiler and flags as template values - specific { - tao_idl3_to_idl2 = $(ACE_ROOT)/bin/tao_idl3_to_idl2 - tao_idl3_to_idl2_dep = $(ACE_ROOT)/bin/tao_idl3_to_idl2 - } - - Define_Custom(IDL3TOIDL2) { - automatic = 1 - dependent = $(TAO_IDL3_TO_IDL2_DEP) - command = $(TAO_IDL3_TO_IDL2) - commandflags = -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs - libpath = $(ACE_ROOT)/lib - inputext = .idl - generic_outputext = _IDL2.idl - keyword idl3toidl2flags = commandflags - } - - after += TAO_IDL3_TO_IDL2_EXE -} diff --git a/CIAO/NEWS b/CIAO/NEWS index d2e228eecad..d6e5deacf7e 100644 --- a/CIAO/NEWS +++ b/CIAO/NEWS @@ -26,7 +26,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . Enhance DAnCE to support OpenCCM components. . Update DAnCE IDL data structures and interfaces to comply with the - 06-04-01 version of the DnC specification, and perform + 06-02-01 version of the DnC specification, and perform interoperability testing with other DnC implementations. Note this work may change the functionality and semantics of some proprietary DAnCE extensions, notably ReDaC, Shared Compoents, and RTEC @@ -46,6 +46,8 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . Implement support for more complex type initialization with XML. +. (Remedy) support for using CIAO with VxWorks as target + . Decouple dependencies to NodeApplication from other DAnCE tools. These dependencies were added to support static configurator. We need to have these tools in both conventional version and static @@ -61,13 +63,8 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . Implement a planner to query the TargetManager and RepositoryManager and generate deployment plans on the fly. -USER VISIBLE CHANGES BETWEEN CIAO-0.5.4 and CIAO-0.5.5 -====================================================== - -. All IDL has been refactored to get a smaller footprint - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.3 and CIAO-0.5.4 -====================================================== +PLANNED MAJOR CHANGES FOR THE NEXT RELEASE +========================================== . Adding support to manage multiple interconnected assemblies, which will involve the work through ExternalReferenceEndPoint idea. @@ -75,30 +72,10 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.3 and CIAO-0.5.4 . Seamless integration of swapping into the main line programming model, so that DAnCE can actually kickstart swapping. -. Integrated real-time event service into CIAO and DAnCE. - -. Improved syntax error checking and reporting in the CIDL compiler. - -. Add Null Component to be able to measure footprint in detail - -. Added the naming service & the implementation of createPackage function - to RepoMan. - -. Added the code to save the state of the RepoMan at exit and load the - state of it at start. - -. Reimplemented the findNamesByType () and getAllTypes () operations of - RepoMan, which use the newly generated ACE_Hash_MultiMap_Manager class - and its corresponding classes. - -. Added Plan_Generator project. This project is used to retrieve information - from Repoman and generate/modify DeploymentPlans based on different demands. - -. A succesfull static deployment of the Hello example has been tested on - VxWorks 6.3 +. Integrate various Pub/Sub services into CIAO and DAnCE. USER VISIBLE CHANGES BETWEEN CIAO-0.5.2 and CIAO-0.5.3 -====================================================== +==================================================== . Improve documentation for CoSMiC Quoter tutorial to reflect the latest update @@ -128,7 +105,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.2 and CIAO-0.5.3 mechanisms. USER VISIBLE CHANGES BETWEEN CIAO-0.5.1 and CIAO-0.5.2 -====================================================== +==================================================== . Changed CIDL compiler code generation for facet servant classes to enable reuse if the same interface is used as a facet more @@ -179,7 +156,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.1 and CIAO-0.5.2 library for stub projects. USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1 -====================================================== +==================================================== . Added the support of integrating real-time event service into the CIAO core framework. Enhanced DAnCE to support declaratively configure @@ -209,7 +186,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1 get_all_publishers(), and disconnect_consumer(). USER VISIBLE CHANGES BETWEEN CIAO-0.4.10 and CIAO-0.5.0 -======================================================= +==================================================== . Changed MPC configuration of Config_Handlers to turn off hidden visibility if applicable when compiling Config_Handlers or projects @@ -226,7 +203,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.10 and CIAO-0.5.0 when removing it from the container. USER VISIBLE CHANGES BETWEEN CIAO-0.4.9 and CIAO-0.4.10 -======================================================= +====================================================== . Enhanced DAnCE ReDaC service to enforce the correct assembly redeployment and reconfiguration order. diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM index b58184e5d75..d60869eec09 100644 --- a/CIAO/PROBLEM-REPORT-FORM +++ b/CIAO/PROBLEM-REPORT-FORM @@ -43,9 +43,9 @@ To: ciao-users@cs.wustl.edu Subject: [area]: [synopsis] - CIAO VERSION: 0.5.4 - TAO VERSION : 1.5.4 - ACE VERSION : 5.5.4 + CIAO VERSION: 0.5.3 + TAO VERSION : 1.5.3 + ACE VERSION : 5.5.3 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you @@ -60,7 +60,7 @@ Subject: [area]: [synopsis] THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual - C++)]: + C++)]: CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features (used by MPC when you generate your own makefiles): diff --git a/CIAO/RACE/Controller/Component/Controller.idl b/CIAO/RACE/Controller/Component/Controller.idl index 3d2959995df..960f3ef3640 100644 --- a/CIAO/RACE/Controller/Component/Controller.idl +++ b/CIAO/RACE/Controller/Component/Controller.idl @@ -14,8 +14,8 @@ */ #include <Components.idl> -#include "ciao/Deployment_Target_Data.idl" -#include "DAnCE/TargetManager/TargetManagerExt.idl" +#include "ciao/Target_Data.idl" +#include "../../../DAnCE/TargetManager/TargetManagerExt.idl" /** * @module CIAO diff --git a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc b/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc index 8ef8d7bf6d8..6258cad826b 100644 --- a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc +++ b/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc @@ -1,11 +1,12 @@ -// $Id$ +// $Id$ // This file is generated with "generate_component_mpc.pl -n Input_Adapter" project(Input_Adapter_stub): ciao_deployment_stub { after += Plan_Analyzer_Interface_stub sharedname = Input_Adapter_stub - idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \ -Wb,stub_export_include=Input_Adapter_stub_export.h \ -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \ -Wb,skel_export_include=Input_Adapter_svnt_export.h @@ -35,7 +36,8 @@ project(Input_Adapter_svnt) : ciao_servant_dnc { sharedname = Input_Adapter_svnt libs += Input_Adapter_stub Plan_Analyzer_Interface_stub - idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \ -Wb,stub_export_include=Input_Adapter_stub_export.h \ -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \ -Wb,skel_export_include=Input_Adapter_svnt_export.h diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc index 2df82ac4a2f..5870d40d6b4 100644 --- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc +++ b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc @@ -4,7 +4,8 @@ project(Interactive_Input_Adapter_stub): ciao_deployment_stub { after += Input_Adapter_stub sharedname = Interactive_Input_Adapter_stub - idlflags += -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \ -Wb,stub_export_include=Interactive_Input_Adapter_stub_export.h \ -Wb,skel_export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \ -Wb,skel_export_include=Interactive_Input_Adapter_svnt_export.h @@ -38,7 +39,8 @@ project(Interactive_Input_Adapter_svnt) : ciao_servant_dnc { Input_Adapter_svnt \ Plan_Analyzer_Interface_stub - idlflags += -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \ -Wb,export_include=Interactive_Input_Adapter_svnt_export.h dynamicflags = INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL @@ -80,13 +82,14 @@ project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handle Input_Adapter_svnt \ Plan_Analyzer_Interface_stub \ XSC_Config_Handlers - - idlflags += -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \ + + idlflags += -Sc \ + -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \ -Wb,export_include=Interactive_Input_Adapter_exec_export.h dynamicflags = INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc b/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc index 32368cb1845..66292e4f984 100644 --- a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc +++ b/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc @@ -6,7 +6,8 @@ project(Output_Adapter_stub): ciao_deployment_stub { after += Output_Adapter_Interface_stub sharedname = Output_Adapter_stub - idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \ -Wb,stub_export_include=Output_Adapter_stub_export.h \ -Wb,skel_export_macro=OUTPUT_ADAPTER_SVNT_Export \ -Wb,skel_export_include=Output_Adapter_svnt_export.h @@ -36,7 +37,8 @@ project(Output_Adapter_svnt) : ciao_servant_dnc { sharedname = Output_Adapter_svnt libs += Output_Adapter_stub Output_Adapter_Interface_svnt Output_Adapter_Interface_stub - idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \ -Wb,stub_export_include=Output_Adapter_stub_export.h \ -Wb,skel_export_macro=OUTPUT_ADAPTER_SVNT_Export \ -Wb,skel_export_include=Output_Adapter_svnt_export.h diff --git a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc index 26d14b54196..b69b929200d 100644 --- a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc +++ b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc @@ -5,7 +5,8 @@ project(Output_Adapter_Interface_stub): ciao_deployment_stub { sharedname = Output_Adapter_Interface_stub - idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \ -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h @@ -34,7 +35,8 @@ project(Output_Adapter_Interface_svnt) : ciao_servant_dnc { sharedname = Output_Adapter_Interface_svnt libs += Output_Adapter_Interface_stub - idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \ -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h diff --git a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl index 911c9966f06..cd42287f4d2 100644 --- a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl +++ b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl @@ -4,12 +4,12 @@ #ifndef INCLUDED_DEPLOYMENT_DATA #define INCLUDED_DEPLOYMENT_DATA -#include "Deployment_DeploymentPlan.idl" +#include "Deployment_Data.idl" #endif module CIAO { - + module RACE { interface PlanEgress diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc index ccf3d9dae17..3ea12c0608e 100644 --- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc +++ b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc @@ -7,7 +7,8 @@ project(Plan_Analyzer_stub): ciao_deployment_stub { RACE_common_stub \ Planner_Manager_Interface_stub sharedname = Plan_Analyzer_stub - idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \ -Wb,stub_export_include=Plan_Analyzer_stub_export.h \ -Wb,skel_export_macro=PLAN_ANALYZER_SVNT_Export \ -Wb,skel_export_include=Plan_Analyzer_svnt_export.h @@ -43,7 +44,8 @@ project(Plan_Analyzer_svnt) : ciao_servant_dnc { Plan_Analyzer_Interface_svnt \ Planner_Manager_Interface_stub - idlflags += -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \ -Wb,export_include=Plan_Analyzer_svnt_export.h dynamicflags = PLAN_ANALYZER_SVNT_BUILD_DLL @@ -86,12 +88,13 @@ project(Plan_Analyzer_exec) : ciao_component_dnc { Plan_Analyzer_Interface_svnt \ Planner_Manager_Interface_stub - idlflags += -Wb,export_macro=PLAN_ANALYZER_EXEC_Export \ + idlflags += -Sc \ + -Wb,export_macro=PLAN_ANALYZER_EXEC_Export \ -Wb,export_include=Plan_Analyzer_exec_export.h dynamicflags = PLAN_ANALYZER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl index 1074b4f4da3..1127e42c167 100644 --- a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl +++ b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl @@ -4,7 +4,7 @@ #ifndef INCLUDED_DEPLOYMENT_DATA #define INCLUDED_DEPLOYMENT_DATA -#include "Deployment_DeploymentPlan.idl" +#include "Deployment_Data.idl" #endif module CIAO diff --git a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc index 0b7e6b2bfc9..b6caee3d39b 100644 --- a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc +++ b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc @@ -5,7 +5,8 @@ project(Plan_Analyzer_Interface_stub): ciao_deployment_stub { sharedname = Plan_Analyzer_Interface_stub - idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \ -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h @@ -34,7 +35,8 @@ project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc { sharedname = Plan_Analyzer_Interface_svnt libs += Plan_Analyzer_Interface_stub - idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \ -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc index 25f925c196a..673c8647431 100644 --- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc +++ b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc @@ -7,7 +7,8 @@ project(Planner_Manager_stub): ciao_deployment_stub { Planner_Interface_stub \ Output_Adapter_Interface_stub sharedname = Planner_Manager_stub - idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \ -Wb,stub_export_include=Planner_Manager_stub_export.h \ -Wb,skel_export_macro=PLANNER_MANAGER_SVNT_Export \ -Wb,skel_export_include=Planner_Manager_svnt_export.h @@ -44,7 +45,8 @@ project(Planner_Manager_svnt) : ciao_servant_dnc { Planner_Manager_Interface_svnt \ Planner_Interface_stub \ Output_Adapter_Interface_stub - idlflags += -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \ -Wb,export_include=Planner_Manager_svnt_export.h dynamicflags = PLANNER_MANAGER_SVNT_BUILD_DLL @@ -88,13 +90,14 @@ project(Planner_Manager_exec) : ciao_component_dnc { Planner_Interface_stub \ Planner_stub \ Output_Adapter_Interface_stub - - idlflags += -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \ + + idlflags += -Sc \ + -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \ -Wb,export_include=Planner_Manager_exec_export.h dynamicflags = PLANNER_MANAGER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl index 7ad88444a52..560a2ad92b1 100644 --- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl +++ b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl @@ -4,7 +4,7 @@ #ifndef INCLUDED_DEPLOYMENT_DATA #define INCLUDED_DEPLOYMENT_DATA -#include "Deployment_DeploymentPlan.idl" +#include "Deployment_Data.idl" #endif #include "../../common/RACE_common.idl" diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc index fb145b6fc6d..5cdc9bb8de3 100644 --- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc +++ b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc @@ -6,7 +6,8 @@ project(Planner_Manager_Interface_stub): ciao_deployment_stub, anytypecode { sharedname = Planner_Manager_Interface_stub after += RACE_common_stub - idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \ -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h @@ -36,7 +37,8 @@ project(Planner_Manager_Interface_svnt) : ciao_servant_dnc { sharedname = Planner_Manager_Interface_svnt libs += Planner_Manager_Interface_stub RACE_common_stub - idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \ -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h diff --git a/CIAO/RACE/Planners/Base/Planner.mpc b/CIAO/RACE/Planners/Base/Planner.mpc index 698cb689cb5..1f4dd54be45 100644 --- a/CIAO/RACE/Planners/Base/Planner.mpc +++ b/CIAO/RACE/Planners/Base/Planner.mpc @@ -6,7 +6,8 @@ project(Planner_stub): ciao_deployment_stub { after += Planner_Interface_stub RACE_common_stub sharedname = Planner_stub - idlflags += -Wb,stub_export_macro=PLANNER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_STUB_Export \ -Wb,stub_export_include=Planner_stub_export.h \ -Wb,skel_export_macro=PLANNER_SVNT_Export \ -Wb,skel_export_include=Planner_svnt_export.h @@ -36,7 +37,8 @@ project(Planner_svnt) : ciao_servant_dnc { sharedname = Planner_svnt libs += Planner_Interface_stub Planner_Interface_svnt Planner_stub RACE_common_stub - idlflags += -Wb,stub_export_macro=PLANNER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_STUB_Export \ -Wb,stub_export_include=Planner_stub_export.h \ -Wb,skel_export_macro=PLANNER_SVNT_Export \ -Wb,skel_export_include=Planner_svnt_export.h diff --git a/CIAO/RACE/Planners/Interface/Planner_I.idl b/CIAO/RACE/Planners/Interface/Planner_I.idl index 954a61f5269..b947c132540 100644 --- a/CIAO/RACE/Planners/Interface/Planner_I.idl +++ b/CIAO/RACE/Planners/Interface/Planner_I.idl @@ -4,12 +4,12 @@ #ifndef INCLUDED_DEPLOYMENT_DATA #define INCLUDED_DEPLOYMENT_DATA -#include "Deployment_DeploymentPlan.idl" +#include "Deployment_Data.idl" #endif module CIAO { - + module RACE { interface Planner_I diff --git a/CIAO/RACE/Planners/Interface/Planner_Interface.mpc b/CIAO/RACE/Planners/Interface/Planner_Interface.mpc index 3549de0fa64..e9c9ae995bb 100644 --- a/CIAO/RACE/Planners/Interface/Planner_Interface.mpc +++ b/CIAO/RACE/Planners/Interface/Planner_Interface.mpc @@ -5,7 +5,8 @@ project(Planner_Interface_stub): ciao_deployment_stub { sharedname = Planner_Interface_stub - idlflags += -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Planner_Interface_stub_export.h \ -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Planner_Interface_svnt_export.h @@ -34,7 +35,8 @@ project(Planner_Interface_svnt) : ciao_servant_dnc { sharedname = Planner_Interface_svnt libs += Planner_Interface_stub - idlflags += -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \ -Wb,stub_export_include=Planner_Interface_stub_export.h \ -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \ -Wb,skel_export_include=Planner_Interface_svnt_export.h diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc index 149f735b073..76bcf38962f 100644 --- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc +++ b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc @@ -6,7 +6,8 @@ project(SimpleBinPacker_stub): ciao_deployment_stub { avoids += ace_for_tao after += Planner_Interface_stub Planner_stub sharedname = SimpleBinPacker_stub - idlflags += -Wb,stub_export_macro=SIMPLEBINPACKER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=SIMPLEBINPACKER_STUB_Export \ -Wb,stub_export_include=SimpleBinPacker_stub_export.h \ -Wb,skel_export_macro=SIMPLEBINPACKER_SVNT_Export \ -Wb,skel_export_include=SimpleBinPacker_svnt_export.h @@ -41,7 +42,8 @@ project(SimpleBinPacker_svnt) : ciao_servant_dnc { Planner_stub \ Planner_svnt \ RACE_common_stub - idlflags += -Wb,export_macro=SIMPLEBINPACKER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=SIMPLEBINPACKER_SVNT_Export \ -Wb,export_include=SimpleBinPacker_svnt_export.h dynamicflags = SIMPLEBINPACKER_SVNT_BUILD_DLL @@ -83,15 +85,16 @@ project(SimpleBinPacker_exec) : ciao_component_dnc { Planner_Interface_stub \ Planner_Interface_svnt \ Planner_stub \ - Planner_svnt \ + Planner_svnt \ RACE_common_stub - - idlflags += -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \ + + idlflags += -Sc \ + -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \ -Wb,export_include=SimpleBinPacker_exec_export.h dynamicflags = SIMPLEBINPACKER_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { diff --git a/CIAO/RACE/common/RACE_common.mpc b/CIAO/RACE/common/RACE_common.mpc index 38253d218d7..ccfc9264efb 100644 --- a/CIAO/RACE/common/RACE_common.mpc +++ b/CIAO/RACE/common/RACE_common.mpc @@ -34,7 +34,8 @@ project(RACE_common_stub): taolib_with_idl, anytypecode { // sharedname = RACE_common_svnt // libs += RACE_common_stub -// idlflags += -Wb,stub_export_macro=RACE_COMMON_STUB_Export \ +// idlflags += -Sc \ +// -Wb,stub_export_macro=RACE_COMMON_STUB_Export \ // -Wb,stub_export_include=RACE_common_stub_export.h \ // -Wb,skel_export_macro=RACE_COMMON_SVNT_Export \ // -Wb,skel_export_include=RACE_common_svnt_export.h diff --git a/CIAO/VERSION b/CIAO/VERSION index 96c4ca50560..0948a922e51 100644 --- a/CIAO/VERSION +++ b/CIAO/VERSION @@ -1,4 +1,4 @@ -This is CIAO version 0.5.4, released Mon Nov 20 08:16:34 2006. +This is CIAO version 0.5.3, released Thu Oct 05 00:35:37 2006. If you have any problems with or questions about CIAO, please send e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl index f4a6ec7246b..dc504157b51 100755 --- a/CIAO/bin/generate_component_mpc.pl +++ b/CIAO/bin/generate_component_mpc.pl @@ -12,15 +12,14 @@ use Getopt::Std; $flags = join (" ", @ARGV); -if (!getopts ('decnip:l:u:h') || $opt_h) { +if (!getopts ('dcnip:l:u:h') || $opt_h) { print "generate_component_mpc.pl [-d] [-h] component_name\n"; print "\n"; print " -d Turn on debug mode\n"; - print " -e Eventtype declaration in IDL\n"; print " -p Dependent component name\n"; print " -l Dependent component path\n"; print " -i Use an executor definition IDL file\n"; - print " -n Suppress component make/project\n"; + print " -n Supress component make/project\n"; print " -c Create a client makefile\n"; print " -u Unique project name prefix (if not defined, name for -p flag will be used. \n"; print "\n"; @@ -48,19 +47,10 @@ $UCOM_NAME = uc $com_name; ############################################################################## # Prologue -if (defined $opt_n) { - $svr_suffix = "_skel"; -} -else { - $svr_suffix = "_svnt"; -} - -$USVR_SUFFIX = uc $svr_suffix; - if (defined $opt_p) { $stub_depend = "after += $opt_p".'_stub'; - $svnt_depend = "$opt_p".'_skel'; - $lib_depend = "$opt_p".'_stub '."$opt_p".'_skel'; + $svnt_depend = "$opt_p".'_svnt'; + $lib_depend = "$opt_p".'_stub '."$opt_p".'_svnt'; $client_depend = "$com_name".'_stub '."$opt_p"."_stub"; } else { @@ -76,6 +66,7 @@ elsif (defined $opt_p) { $unique_prefix = "$opt_p" . "_"; } + if (defined $opt_l) { $lib_paths = "libpaths += $opt_l"; } @@ -101,12 +92,6 @@ project ('."$unique_prefix"."$com_name".'_client) : ciao_client_dnc { if (defined $opt_i) { $exec_impl_idl = "$com_name".'EI.idl'; $exec_impl_cpp = "$com_name".'EIC.cpp'; - $exec_idlflags = -' - idlflags += -SS -St \ - -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export \ - -Wb,export_include='."$com_name".'_exec_export.h -'; } @@ -114,10 +99,11 @@ if (! defined $opt_n) { $component_def = ' project('."$unique_prefix"."$com_name".'_exec) : ciao_component_dnc { - after += '."$unique_prefix"."$com_name"."$svr_suffix".' + after += '."$unique_prefix"."$com_name".'_svnt sharedname = '."$com_name".'_exec - libs += '."$com_name".'_stub '."$com_name"."$svr_suffix $lib_depend - $lib_paths $exec_idlflags".' + libs += '."$com_name".'_stub '."$com_name".'_svnt'." $lib_depend + $lib_paths".' + idlflags += -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export -Wb,export_include='."$com_name".'_exec_export.h dynamicflags = '."$UCOM_NAME".'_EXEC_BUILD_DLL IDL_Files {'." @@ -132,78 +118,13 @@ project('."$unique_prefix"."$com_name".'_exec) : ciao_component_dnc { '; } -$no_skel = "-SS"; -$no_anys = "-St"; -$no_tie = "idlflags -= -GT"; - -if (defined $opt_e) { - $no_anys = ""; - - if (defined $opt_n) { - $no_tie = ""; - } -} - -$cli_idlflags =' - '."$no_tie".' - idlflags += '."$no_anys".' \ - -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export \ - -Wb,stub_export_include='."$com_name".'_stub_export.h \ - -Wb,skel_export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \ - -Wb,skel_export_include='."$com_name"."$svr_suffix".'_export.h -'; - -$cli_base = "ciao_client_dnc"; -$svr_base = "ciao_servant_dnc"; - -if (defined $opt_n) { - $svr_idlflags = $cli_idlflags; - $svr_idl = "$com_name".'.idl'; - - $svr_src = -' - '."$com_name".'S.cpp -'; - - if (! defined $opt_e) { - $cli_base = "taolib_with_idl"; - $svr_base = "portableserver"; - } -} -else { - $svr_idlflags =' - '."$no_tie".' - idlflags += '."$no_anys"." $no_skel".' \ - -Wb,export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \ - -Wb,export_include='."$com_name"."$svr_suffix".'_export.h -'; - - $cidl_block = -' - CIDL_Files { - '."$com_name".'.cidl - } -'; - - $svr_idl = "$com_name".'E.idl'; - - $svr_src = -' - '."$com_name".'EC.cpp - '."$com_name".'S.cpp - '."$com_name".'_svnt.cpp -'; -} - - - $mpc_template = '// $Id$ // This file is generated with "'."generate_component_mpc.pl $flags".'" -project('."$unique_prefix"."$com_name".'_stub): '."$cli_base".' {'." +project('."$unique_prefix"."$com_name".'_stub): ciao_client_dnc {'." $stub_depend".' sharedname = '."$com_name".'_stub - '."$cli_idlflags".' + idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export -Wb,stub_export_include='."$com_name".'_stub_export.h -Wb,skel_export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,skel_export_include='."$com_name".'_svnt_export.h dynamicflags = '."$UCOM_NAME".'_STUB_BUILD_DLL IDL_Files { @@ -215,20 +136,30 @@ project('."$unique_prefix"."$com_name".'_stub): '."$cli_base".' {'." } } -project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base".' { - after += '."$svnt_depend "."$unique_prefix"."$com_name".'_stub - sharedname = '."$com_name"."$svr_suffix".' - libs += '."$com_name".'_stub'." $lib_depend - $lib_paths $svr_idlflags".' - dynamicflags = '."$UCOM_NAME"."$USVR_SUFFIX".'_BUILD_DLL - '."$cidl_block".' +project('."$unique_prefix"."$com_name".'_svnt) : ciao_servant_dnc { + after += '."$svnt_depend "."$unique_prefix"."$com_name".'_stub + sharedname = '."$com_name".'_svnt + libs += '."$com_name".'_stub'." $lib_depend + $lib_paths".' + idlflags += -Wb,export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,export_include='."$com_name".'_svnt_export.h + dynamicflags = '."$UCOM_NAME".'_SVNT_BUILD_DLL + + CIDL_Files { + '."$com_name".'.cidl + } + IDL_Files { - '."$svr_idl".' + '."$com_name".'E.idl } - Source_Files {'."$svr_src".' } + Source_Files { + '."$com_name".'EC.cpp + '."$com_name".'S.cpp + '."$com_name".'_svnt.cpp + } } -'."$component_def +'." +$component_def $client_def "; @@ -252,7 +183,7 @@ $command = "generate_export_file.pl $UCOM_NAME".'_STUB > '."$com_name".'_stub_ex print "\t$command"."\n"; system ("$ACE_ROOT".'/bin/'."$command"); -$command = "generate_export_file.pl $UCOM_NAME"."$USVR_SUFFIX".' > '."$com_name"."$svr_suffix".'_export.h'; +$command = "generate_export_file.pl $UCOM_NAME".'_SVNT > '."$com_name".'_svnt_export.h'; print "\t$command"."\n"; system ("$ACE_ROOT".'/bin/'."$command"); diff --git a/CIAO/ciao/CCM_Base.idl b/CIAO/ciao/CCM_Base.idl index 40d6b308668..a37d55c099f 100644 --- a/CIAO/ciao/CCM_Base.idl +++ b/CIAO/ciao/CCM_Base.idl @@ -12,6 +12,14 @@ * CCM_Base.idl */ +//#define CIAO_HAS_IMPORT_KEYWORD + +#ifdef CIAO_HAS_IMPORT_KEYWORD +// import ::CORBA; +#else +#include <orb.idl> +#endif /* CIAO_HAS_IMPORT_KEYWORD */ + #if !defined (CCM_BASE_IDL) #define CCM_BASE_IDL @@ -19,8 +27,114 @@ module Components { typeprefix Components "omg.org"; + typedef string FeatureName; + typedef sequence<FeatureName> NameList; + + valuetype Cookie + { + private CORBA::OctetSeq cookieValue; + }; + + valuetype PortDescription + { + public FeatureName name; + public CORBA::RepositoryId type_id; + }; + + valuetype FacetDescription : PortDescription + { + public Object facet_ref; + }; + + typedef sequence<FacetDescription> FacetDescriptions; + + typedef unsigned long FailureReason; + + exception InvalidName {}; exception InvalidConnection {}; + exception ExceededConnectionLimit {}; exception AlreadyConnected {}; exception NoConnection {}; + exception CookieRequired {}; + exception CreateFailure { + FailureReason reason; + }; + exception FinderFailure + { + FailureReason reason; + }; + exception RemoveFailure + { + FailureReason reason; + }; + exception DuplicateKeyValue {}; + exception InvalidKey {}; + exception UnknownKeyValue {}; + exception NoKeyAvailable {}; + exception BadEventType + { + CORBA::RepositoryId expected_event_type; + }; + exception HomeNotFound {}; + exception WrongComponentType {}; + + typedef FailureReason InvalidConfigurationReason; + const InvalidConfigurationReason UnknownConfigValueName = 0; + const InvalidConfigurationReason InvalidConfigValueType = 1; + const InvalidConfigurationReason ConfigValueRequired = 2; + const InvalidConfigurationReason ConfigValueNotExpected = 3; + exception InvalidConfiguration + { + InvalidConfigurationReason reason; + FeatureName name; + }; + exception IllegalState {}; + + interface Navigation + { + Object provide_facet (in FeatureName name) + raises (InvalidName); + FacetDescriptions get_all_facets(); + FacetDescriptions get_named_facets (in NameList names) + raises (InvalidName); + boolean same_component (in Object object_ref); + }; + + valuetype ConnectionDescription + { + public Cookie ck; + public Object objref; + }; + typedef sequence<ConnectionDescription> ConnectionDescriptions; + + valuetype ReceptacleDescription : PortDescription + { + public boolean is_multiple; + public ConnectionDescriptions connections; + }; + typedef sequence<ReceptacleDescription> ReceptacleDescriptions; + + interface Receptacles + { + Cookie connect (in FeatureName name, in Object connection ) + raises (InvalidName, + InvalidConnection, + AlreadyConnected, + ExceededConnectionLimit); + + Object disconnect (in FeatureName name, in Cookie ck) + raises (InvalidName, + InvalidConnection, + CookieRequired, + NoConnection); + + ConnectionDescriptions get_connections (in FeatureName name) + raises (InvalidName); + + ReceptacleDescriptions get_all_receptacles (); + + ReceptacleDescriptions get_named_receptacles (in NameList names) + raises (InvalidName); + }; }; #endif /* CCM_BASE_IDL */ diff --git a/CIAO/ciao/CCM_CCM2Context.idl b/CIAO/ciao/CCM_CCM2Context.idl deleted file mode 100644 index 9b29d8b7d3b..00000000000 --- a/CIAO/ciao/CCM_CCM2Context.idl +++ /dev/null @@ -1,45 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -#if !defined (CCM_2CONTEXT_IDL) -#define CCM_2CONTEXT_IDL - -#include "ciao/CCM_Container.idl" -#include "ciao/CCM_HomeRegistration.idl" -#include <CosPersistentState.idl> - -// *************** Extended Container Interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - typedef CosPersistentState::CatalogBase CatalogBase; - typedef CosPersistentState::_TypeId _TypeId; - - exception PolicyMismatch {}; - exception PersistenceNotAvailable {}; - - local interface CCM2Context : CCMContext - { - HomeRegistration get_home_registration (); - - void req_passivate () - raises (PolicyMismatch); - - CatalogBase get_persistence (in _TypeId catalog_type_id) - raises (PersistenceNotAvailable); - }; - -}; -#endif /* CCM_2CONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_CCMException.idl b/CIAO/ciao/CCM_CCMException.idl deleted file mode 100644 index 445e09e1d1a..00000000000 --- a/CIAO/ciao/CCM_CCMException.idl +++ /dev/null @@ -1,37 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -#if !defined (CCM_CCMEXCEPTION_IDL) -#define CCM_CCMEXCEPTION_IDL - -module Components -{ - typeprefix Components "omg.org"; - - enum CCMExceptionReason - { - SYSTEM_ERROR, - CREATE_ERROR, - REMOVE_ERROR, - DUPLICATE_KEY, - FIND_ERROR, - OBJECT_NOT_FOUND, - NO_SUCH_ENTITY - }; - - exception CCMException - { - CCMExceptionReason reason; - }; -}; -#endif /* CCM_CCMEXCEPTION_IDL */ diff --git a/CIAO/ciao/CCM_ClientContainerInterceptor.idl b/CIAO/ciao/CCM_ClientContainerInterceptor.idl deleted file mode 100644 index 27a5fdc8929..00000000000 --- a/CIAO/ciao/CCM_ClientContainerInterceptor.idl +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ - -#if !defined (CCM_CLIENTCONTAINERINTERCEPTOR_IDL) -#define CCM_CLIENTCONTAINERINTERCEPTOR_IDL - -#include "ciao/CCM_ContainerInterceptor.idl" -#include "ciao/CCM_ContainerClientRequestInfo.idl" -#include "tao/PI/PIForwardRequest.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ClientContainerInterceptor : ContainerInterceptor - { - void send_request (in ContainerClientRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - void send_poll (in ContainerClientRequestInfo info); - void receive_reply (in ContainerClientRequestInfo info); - void receive_exception (in ContainerClientRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - void receive_other (in ContainerClientRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - }; - }; -}; -#endif /* CCM_CLIENTCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl deleted file mode 100644 index 031f06f1a0f..00000000000 --- a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#if !defined (CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL) -#define CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL - -#include "ciao/CCM_Cookie.idl" -#include "ciao/CCM_InvalidRegistration.idl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ClientContainerInterceptor; - - local interface ClientContainerInterceptorRegistration - { - Components::Cookie register_client_interceptor (in ClientContainerInterceptor ci); - ClientContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie) - raises(InvalidRegistration); - }; - }; -}; - -#endif /* CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_Component.idl b/CIAO/ciao/CCM_Component.idl index 8a604edf085..32c0299acf0 100644 --- a/CIAO/ciao/CCM_Component.idl +++ b/CIAO/ciao/CCM_Component.idl @@ -14,9 +14,143 @@ #if !defined (CCM_COMPONENT_IDL) #define CCM_COMPONENT_IDL -#include "ciao/CCM_Events.idl" -#include "ciao/CCM_Home.idl" -#include "ciao/CCM_Object.idl" -#include "ciao/CCM_Enumeration.idl" +#include "CCM_Event.idl" +#include "tao/IFR_Client/IFR_Base.pidl" +module Components +{ + typeprefix Components "omg.org"; + + abstract valuetype PrimaryKeyBase {}; + + interface CCMObject; //forward reference + + interface CCMHome + { + CORBA::IRObject get_component_def (); + CORBA::IRObject get_home_def (); + void remove_component ( in CCMObject comp) + raises (RemoveFailure); + }; + typedef sequence<CCMHome> CCMHomes; + + interface KeylessCCMHome + { + CCMObject create_component() + raises (CreateFailure); + }; + + interface HomeFinder + { + CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid) + raises (HomeNotFound); + + CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid) + raises (HomeNotFound); + + CCMHome find_home_by_name (in string home_name) + raises (HomeNotFound); + }; + + interface Configurator + { + void configure (in CCMObject comp) + raises (WrongComponentType); + }; + + valuetype ConfigValue + { + public FeatureName name; + public any value; + }; + + typedef sequence<ConfigValue> ConfigValues; + + interface StandardConfigurator : Configurator + { + void set_configuration (in ConfigValues descr); + }; + + interface HomeConfiguration : CCMHome + { + void set_configurator (in Configurator cfg); + void set_configuration_values (in ConfigValues config); + void complete_component_configuration (in boolean b); + void disable_home_configuration(); + }; + + valuetype ComponentPortDescription + { + public FacetDescriptions facets; + public ReceptacleDescriptions receptacles; + public ConsumerDescriptions consumers; + public EmitterDescriptions emitters; + public PublisherDescriptions publishers; + }; + + interface CCMObject : Navigation, Receptacles, Events + { + CORBA::IRObject get_component_def ( ); + CCMHome get_ccm_home( ); + PrimaryKeyBase get_primary_key( ) + raises (NoKeyAvailable); + void remove() + raises (RemoveFailure); + ComponentPortDescription get_all_ports (); + + /// Factory method to return a StandardConfigurator interface. CIAO specific + StandardConfigurator get_standard_configurator ( ); + + /// CIAO specific operations to have some control on when and how + /// to activate components. + /** + * This is all from our work on ARMS where we needed to know whether + * every component has been configured, say for example to use + * logging in the assembly which could in turn be provided by a + * component. To get around all this we are adding some methods on + * this till we think of some standard way to do this. The problem + * is that the deployer should be able to call this as opposed to + * the home calling it as soon as the component is created. + * + * All these operations are called in the order mentioned, ie. the + * deployer calls ciao_preactivate () on all components, then + * ciao_activate and then ciao_postactivate (). The speciality is + * that these operations would be invoked on every target object + * before the next call is made. It is similar to the way + * portable interceptors work, trying to get everything onto the + * flow stack, but differ in the intention. + */ + void ciao_preactivate () + raises (InvalidConfiguration); + + void ciao_activate () + raises (InvalidConfiguration); + + void ciao_postactivate () + raises (InvalidConfiguration); + + void ciao_passivate () + raises (InvalidConfiguration); + + void configuration_complete () + raises (InvalidConfiguration); + }; + + /// @@ Enumeration and DefaultEnumeration are only for EJB to CCM + /// mapping? At any rate, we should be able to skip them for now. + /// @todo Move these then to a seperate file so that the linker can + /// optimize things out of the executable when building staticly + abstract valuetype Enumeration + { + boolean has_more_elements(); + CCMObject next_element(); + }; + + typedef sequence<CCMObject> CCMObjectSeq; + + valuetype DefaultEnumeration : Enumeration + { + private CCMObjectSeq objects; + }; +}; #endif /* CCM_COMPONENT_IDL */ diff --git a/CIAO/ciao/CCM_ComponentId.idl b/CIAO/ciao/CCM_ComponentId.idl deleted file mode 100644 index 299515d0978..00000000000 --- a/CIAO/ciao/CCM_ComponentId.idl +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_COMPONENTID_IDL) -#define CCM_COMPONENTID_IDL - -#include "ciao/CCM_StateIdFactory.idl" - -// *************** Extended Container Interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - local interface ComponentId - { - FacetId get_target_facet(); - - SegmentId get_target_segment(); - - StateIdValue get_target_state_id (in StateIdFactory sid_factory) - raises (InvalidStateIdData); - - StateIdValue get_segment_state_id (in SegmentId seg, - in StateIdFactory sid_factory) - raises (InvalidStateIdData); - - ComponentId create_with_new_target (in FacetId new_target_facet, - in SegmentId new_target_segment); - - SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory) - raises (InvalidStateIdData); - }; -}; -#endif /* CCM_COMPONENTID_IDL */ diff --git a/CIAO/ciao/CCM_Configurator.idl b/CIAO/ciao/CCM_Configurator.idl deleted file mode 100644 index 0d48f8e65cb..00000000000 --- a/CIAO/ciao/CCM_Configurator.idl +++ /dev/null @@ -1,31 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_CONFIGURATOR_IDL) -#define CCM_CONFIGURATOR_IDL - -module Components -{ - typeprefix Components "omg.org"; - - exception WrongComponentType {}; - - interface CCMObject; - - interface Configurator - { - void configure (in CCMObject comp) - raises (WrongComponentType); - }; -}; -#endif /* CCM_CONFIGURATOR_IDL */ diff --git a/CIAO/ciao/CCM_Container.idl b/CIAO/ciao/CCM_Container.idl index d6555e16170..b8a6ab3286b 100644 --- a/CIAO/ciao/CCM_Container.idl +++ b/CIAO/ciao/CCM_Container.idl @@ -16,10 +16,142 @@ #if !defined (CCM_CONTAINER_IDL) #define CCM_CONTAINER_IDL -#include "ciao/CCM_Component.idl" -#include "ciao/CCM_CCMException.idl" -#include "ciao/CCM_HomeExecutorBase.idl" -#include "ciao/CCM_SessionContext.idl" -#include "ciao/CCM_SessionComponent.idl" +#include "CCM_Component.idl" +#include "orbsvcs/SecurityLevel2.idl" +#include "CCM_Transaction.idl" +// *************** Basic Container interfaces *************** + +module Components +{ + typeprefix Components "omg.org"; + + typedef SecurityLevel2::Credentials Principal; + + local interface CCMContext + { + Principal get_caller_principal(); + + CCMHome get_CCM_home(); + + boolean get_rollback_only() + raises (IllegalState); + + Transaction::UserTransaction get_user_transaction() + raises (IllegalState); + + boolean is_caller_in_role (in string role); + + void set_rollback_only() + raises (IllegalState); + }; + + enum CCMExceptionReason + { + SYSTEM_ERROR, + CREATE_ERROR, + REMOVE_ERROR, + DUPLICATE_KEY, + FIND_ERROR, + OBJECT_NOT_FOUND, + NO_SUCH_ENTITY + }; + + exception CCMException + { + CCMExceptionReason reason; + }; + + local interface EnterpriseComponent {}; + + local interface SessionContext : CCMContext + { + Object get_CCM_object() + raises (IllegalState); + }; + + local interface SessionComponent : EnterpriseComponent + { + void set_session_context ( in SessionContext ctx) + raises (CCMException); + + void ccm_activate() + raises (CCMException); + + void ccm_passivate() + raises (CCMException); + + + void ccm_remove () + raises (CCMException); + + /** + * This method is invoked before ccm_activate () is called. All + * components in the assembly get this callback before the + * ccm_activate () is called. + * @note CIAO specific + */ + void ciao_preactivate () + raises (CCMException); + + /** + * This method is invoked after ccm_activate () is called. All + * components in the assembly get this callback after the + * ccm_activate () is called. + * @note CIAO specific + */ + void ciao_postactivate () + raises (CCMException); + }; + + local interface SessionSynchronization + { + void after_begin () + raises (CCMException); + + void before_completion () + raises (CCMException); + + void after_completion (in boolean committed) + raises (CCMException); + }; + + local interface EntityContext : CCMContext + { + Object get_CCM_object () + raises (IllegalState); + + PrimaryKeyBase get_primary_key () + raises (IllegalState); + }; + + local interface EntityComponent : EnterpriseComponent + { + void set_entity_context (in EntityContext ctx) + raises (CCMException); + + void unset_entity_context () + raises (CCMException); + + void ccm_activate () + raises (CCMException); + + void ccm_load () + raises (CCMException); + + void ccm_store () + raises (CCMException); + + void ccm_passivate () + raises (CCMException); + + void ccm_remove () + raises (CCMException); + }; + + + local interface HomeExecutorBase + { + }; +}; #endif /* CCM_CONTAINER_IDL */ diff --git a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl b/CIAO/ciao/CCM_ContainerClientRequestInfo.idl deleted file mode 100644 index b44dac880b8..00000000000 --- a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTAINERCLIENTREQUESTINFO_IDL) -#define CCM_CONTAINERCLIENTREQUESTINFO_IDL - -#include "ciao/CCM_ContainerRequestInfo.idl" -#include "tao/PI/ClientRequestInfo.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ContainerClientRequestInfo : ContainerRequestInfo - { - PortableInterceptor::ClientRequestInfo request_info(); - }; - }; -}; - -#endif /* CCM_CONTAINERCLIENTREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerInterceptor.idl b/CIAO/ciao/CCM_ContainerInterceptor.idl deleted file mode 100644 index b5ccdf52fae..00000000000 --- a/CIAO/ciao/CCM_ContainerInterceptor.idl +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTAINERPORTABLEINTERCEPTOR_IDL) -#define CCM_CONTAINERPORTABLEINTERCEPTOR_IDL - -#include "tao/PI_Forward.pidl" - -module Components { - - module ContainerPortableInterceptor { - - local interface ContainerInterceptor - { - readonly attribute string name; - void destroy (); - void set_slot_id(in PortableInterceptor::SlotId slot_id); - }; - }; -}; - -#endif /* CCM_CONTAINERPORTABLEINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ContainerRequestInfo.idl b/CIAO/ciao/CCM_ContainerRequestInfo.idl deleted file mode 100644 index 3fb590acc16..00000000000 --- a/CIAO/ciao/CCM_ContainerRequestInfo.idl +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTAINERREQUESTINFO_IDL) -#define CCM_CONTAINERREQUESTINFO_IDL - -#include "ciao/CCM_Navigation.idl" -#include "tao/OctetSeq.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ContainerRequestInfo - { - readonly attribute CORBA::OctetSeq origin_id; - readonly attribute CORBA::OctetSeq target_id; - readonly attribute FeatureName name; - }; - }; -}; - -#endif /* CCM_CONTAINERREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl b/CIAO/ciao/CCM_ContainerServantRequestInfo.idl deleted file mode 100644 index 0a3348b8f7e..00000000000 --- a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTAINERSERVANTREQUESTINFO_IDL) -#define CCM_CONTAINERSERVANTREQUESTINFO_IDL - -#include "ciao/CCM_ContainerRequestInfo.idl" -#include "ciao/CCM_EnterpriseComponent.idl" -#include "tao/AnyTypeCode/Dynamic.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ContainerServantRequestInfo : ContainerRequestInfo - { - attribute Dynamic::ParameterList arguments; - readonly attribute string operation; - attribute any result; - attribute Components::EnterpriseComponent target; - attribute any the_exception; - }; - }; -}; - -#endif /* CCM_CONTAINERSERVANTREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl b/CIAO/ciao/CCM_ContainerServerRequestInfo.idl deleted file mode 100644 index 4868e6a2e8d..00000000000 --- a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTAINERSERVERREQUESTINFO_IDL) -#define CCM_CONTAINERSERVERREQUESTINFO_IDL - -#include "ciao/CCM_ContainerRequestInfo.idl" -#include "tao/PI_Server/ServerRequestInfo.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ContainerServerRequestInfo : ContainerRequestInfo - { - PortableInterceptor::ServerRequestInfo request_info(); - }; - }; -}; - -#endif /* CCM_CONTAINERSERVERREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl b/CIAO/ciao/CCM_ContainerStubRequestInfo.idl deleted file mode 100644 index da14afa9e08..00000000000 --- a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTAINERSTUBREQUESTINFO_IDL) -#define CCM_CONTAINERSTUBREQUESTINFO_IDL - -#include "ciao/CCM_ContainerRequestInfo.idl" -#include "tao/AnyTypeCode/Dynamic.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ContainerStubRequestInfo : ContainerRequestInfo - { - attribute Dynamic::ParameterList arguments; - readonly attribute string operation; - attribute any result; - attribute Object target; - attribute any the_exception; - }; - }; -}; - -#endif /* CCM_CONTAINERSTUBREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_Container_Ex.idl b/CIAO/ciao/CCM_Container_Ex.idl index c2161d56c94..0aeb481807d 100644 --- a/CIAO/ciao/CCM_Container_Ex.idl +++ b/CIAO/ciao/CCM_Container_Ex.idl @@ -16,8 +16,168 @@ #if !defined (CCM_CONTAINER_EX_IDL) #define CCM_CONTAINER_EX_IDL -#include "ciao/CCM_Container.idl" -#include "ciao/CCM_Session2Context.idl" -#include "ciao/CCM_EntityContext.idl" +#include "CCM_Container.idl" +#include <CosPersistentState.idl> +// *************** Extended Container Interfaces *************** + +module Components +{ + typeprefix Components "omg.org"; + + enum BadComponentReferenceReason + { + NON_LOCAL_REFERENCE, + NON_COMPONENT_REFERENCE, + WRONG_CONTAINER + }; + + typedef CosPersistentState::CatalogBase CatalogBase; + typedef CosPersistentState::_TypeId _TypeId; + + typedef short SegmentId; + const SegmentId COMPONENT_SEGMENT = 0; + + typedef short FacetId; + const FacetId COMPONENT_FACET = 0; + + typedef sequence<octet> IdData; + typedef CosPersistentState::Pid PersistentId; + + typedef short StateIdType; + const StateIdType PERSISTENT_ID = 0; + + exception BadComponentReference + { + BadComponentReferenceReason reason; + }; + exception PolicyMismatch {}; + exception PersistenceNotAvailable {}; + exception UnknownActualHome {}; + exception ProxyHomeNotSupported {}; + exception InvalidStateIdData {}; + + local interface HomeRegistration + { + void register_home (in CCMHome home_ref, + in string home_name); + + void unregister_home (in CCMHome home_ref); + }; + + local interface CCM2Context : CCMContext + { + HomeRegistration get_home_registration (); + + void req_passivate () + raises (PolicyMismatch); + + CatalogBase get_persistence (in _TypeId catalog_type_id) + raises (PersistenceNotAvailable); + }; + + local interface ProxyHomeRegistration : HomeRegistration + { + void register_proxy_home (in CCMHome rhome, + in CCMHome ahome) + raises (UnknownActualHome, + ProxyHomeNotSupported); + }; + + local interface Session2Context : SessionContext, CCM2Context + { + Object create_ref (in CORBA::RepositoryId repid); + + Object create_ref_from_oid (in CORBA::OctetSeq oid, + in CORBA::RepositoryId repid); + + CORBA::OctetSeq get_oid_from_ref (in Object objref) + raises (IllegalState, + BadComponentReference); + }; + + abstract valuetype StateIdValue + { + StateIdType get_sid_type(); + IdData get_sid_data(); + }; + + local interface StateIdFactory + { + StateIdValue create (in IdData data) + raises (InvalidStateIdData); + }; + + valuetype PersistentIdValue : StateIdValue + { + private PersistentId pid; + + PersistentId get_pid(); + factory init (in PersistentId pid); + }; + + valuetype SegmentDescr + { + private StateIdValue sid; + private SegmentId seg; + + StateIdValue get_sid(); + SegmentId get_seg_id(); + factory init (in StateIdValue sid, + in SegmentId seg); + }; + + typedef sequence<SegmentDescr> SegmentDescrSeq; + + local interface ComponentId + { + FacetId get_target_facet(); + + SegmentId get_target_segment(); + + StateIdValue get_target_state_id (in StateIdFactory sid_factory) + raises (InvalidStateIdData); + + StateIdValue get_segment_state_id (in SegmentId seg, + in StateIdFactory sid_factory) + raises (InvalidStateIdData); + + ComponentId create_with_new_target (in FacetId new_target_facet, + in SegmentId new_target_segment); + + SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory) + raises (InvalidStateIdData); + }; + + local interface Entity2Context : EntityContext, CCM2Context + { + ComponentId get_component_id () + raises (IllegalState); + + ComponentId create_component_id (in FacetId target_facet, + in SegmentId target_segment, + in SegmentDescrSeq seq_descrs); + + ComponentId create_monolithic_component_id (in FacetId target_facet, + in StateIdValue sid); + + Object create_ref_from_cid (in CORBA::RepositoryId repid, + in ComponentId cid); + + ComponentId get_cid_from_ref (in Object objref) + raises (BadComponentReference); + }; + + local interface ExecutorLocator : EnterpriseComponent + { + Object obtain_executor (in string name) + raises (CCMException); + + void release_executor (in Object exc) + raises (CCMException); + + void configuration_complete() + raises (InvalidConfiguration); + }; +}; #endif /* CCM_CONTAINER_EX_IDL */ diff --git a/CIAO/ciao/CCM_Context.idl b/CIAO/ciao/CCM_Context.idl deleted file mode 100644 index 3250ca32264..00000000000 --- a/CIAO/ciao/CCM_Context.idl +++ /dev/null @@ -1,38 +0,0 @@ -// $Id$ - -#if !defined (CCM_CONTEXT_IDL) -#define CCM_CONTEXT_IDL - -#include "ciao/Security.idl" -#include "ciao/CCM_Transaction.idl" -#include "ciao/CCM_Home.idl" - -// *************** Basic Container interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - typedef SecurityLevel2::Credentials Principal; - - exception IllegalState {}; - - local interface CCMContext - { - Principal get_caller_principal(); - - CCMHome get_CCM_home(); - - boolean get_rollback_only() - raises (IllegalState); - - Transaction::UserTransaction get_user_transaction() - raises (IllegalState); - - boolean is_caller_in_role (in string role); - - void set_rollback_only() - raises (IllegalState); - }; -}; -#endif /* CCM_CONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_Cookie.idl b/CIAO/ciao/CCM_Cookie.idl deleted file mode 100644 index f815d9f1ef9..00000000000 --- a/CIAO/ciao/CCM_Cookie.idl +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl - * tao_idl -I ../.. \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Base.idl - */ - -#if !defined (CCM_COOKIE_IDL) -#define CCM_COOKIE_IDL - -#include "tao/OctetSeq.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - valuetype Cookie - { - private CORBA::OctetSeq cookieValue; - }; -}; -#endif /* CCM_COOKIE_IDL */ diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc index 5bd4fa487ba..339c4d2f387 100644 --- a/CIAO/ciao/CCM_Core.mpc +++ b/CIAO/ciao/CCM_Core.mpc @@ -8,70 +8,23 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client { idlflags += -Wb,skel_export_macro=CIAO_CONTAINER_Export // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT) + includes += $(CIAO_ROOT)/DAnCE dynamicflags = CIAO_CLIENT_BUILD_DLL IDL_Files { - idlflags += -SS -Sci CCM_Base.idl + CCM_Event.idl CCM_Component.idl - } - - IDL_Files { - idlflags += -SS - CCM_Cookie.idl - CCM_Enumeration.idl - } - - IDL_Files { - idlflags += -Ssi -Sci - Components.idl - } - - IDL_Files { - CCM_HomeConfiguration.idl - CCM_StandardConfigurator.idl - CCM_Home.idl - CCM_Object.idl - CCM_PrimaryKeyBase.idl - } - - IDL_Files { - idlflags += -Ssi - CCM_HomeFinder.idl - CCM_Configurator.idl - CCM_KeylessCCMHome.idl - CCM_Navigation.idl - CCM_Receptacle.idl - } - - IDL_Files { - CCM_Events.idl - CCM_EventBase.idl - CCM_EventConsumerBase.idl + CIAO_Value.idl } Source_Files { CCM_BaseC.cpp - CCM_EventsC.cpp - CCM_EventBaseC.cpp - CCM_EventConsumerBaseC.cpp + CCM_EventC.cpp CCM_ComponentC.cpp - CCM_EnumerationC.cpp - CCM_HomeC.cpp - CCM_ConfiguratorC.cpp - CCM_HomeConfigurationC.cpp - CCM_KeylessCCMHomeC.cpp - CCM_StandardConfiguratorC.cpp - CCM_HomeFinderC.cpp - CCM_NavigationC.cpp - CCM_ReceptacleC.cpp - CCM_CookieC.cpp - CCM_ObjectC.cpp - CCM_PrimaryKeyBaseC.cpp + CIAO_ValueC.cpp Client_init.cpp - ComponentsC.cpp } Header_Files { @@ -80,93 +33,35 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client { } } -project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro { +project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc { sharedname = CIAO_DnC_Container idlflags += -Wb,export_include=CIAO_Container_Export.h idlflags += -Wb,export_macro=CIAO_CONTAINER_Export dynamicflags = CIAO_CONTAINER_BUILD_DLL // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT) - - IDL_Files { - idlflags += -SS -Sci \ - -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL - Security.idl - } - - IDL_Files { - idlflags += -SS -Sci - CCM_Context.idl - CCM_CCMException.idl - CCM_EntityComponent.idl - CCM_EntityContext.idl - CIAO_SwapExec.idl - CIAO_UpgradeableContext.idl - } + includes += $(CIAO_ROOT)/DAnCE IDL_Files { - idlflags += -SS - CCM_CCM2Context.idl - CCM_ProxyHomeRegistration.idl - CCM_Session2Context.idl CCM_Transaction.idl CosPersistentState.idl CCM_Container.idl - CCM_SessionContext.idl - CCM_SessionComponent.idl CCM_Container_Ex.idl - CCM_StateIdFactory.idl - CCM_Entity2Context.idl - CCM_ComponentId.idl - CCM_ExecutorLocator.idl - CCM_EnterpriseComponent.idl - CCM_SessionSynchronization.idl - CCM_HomeRegistration.idl - CCM_HomeExecutorBase.idl + SwapExec.idl + UpgradeableContext.idl } Source_Files { CCM_TransactionC.cpp CosPersistentStateC.cpp CCM_ContainerC.cpp - CCM_SessionContextC.cpp - CCM_SessionComponentC.cpp - CCM_EnterpriseComponentC.cpp - CCM_SessionSynchronizationC.cpp - CCM_CCMExceptionC.cpp - CCM_ContextC.cpp - SecurityC.cpp CCM_Container_ExC.cpp - CCM_StateIdFactoryC.cpp - CCM_ComponentIdC.cpp - CCM_Entity2ContextC.cpp - CCM_ExecutorLocatorC.cpp - CCM_ProxyHomeRegistrationC.cpp - CCM_Session2ContextC.cpp - CCM_CCM2ContextC.cpp - CCM_HomeRegistrationC.cpp - CCM_HomeExecutorBaseC.cpp - CCM_EntityContextC.cpp - CCM_EntityComponentC.cpp - CCM_EventsS.cpp - CCM_EventConsumerBaseS.cpp - CCM_EventBaseS.cpp - CCM_ConfiguratorS.cpp - CCM_HomeConfigurationS.cpp - CCM_KeylessCCMHomeS.cpp - CCM_StandardConfiguratorS.cpp - CCM_HomeS.cpp - CCM_ObjectS.cpp - CCM_PrimaryKeyBaseS.cpp - CCM_HomeFinderS.cpp - CCM_NavigationS.cpp - CCM_ReceptacleS.cpp - CIAO_SwapExecC.cpp - CIAO_UpgradeableContextC.cpp + CCM_BaseS.cpp + CCM_EventS.cpp + CCM_ComponentS.cpp + SwapExecC.cpp + UpgradeableContextC.cpp Cookies.cpp - ComponentsS.cpp } } @@ -177,7 +72,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b sharedname = CIAO_Deployment_stub // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT) + includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT) idlflags += -Wb,stub_export_macro=Deployment_stub_Export idlflags += -Wb,stub_export_include=Deployment_stub_export.h @@ -187,67 +82,43 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b dynamicflags = DEPLOYMENT_STUB_BUILD_DLL IDL_Files { - idlflags += -SS -Sci - Deployment_Packaging_Data.idl - Deployment_Target_Data.idl - } - - IDL_Files { - idlflags += -SS + NodeApplication_CallBack.idl + Deployment_Core.idl Deployment_Base.idl - Deployment_Connection.idl Deployment_Data.idl - Deployment_DeploymentPlan.idl - Deployment_TargetData.idl - Deployment_Events.idl - CIAO_ServerResources.idl - } - - IDL_Files { - Deployment_TargetManager.idl - CIAO_NodeApplication_CallBack.idl - Deployment_Core.idl - Deployment_NodeApplication.idl - Deployment_Application.idl - Deployment_Container.idl + Packaging_Data.idl + Target_Data.idl Deployment.idl - Deployment_NodeManager.idl - Deployment_ApplicationManager.idl - Deployment_NodeApplicationManager.idl - Deployment_DomainApplicationManager.idl - Deployment_ExecutionManager.idl - Deployment_RepositoryManager.idl + NodeManager.idl + NodeApplicationManager.idl + DomainApplicationManager.idl + ExecutionManager.idl + RepositoryManager.idl + ServerResources.idl + Deployment_Events.idl } Source_Files { Deployment_CoreC.cpp Deployment_BaseC.cpp - Deployment_ConnectionC.cpp Deployment_DataC.cpp - Deployment_DeploymentPlanC.cpp - Deployment_TargetDataC.cpp - Deployment_NodeApplicationC.cpp - Deployment_ApplicationC.cpp - Deployment_ContainerC.cpp - Deployment_Packaging_DataC.cpp - Deployment_Target_DataC.cpp + Packaging_DataC.cpp + Target_DataC.cpp DeploymentC.cpp - Deployment_TargetManagerC.cpp - Deployment_NodeManagerC.cpp - Deployment_NodeApplicationManagerC.cpp - Deployment_ApplicationManagerC.cpp - Deployment_DomainApplicationManagerC.cpp - Deployment_ExecutionManagerC.cpp - Deployment_RepositoryManagerC.cpp - CIAO_NodeApplication_CallBackC.cpp - CIAO_ServerResourcesC.cpp + NodeManagerC.cpp + NodeApplicationManagerC.cpp + DomainApplicationManagerC.cpp + ExecutionManagerC.cpp + RepositoryManagerC.cpp + NodeApplication_CallBackC.cpp + ServerResourcesC.cpp Deployment_EventsC.cpp } } // CIAO_DnC_Client library must be linked for this project. // Please don't remove. -project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc, naming { +project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc { sharedname = CIAO_Deployment_svnt dynamicflags = DEPLOYMENT_SVNT_BUILD_DLL idlflags += -Wb,stub_export_macro=Deployment_stub_Export @@ -256,37 +127,40 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien idlflags += -Wb,skel_export_include=Deployment_svnt_export.h // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT) + includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT) IDL_Files { } Source_Files { Deployment_CoreS.cpp - Deployment_ApplicationS.cpp - Deployment_NodeApplicationS.cpp - Deployment_ContainerS.cpp + Deployment_BaseS.cpp + Deployment_DataS.cpp + Packaging_DataS.cpp + Target_DataS.cpp DeploymentS.cpp - Deployment_RepositoryManagerS.cpp - Deployment_NodeManagerS.cpp - Deployment_NodeApplicationManagerS.cpp - Deployment_ApplicationManagerS.cpp - Deployment_DomainApplicationManagerS.cpp - Deployment_ExecutionManagerS.cpp + RepositoryManagerS.cpp + NodeManagerS.cpp + NodeApplicationManagerS.cpp + DomainApplicationManagerS.cpp + ExecutionManagerS.cpp NodeApp_CB_Impl.cpp - Deployment_TargetManagerS.cpp - CIAO_NodeApplication_CallBackS.cpp + NodeApplication_CallBackS.cpp + ServerResourcesS.cpp + Deployment_EventsS.cpp } } -project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt { + includes += $(CIAO_ROOT)/ciao includes += $(CIAO_ROOT) sharedname = CIAO_DnC_Server idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export dynamicflags = CIAO_SERVER_BUILD_DLL IDL_Files { + } Source_Files { diff --git a/CIAO/ciao/CCM_EnterpriseComponent.idl b/CIAO/ciao/CCM_EnterpriseComponent.idl deleted file mode 100644 index b3f3d1b9432..00000000000 --- a/CIAO/ciao/CCM_EnterpriseComponent.idl +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_ENTERPRISECOMPONENT_IDL) -#define CCM_ENTERPRISECOMPONENT_IDL - -module Components -{ - typeprefix Components "omg.org"; - - local interface EnterpriseComponent {}; -}; -#endif /* CCM_CONTAINER_IDL */ diff --git a/CIAO/ciao/CCM_Entity2Context.idl b/CIAO/ciao/CCM_Entity2Context.idl deleted file mode 100644 index 4ed01244408..00000000000 --- a/CIAO/ciao/CCM_Entity2Context.idl +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_ENTITY2CONTEXT_IDL) -#define CCM_ENTITY2CONTEXT_IDL - -#include "ciao/CCM_Session2Context.idl" -#include "ciao/CCM_EntityContext.idl" -#include "ciao/CCM_ComponentId.idl" - -// *************** Extended Container Interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - local interface Entity2Context : EntityContext, CCM2Context - { - ComponentId get_component_id () - raises (IllegalState); - - ComponentId create_component_id (in FacetId target_facet, - in SegmentId target_segment, - in SegmentDescrSeq seq_descrs); - - ComponentId create_monolithic_component_id (in FacetId target_facet, - in StateIdValue sid); - - Object create_ref_from_cid (in CORBA::RepositoryId repid, - in ComponentId cid); - - ComponentId get_cid_from_ref (in Object objref) - raises (BadComponentReference); - }; -}; -#endif /* CCM_ENTITY2CONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_EntityComponent.idl b/CIAO/ciao/CCM_EntityComponent.idl deleted file mode 100644 index 0b04ad7131a..00000000000 --- a/CIAO/ciao/CCM_EntityComponent.idl +++ /dev/null @@ -1,51 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_ENTITYCOMPONENT_IDL) -#define CCM_ENTITYCOMPONENT_IDL - -#include "ciao/CCM_CCMException.idl" -#include "ciao/CCM_EnterpriseComponent.idl" -#include "ciao/CCM_EntityContext.idl" - -module Components -{ - typeprefix Components "omg.org"; - - local interface EntityComponent : EnterpriseComponent - { - void set_entity_context (in EntityContext ctx) - raises (CCMException); - - void unset_entity_context () - raises (CCMException); - - void ccm_activate () - raises (CCMException); - - void ccm_load () - raises (CCMException); - - void ccm_store () - raises (CCMException); - - void ccm_passivate () - raises (CCMException); - - void ccm_remove () - raises (CCMException); - }; -}; -#endif /* CCM_ENTITYCOMPONENT_IDL */ diff --git a/CIAO/ciao/CCM_EntityContext.idl b/CIAO/ciao/CCM_EntityContext.idl deleted file mode 100644 index ee02b728afb..00000000000 --- a/CIAO/ciao/CCM_EntityContext.idl +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_ENTITYCONTEXT_IDL) -#define CCM_ENTITYCONTEXT_IDL - -#include "ciao/CCM_Context.idl" -#include "ciao/CCM_Object.idl" - -module Components -{ - typeprefix Components "omg.org"; - - local interface EntityContext : CCMContext - { - Object get_CCM_object () - raises (IllegalState); - - PrimaryKeyBase get_primary_key () - raises (IllegalState); - }; -}; -#endif /* CCM_ENTITYCONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_Enumeration.idl b/CIAO/ciao/CCM_Enumeration.idl deleted file mode 100644 index 55d64b68e07..00000000000 --- a/CIAO/ciao/CCM_Enumeration.idl +++ /dev/null @@ -1,38 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_ENUMERATION_IDL) -#define CCM_ENUMERATION_IDL - -#include "ciao/CCM_Object.idl" - -module Components -{ - typeprefix Components "omg.org"; - - /// @@ Enumeration and DefaultEnumeration are only for EJB to CCM - /// mapping? At any rate, we should be able to skip them for now. - abstract valuetype Enumeration - { - boolean has_more_elements(); - CCMObject next_element(); - }; - - typedef sequence<CCMObject> CCMObjectSeq; - - valuetype DefaultEnumeration : Enumeration - { - private CCMObjectSeq objects; - }; -}; -#endif /* CCM_ENUMERATION_IDL */ diff --git a/CIAO/ciao/CCM_Events.idl b/CIAO/ciao/CCM_Event.idl index 4abc6ca4115..f6a4755f8f1 100644 --- a/CIAO/ciao/CCM_Events.idl +++ b/CIAO/ciao/CCM_Event.idl @@ -13,20 +13,35 @@ //#define CIAO_HAS_IMPORT_KEYWORD -#if !defined (CCM_EVENTS_IDL) -#define CCM_EVENTS_IDL +#if !defined (CCM_EVENT_IDL) +#define CCM_EVENT_IDL -#include "ciao/CCM_Base.idl" -#include "ciao/CCM_Navigation.idl" -#include "ciao/CCM_Receptacle.idl" -#include "ciao/CCM_Cookie.idl" -#include "ciao/CCM_EventBase.idl" -#include "ciao/CCM_EventConsumerBase.idl" +#include "CCM_Base.idl" module Components { typeprefix Components "omg.org"; + abstract valuetype EventBase {}; + + interface EventConsumerBase + { + void push_event (in EventBase evt) raises (BadEventType); + + // CIAO-specific operation to treat event service as regular event + // sink port. The source_id needs to be passed in to identify the + // source of the publisher port to support event filtering mechanism. + void ciao_push_event (in Components::EventBase evt, + in string source_id, + in CORBA::TypeCode tc) + raises (BadEventType); + + // CIAO-specific operation to help support the capability + // to subscribe to eventtypes more derived than the type + // consumed. + boolean ciao_is_substitutable (in string event_repo_id); + }; + valuetype ConsumerDescription : PortDescription { public EventConsumerBase consumer; @@ -59,7 +74,7 @@ module Components /** * @todo Mismatch with 06-04-01, AlreadyConnected is not listed in the - * spec with this operation. + * spec with this operation */ Cookie subscribe (in FeatureName publisher_name, in EventConsumerBase subscriber) diff --git a/CIAO/ciao/CCM_EventBase.idl b/CIAO/ciao/CCM_EventBase.idl deleted file mode 100644 index e97a474802a..00000000000 --- a/CIAO/ciao/CCM_EventBase.idl +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Event.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_EVENTBASE_IDL) -#define CCM_EVENTBASE_IDL - -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype EventBase {}; -}; -#endif /* CCM_EVENTBASE_IDL */ diff --git a/CIAO/ciao/CCM_EventConsumerBase.idl b/CIAO/ciao/CCM_EventConsumerBase.idl deleted file mode 100644 index 0e1facf5940..00000000000 --- a/CIAO/ciao/CCM_EventConsumerBase.idl +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Event.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_EVENTCONSUMERBASE_IDL) -#define CCM_EVENTCONSUMERBASE_IDL - -#include "ciao/CCM_EventBase.idl" -#include "tao/Typecode_types.pidl" -#include "tao/orb_types.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - exception BadEventType - { - CORBA::RepositoryId expected_event_type; - }; - - interface EventConsumerBase - { - void push_event (in EventBase evt) raises (BadEventType); - - // CIAO-specific operation to treat event service as regular event - // sink port. The source_id needs to be passed in to identify the - // source of the publisher port to support event filtering mechanism. - void ciao_push_event (in EventBase evt, - in string source_id, - in CORBA::TypeCode tc) - raises (BadEventType); - - // CIAO-specific operation to help support the capability - // to subscribe to eventtypes more derived than the type - // consumed. - boolean ciao_is_substitutable (in string event_repo_id); - }; -}; -#endif /* CCM_EVENTCONSUMERBASE_IDL */ diff --git a/CIAO/ciao/CCM_ExecutorLocator.idl b/CIAO/ciao/CCM_ExecutorLocator.idl deleted file mode 100644 index a764225af7c..00000000000 --- a/CIAO/ciao/CCM_ExecutorLocator.idl +++ /dev/null @@ -1,39 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -#if !defined (CCM_EXECUTORLOCATOR_IDL) -#define CCM_EXECUTORLOCATOR_IDL - -#include "ciao/CCM_EnterpriseComponent.idl" -#include "ciao/CCM_CCMException.idl" -#include "ciao/CCM_Object.idl" - -// *************** Extended Container Interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - local interface ExecutorLocator : EnterpriseComponent - { - Object obtain_executor (in string name) - raises (CCMException); - - void release_executor (in Object exc) - raises (CCMException); - - void configuration_complete() - raises (InvalidConfiguration); - }; -}; -#endif /* CCM_EXECUTORLOCATOR_IDL */ diff --git a/CIAO/ciao/CCM_ExtensionComponent.idl b/CIAO/ciao/CCM_ExtensionComponent.idl deleted file mode 100644 index 585e5e85f64..00000000000 --- a/CIAO/ciao/CCM_ExtensionComponent.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -#if !defined (CCM_EXTENSIONCOMPONENT_IDL) -#define CCM_EXTENSIONCOMPONENT_IDL - -#include "ciao/CCM_EnterpriseComponent.idl" -#include "ciao/CCM_ExtensionContext.idl" - -module Components -{ - local interface ExtensionComponent : EnterpriseComponent - { - void set_extension_context (in ExtensionContext ctx) - raises (CCMException); - void ccm_remove () - raises (CCMException); - }; -}; - -#endif /* CCM_EXTENSIONCOMPONENT_IDL */ diff --git a/CIAO/ciao/CCM_ExtensionContext.idl b/CIAO/ciao/CCM_ExtensionContext.idl deleted file mode 100644 index 33fa969b436..00000000000 --- a/CIAO/ciao/CCM_ExtensionContext.idl +++ /dev/null @@ -1,37 +0,0 @@ -// $Id$ - -#if !defined (CCM_EXTENSIONCONTEXT_IDL) -#define CCM_EXTENSIONCONTEXT_IDL - -#include "ciao/CCM_Context.idl" -#include "ciao/CCM_ClientContainerInterceptorRegistration.idl" -#include "ciao/CCM_ServerContainerInterceptorRegistration.idl" -#include "ciao/CCM_StubContainerInterceptorRegistration.idl" -#include "ciao/CCM_ServantContainerInterceptorRegistration.idl" -#include "ciao/CCM_CCMException.idl" - -module Components -{ - local interface ExtensionContext : CCMContext - { - Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration - get_client_interceptor_registration () - raises (CCMException); - Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration - get_server_interceptor_registration () - raises (CCMException); - Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration - get_stub_interceptor_registration() - raises (CCMException); - Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration - get_servant_interceptor_registration() - raises (CCMException); - - Cookie install_service_reference(in string service_id, in Object objref) - raises (CCMException); - Object uninstall_service_reference(in Cookie ck) - raises (CCMException); - }; -}; - -#endif /* CCM_EXTENSIONCONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_Home.idl b/CIAO/ciao/CCM_Home.idl deleted file mode 100644 index 192188dda3d..00000000000 --- a/CIAO/ciao/CCM_Home.idl +++ /dev/null @@ -1,52 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_HOME_IDL) -#define CCM_HOME_IDL - -#include "tao/IFR_Client/IFR_Base.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - typedef unsigned long FailureReason; - - exception CreateFailure { - FailureReason reason; - }; - exception FinderFailure - { - FailureReason reason; - }; - exception RemoveFailure - { - FailureReason reason; - }; - - exception DuplicateKeyValue {}; - exception InvalidKey {}; - exception UnknownKeyValue {}; - - interface CCMObject; - - interface CCMHome - { - CORBA::IRObject get_component_def (); - CORBA::IRObject get_home_def (); - void remove_component ( in CCMObject comp) - raises (RemoveFailure); - }; -}; - -#endif /* CCM_HOME_IDL */ diff --git a/CIAO/ciao/CCM_HomeConfiguration.idl b/CIAO/ciao/CCM_HomeConfiguration.idl deleted file mode 100644 index d3d488ae11b..00000000000 --- a/CIAO/ciao/CCM_HomeConfiguration.idl +++ /dev/null @@ -1,33 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_HOMECONFIGURATION_IDL) -#define CCM_HOMECONFIGURATION_IDL - -#include "ciao/CCM_Configurator.idl" -#include "ciao/CCM_StandardConfigurator.idl" -#include "ciao/CCM_Home.idl" - -module Components -{ - typeprefix Components "omg.org"; - - interface HomeConfiguration : CCMHome - { - void set_configurator (in Configurator cfg); - void set_configuration_values (in ConfigValues config); - void complete_component_configuration (in boolean b); - void disable_home_configuration(); - }; -}; -#endif /* CCM_HOMECONFIGURATOR_IDL */ diff --git a/CIAO/ciao/CCM_HomeExecutorBase.idl b/CIAO/ciao/CCM_HomeExecutorBase.idl deleted file mode 100644 index e1db55b9afc..00000000000 --- a/CIAO/ciao/CCM_HomeExecutorBase.idl +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_HOMEEXECUTORBASE_IDL) -#define CCM_HOMEEXECUTORBASE_IDL - -module Components -{ - typeprefix Components "omg.org"; - - local interface HomeExecutorBase - { - }; -}; -#endif /* CCM_HOMEEXECUTORBASE_IDL */ diff --git a/CIAO/ciao/CCM_HomeFinder.idl b/CIAO/ciao/CCM_HomeFinder.idl deleted file mode 100644 index f5ffca44442..00000000000 --- a/CIAO/ciao/CCM_HomeFinder.idl +++ /dev/null @@ -1,39 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_HomeFinder.idl - */ - -#if !defined (CCM_HOMEFINDER_IDL) -#define CCM_HOMEFINDER_IDL - -#include "tao/orb_types.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - exception HomeNotFound {}; - - interface CCMHome; - - interface HomeFinder - { - CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid) - raises (HomeNotFound); - - CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid) - raises (HomeNotFound); - - CCMHome find_home_by_name (in string home_name) - raises (HomeNotFound); - }; -}; -#endif /* CCM_HOMEFINDER_IDL */ diff --git a/CIAO/ciao/CCM_HomeRegistration.idl b/CIAO/ciao/CCM_HomeRegistration.idl deleted file mode 100644 index e7ee299e11c..00000000000 --- a/CIAO/ciao/CCM_HomeRegistration.idl +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_HOMEREGISTRATION_IDL) -#define CCM_HOMEREGISTRATION_IDL - -#include "ciao/CCM_Home.idl" - -module Components -{ - typeprefix Components "omg.org"; - - local interface HomeRegistration - { - void register_home (in CCMHome home_ref, - in string home_name); - - void unregister_home (in CCMHome home_ref); - }; - -}; -#endif /* CCM_HOMEREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_InvalidRegistration.idl b/CIAO/ciao/CCM_InvalidRegistration.idl deleted file mode 100644 index a5dc36c640e..00000000000 --- a/CIAO/ciao/CCM_InvalidRegistration.idl +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#if !defined (CCM_INVALIDREGISTRATION_IDL) -#define CCM_INVALIDREGISTRATION_IDL - -module Components -{ - module ContainerPortableInterceptor - { - exception InvalidRegistration { }; - }; -}; - -#endif /* CCM_INVALIDREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_KeylessCCMHome.idl b/CIAO/ciao/CCM_KeylessCCMHome.idl deleted file mode 100644 index 747c45a5117..00000000000 --- a/CIAO/ciao/CCM_KeylessCCMHome.idl +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_KEYLESSCCMHOME_IDL) -#define CCM_KEYLESSCCMHOME_IDL - -#include "ciao/CCM_Home.idl" - -module Components -{ - typeprefix Components "omg.org"; - - interface KeylessCCMHome - { - CCMObject create_component() - raises (CreateFailure); - }; - -}; -#endif /* CCM_KEYLESSCCMHOME_IDL */ diff --git a/CIAO/ciao/CCM_Navigation.idl b/CIAO/ciao/CCM_Navigation.idl deleted file mode 100644 index 53b74e2a10c..00000000000 --- a/CIAO/ciao/CCM_Navigation.idl +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl - * tao_idl -I ../.. \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Navigation.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_NAVIGATION_IDL) -#define CCM_NAVIGATION_IDL - -#include "tao/orb_types.pidl" -#include "tao/StringSeq.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - typedef string FeatureName; - typedef sequence<FeatureName> NameList; - - valuetype PortDescription - { - public FeatureName name; - public CORBA::RepositoryId type_id; - }; - - valuetype FacetDescription : PortDescription - { - public Object facet_ref; - }; - - typedef sequence<FacetDescription> FacetDescriptions; - - exception InvalidName {}; - interface Navigation - { - Object provide_facet (in FeatureName name) - raises (InvalidName); - FacetDescriptions get_all_facets(); - FacetDescriptions get_named_facets (in NameList names) - raises (InvalidName); - boolean same_component (in Object object_ref); - }; -}; -#endif /* CCM_NAVIGATION_IDL */ diff --git a/CIAO/ciao/CCM_Object.idl b/CIAO/ciao/CCM_Object.idl deleted file mode 100644 index fc869afa97c..00000000000 --- a/CIAO/ciao/CCM_Object.idl +++ /dev/null @@ -1,106 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_OBJECT_IDL) -#define CCM_OBJECT_IDL - -#include "ciao/CCM_Events.idl" -#include "ciao/CCM_Navigation.idl" -#include "ciao/CCM_Home.idl" -#include "ciao/CCM_PrimaryKeyBase.idl" - -module Components -{ - typeprefix Components "omg.org"; - - /// This typedef and consts shouldn't be here but are here because of CIAO - /// specific additions - typedef FailureReason InvalidConfigurationReason; - const InvalidConfigurationReason UnknownConfigValueName = 0; - const InvalidConfigurationReason InvalidConfigValueType = 1; - const InvalidConfigurationReason ConfigValueRequired = 2; - const InvalidConfigurationReason ConfigValueNotExpected = 3; - - /// Shouldn't be here but is now here because of CIAO additions - exception InvalidConfiguration - { - InvalidConfigurationReason reason; - FeatureName name; - }; - - valuetype ComponentPortDescription - { - public FacetDescriptions facets; - public ReceptacleDescriptions receptacles; - public ConsumerDescriptions consumers; - public EmitterDescriptions emitters; - public PublisherDescriptions publishers; - }; - - /// CIAO specific forward declaration, shouldn't be here - interface StandardConfigurator; - - exception NoKeyAvailable {}; - - interface CCMObject : Navigation, Receptacles, Events - { - CORBA::IRObject get_component_def ( ); - CCMHome get_ccm_home( ); - PrimaryKeyBase get_primary_key( ) - raises (NoKeyAvailable); - void configuration_complete () - raises (InvalidConfiguration); - void remove() - raises (RemoveFailure); - ComponentPortDescription get_all_ports (); - - /// Factory method to return a StandardConfigurator interface. - /// CIAO specific - StandardConfigurator get_standard_configurator ( ); - - /// CIAO specific operations to have some control on when and how - /// to activate components. - /** - * This is all from our work on ARMS where we needed to know whether - * every component has been configured, say for example to use - * logging in the assembly which could in turn be provided by a - * component. To get around all this we are adding some methods on - * this till we think of some standard way to do this. The problem - * is that the deployer should be able to call this as opposed to - * the home calling it as soon as the component is created. - * - * All these operations are called in the order mentioned, ie. the - * deployer calls ciao_preactivate () on all components, then - * ciao_activate and then ciao_postactivate (). The speciality is - * that these operations would be invoked on every target object - * before the next call is made. It is similar to the way - * portable interceptors work, trying to get everything onto the - * flow stack, but differ in the intention. - */ - void ciao_preactivate () - raises (InvalidConfiguration); - - /// CIAO specific - void ciao_activate () - raises (InvalidConfiguration); - - /// CIAO specific - void ciao_postactivate () - raises (InvalidConfiguration); - - /// CIAO specific - void ciao_passivate () - raises (InvalidConfiguration); - }; -}; -#endif /* CCM_OBJECT_IDL */ diff --git a/CIAO/ciao/CCM_PrimaryKeyBase.idl b/CIAO/ciao/CCM_PrimaryKeyBase.idl deleted file mode 100644 index 4730208b2f9..00000000000 --- a/CIAO/ciao/CCM_PrimaryKeyBase.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_PRIMARYKEYBASE_IDL) -#define CCM_PRIMARYKEYBASE_IDL - -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype PrimaryKeyBase {}; - -}; -#endif /* CCM_PRIMARYKEYBASE_IDL */ diff --git a/CIAO/ciao/CCM_ProxyHomeRegistration.idl b/CIAO/ciao/CCM_ProxyHomeRegistration.idl deleted file mode 100644 index 084b113a50d..00000000000 --- a/CIAO/ciao/CCM_ProxyHomeRegistration.idl +++ /dev/null @@ -1,36 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_PROXYHOMEREGISTRATION_IDL) -#define CCM_PROXYHOMEREGISTRATION_IDL - -#include "ciao/CCM_HomeRegistration.idl" - -module Components -{ - typeprefix Components "omg.org"; - - exception UnknownActualHome {}; - exception ProxyHomeNotSupported {}; - - local interface ProxyHomeRegistration : HomeRegistration - { - void register_proxy_home (in CCMHome rhome, - in CCMHome ahome) - raises (UnknownActualHome, - ProxyHomeNotSupported); - }; -}; -#endif /* CCM_PROXYHOMEREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_QoS.idl b/CIAO/ciao/CCM_QoS.idl deleted file mode 100644 index f78f98d3665..00000000000 --- a/CIAO/ciao/CCM_QoS.idl +++ /dev/null @@ -1,31 +0,0 @@ -// $Id$ - -#if !defined (CCM_QOS_IDL) -#define CCM_QOS_IDL - -#include "ciao/CCM_Cookie.idl" -#include "ciao/CCM_CCMException.idl" - -module Components -{ - module QoS { - struct QoSInstance { - string dimension; - any value; - }; - typedef sequence<QoSInstance> QoSInstances; - struct QoSConstraint { - string characteristic; - QoSInstances instances; - }; - typedef sequence<QoSConstraint> QoSConstraints; - interface Negotiation - { - Components::Cookie require_qos(in QoSConstraint requirements, in string client_id) - raises (CCMException); - void release_qos (in Components::Cookie ck); - }; - }; -}; - -#endif /* CCM_QOS_IDL */ diff --git a/CIAO/ciao/CCM_Receptacle.idl b/CIAO/ciao/CCM_Receptacle.idl deleted file mode 100644 index 2ed7863b349..00000000000 --- a/CIAO/ciao/CCM_Receptacle.idl +++ /dev/null @@ -1,68 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl - * tao_idl -I ../.. \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Base.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_RECEPTACLE_IDL) -#define CCM_RECEPTACLE_IDL - -#include "ciao/CCM_Base.idl" -#include "ciao/CCM_Navigation.idl" -#include "ciao/CCM_Cookie.idl" - -module Components -{ - typeprefix Components "omg.org"; - - valuetype ConnectionDescription - { - public Cookie ck; - public Object objref; - }; - typedef sequence<ConnectionDescription> ConnectionDescriptions; - - valuetype ReceptacleDescription : PortDescription - { - public boolean is_multiple; - public ConnectionDescriptions connections; - }; - typedef sequence<ReceptacleDescription> ReceptacleDescriptions; - - exception ExceededConnectionLimit {}; - exception CookieRequired {}; - - interface Receptacles - { - Cookie connect (in FeatureName name, in Object connection ) - raises (InvalidName, - InvalidConnection, - AlreadyConnected, - ExceededConnectionLimit); - - Object disconnect (in FeatureName name, in Cookie ck) - raises (InvalidName, - InvalidConnection, - CookieRequired, - NoConnection); - - ConnectionDescriptions get_connections (in FeatureName name) - raises (InvalidName); - - ReceptacleDescriptions get_all_receptacles (); - - ReceptacleDescriptions get_named_receptacles (in NameList names) - raises (InvalidName); - }; -}; -#endif /* CCM_RECEPTACLE_IDL */ diff --git a/CIAO/ciao/CCM_ServantContainerInterceptor.idl b/CIAO/ciao/CCM_ServantContainerInterceptor.idl deleted file mode 100644 index 884a1af2599..00000000000 --- a/CIAO/ciao/CCM_ServantContainerInterceptor.idl +++ /dev/null @@ -1,26 +0,0 @@ -// $Id$ - -#if !defined (CCM_SERVANTCONTAINERINTERCEPTOR_IDL) -#define CCM_SERVANTCONTAINERINTERCEPTOR_IDL - -#include "ciao/CCM_ContainerInterceptor.idl" -#include "ciao/CCM_ContainerServantRequestInfo.idl" -#include "tao/PI/PIForwardRequest.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ServantContainerInterceptor : ContainerInterceptor - { - void servant_receive_request (in ContainerServantRequestInfo info, out boolean proceed_call) - raises (PortableInterceptor::ForwardRequest); - void servant_send_reply (in ContainerServantRequestInfo info, out boolean proceed_call); - void servant_send_exception (in ContainerServantRequestInfo info, out boolean proceed_call) - raises (PortableInterceptor::ForwardRequest); - void servant_send_other (in ContainerServantRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - }; - }; -}; -#endif /* CCM_SERVANTCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl deleted file mode 100644 index 39448de9a58..00000000000 --- a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#if !defined (CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL) -#define CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL - -#include "ciao/CCM_Cookie.idl" -#include "ciao/CCM_InvalidRegistration.idl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ServantContainerInterceptor; - - local interface ServantContainerInterceptorRegistration - { - Components::Cookie register_servant_interceptor (in ServantContainerInterceptor ci); - ServantContainerInterceptor unregister_servant_interceptor (in Components::Cookie cookie) - raises(InvalidRegistration); - }; - }; -}; - -#endif /* CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_ServerContainerInterceptor.idl b/CIAO/ciao/CCM_ServerContainerInterceptor.idl deleted file mode 100644 index 58ce5cc69a7..00000000000 --- a/CIAO/ciao/CCM_ServerContainerInterceptor.idl +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#if !defined (CCM_SERVERCONTAINERINTERCEPTOR_IDL) -#define CCM_SERVERCONTAINERINTERCEPTOR_IDL - -#include "ciao/CCM_ContainerInterceptor.idl" -#include "ciao/CCM_ContainerServerRequestInfo.idl" -#include "tao/PI/PIForwardRequest.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ServerContainerInterceptor : ContainerInterceptor - { - void receive_request_service_contexts (in ContainerServerRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - void receive_request (in ContainerServerRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - void send_reply (in ContainerServerRequestInfo info); - void send_exception (in ContainerServerRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - void send_other (in ContainerServerRequestInfo info) - raises (PortableInterceptor::ForwardRequest); - }; - }; -}; -#endif /* CCM_SERVERCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl deleted file mode 100644 index b4a3dafac26..00000000000 --- a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#if !defined (CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL) -#define CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL - -#include "ciao/CCM_Cookie.idl" -#include "ciao/CCM_InvalidRegistration.idl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface ServerContainerInterceptor; - - local interface ServerContainerInterceptorRegistration - { - Components::Cookie register_server_interceptor (in ServerContainerInterceptor ci); - ServerContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie) - raises(InvalidRegistration); - }; - }; -}; - -#endif /* CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_Session2Context.idl b/CIAO/ciao/CCM_Session2Context.idl deleted file mode 100644 index 8fec0e9441c..00000000000 --- a/CIAO/ciao/CCM_Session2Context.idl +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_SESSION2CONTEXT_IDL) -#define CCM_SESSION2CONTEXT_IDL - -#include "ciao/CCM_CCM2Context.idl" - -// *************** Extended Container Interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - enum BadComponentReferenceReason - { - NON_LOCAL_REFERENCE, - NON_COMPONENT_REFERENCE, - WRONG_CONTAINER - }; - exception BadComponentReference - { - BadComponentReferenceReason reason; - }; - - local interface Session2Context : SessionContext, CCM2Context - { - Object create_ref (in CORBA::RepositoryId repid); - - Object create_ref_from_oid (in CORBA::OctetSeq oid, - in CORBA::RepositoryId repid); - - CORBA::OctetSeq get_oid_from_ref (in Object objref) - raises (IllegalState, - BadComponentReference); - }; -}; -#endif /* CCM_SESSION2CONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_SessionComponent.idl b/CIAO/ciao/CCM_SessionComponent.idl deleted file mode 100644 index c4d72fffa05..00000000000 --- a/CIAO/ciao/CCM_SessionComponent.idl +++ /dev/null @@ -1,62 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_SESSIONCOMPONENT_IDL) -#define CCM_SESSIONCOMPONENT_IDL - -#include "ciao/CCM_SessionContext.idl" -#include "ciao/CCM_CCMException.idl" -#include "ciao/CCM_EnterpriseComponent.idl" - -// *************** Basic Container interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - local interface SessionComponent : EnterpriseComponent - { - void set_session_context ( in SessionContext ctx) - raises (CCMException); - - void ccm_activate() - raises (CCMException); - - void ccm_passivate() - raises (CCMException); - - void ccm_remove () - raises (CCMException); - - /** - * This method is invoked before ccm_activate () is called. All - * components in the assembly get this callback before the - * ccm_activate () is called. - * @note CIAO specific - */ - void ciao_preactivate () - raises (CCMException); - - /** - * This method is invoked after ccm_activate () is called. All - * components in the assembly get this callback after the - * ccm_activate () is called. - * @note CIAO specific - */ - void ciao_postactivate () - raises (CCMException); - }; -}; -#endif /* CCM_SESSIONCOMPONENT_IDL */ diff --git a/CIAO/ciao/CCM_SessionContext.idl b/CIAO/ciao/CCM_SessionContext.idl deleted file mode 100644 index 24820fb5cce..00000000000 --- a/CIAO/ciao/CCM_SessionContext.idl +++ /dev/null @@ -1,31 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_SESSIONCONTEXT_IDL) -#define CCM_SESSIONCONTEXT_IDL - -#include "ciao/CCM_Context.idl" - -module Components -{ - typeprefix Components "omg.org"; - - local interface SessionContext : CCMContext - { - Object get_CCM_object() - raises (IllegalState); - }; -}; -#endif /* CCM_SESSIONCONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_SessionSynchronization.idl b/CIAO/ciao/CCM_SessionSynchronization.idl deleted file mode 100644 index 27614d3e14e..00000000000 --- a/CIAO/ciao/CCM_SessionSynchronization.idl +++ /dev/null @@ -1,39 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_SESSIONSYNCHRONIZATION_IDL) -#define CCM_SESSIONSYNCHRONIZATION_IDL - -#include "ciao/CCM_CCMException.idl" - -// *************** Basic Container interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - local interface SessionSynchronization - { - void after_begin () - raises (CCMException); - - void before_completion () - raises (CCMException); - - void after_completion (in boolean committed) - raises (CCMException); - }; -}; -#endif /* CCM_SESSIONSYNCHRONIZATION_IDL */ diff --git a/CIAO/ciao/CCM_StandardConfigurator.idl b/CIAO/ciao/CCM_StandardConfigurator.idl deleted file mode 100644 index e883c72ad64..00000000000 --- a/CIAO/ciao/CCM_StandardConfigurator.idl +++ /dev/null @@ -1,38 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Component.idl - */ - -#if !defined (CCM_STANDARDCONFIGURATOR_IDL) -#define CCM_STANDARDCONFIGURATOR_IDL - -#include "ciao/CCM_Configurator.idl" -#include "ciao/CCM_Navigation.idl" - -module Components -{ - typeprefix Components "omg.org"; - - valuetype ConfigValue - { - public FeatureName name; - public any value; - }; - - typedef sequence<ConfigValue> ConfigValues; - - interface StandardConfigurator : Configurator - { - void set_configuration (in ConfigValues descr); - }; - -}; -#endif /* CCM_STANDARDCONFIGURATOR_IDL */ diff --git a/CIAO/ciao/CCM_StateIdFactory.idl b/CIAO/ciao/CCM_StateIdFactory.idl deleted file mode 100644 index de6b3b51b13..00000000000 --- a/CIAO/ciao/CCM_StateIdFactory.idl +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ - -/** - * @@ Compile this file with: - * - * tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \ - * -Wb,export_macro=CIAO_Export \ - * -Wb,export_include=CIAO_export.h \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * CCM_Container_Ex.idl - */ - -//#define CIAO_HAS_IMPORT_KEYWORD - -#if !defined (CCM_STATEIDFACTORY) -#define CCM_STATEIDFACTORY - -#include <CosPersistentState.idl> - -module Components -{ - typeprefix Components "omg.org"; - - typedef short SegmentId; - const SegmentId COMPONENT_SEGMENT = 0; - - typedef short FacetId; - const FacetId COMPONENT_FACET = 0; - - typedef sequence<octet> IdData; - typedef CosPersistentState::Pid PersistentId; - - exception InvalidStateIdData {}; - - typedef short StateIdType; - const StateIdType PERSISTENT_ID = 0; - - abstract valuetype StateIdValue - { - StateIdType get_sid_type(); - IdData get_sid_data(); - }; - - local interface StateIdFactory - { - StateIdValue create (in IdData data) - raises (InvalidStateIdData); - }; - - valuetype PersistentIdValue : StateIdValue - { - private PersistentId pid; - PersistentId get_pid(); - factory init (in PersistentId pid); - }; - - valuetype SegmentDescr - { - private StateIdValue sid; - private SegmentId seg; - - StateIdValue get_sid(); - SegmentId get_seg_id(); - factory init (in StateIdValue sid, - in SegmentId seg); - }; - - typedef sequence<SegmentDescr> SegmentDescrSeq; - -}; -#endif /* CCM_STATEIDFACTORY */ diff --git a/CIAO/ciao/CCM_StubContainerInterceptor.idl b/CIAO/ciao/CCM_StubContainerInterceptor.idl deleted file mode 100644 index c183801af86..00000000000 --- a/CIAO/ciao/CCM_StubContainerInterceptor.idl +++ /dev/null @@ -1,26 +0,0 @@ -// $Id$ - -#if !defined (CCM_STUBCONTAINERINTERCEPTOR_IDL) -#define CCM_STUBCONTAINERINTERCEPTOR_IDL - -#include "ciao/CCM_ContainerInterceptor.idl" -#include "ciao/CCM_ContainerStubRequestInfo.idl" -#include "tao/PI/PIForwardRequest.pidl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface StubContainerInterceptor : ContainerInterceptor - { - void stub_send_request (in ContainerStubRequestInfo info, out boolean con) - raises (PortableInterceptor::ForwardRequest); - void stub_receive_reply (in ContainerStubRequestInfo info, out boolean con); - void stub_receive_exception (in ContainerStubRequestInfo info, out boolean con) - raises(PortableInterceptor::ForwardRequest); - void stub_receive_other (in ContainerStubRequestInfo info) - raises(PortableInterceptor::ForwardRequest); - }; - }; -}; -#endif /* CCM_STUBCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl deleted file mode 100644 index 61ae62f51fa..00000000000 --- a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#if !defined (CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL) -#define CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL - -#include "ciao/CCM_Cookie.idl" -#include "ciao/CCM_InvalidRegistration.idl" - -module Components -{ - module ContainerPortableInterceptor - { - local interface StubContainerInterceptor; - - local interface StubContainerInterceptorRegistration - { - Components::Cookie register_stub_interceptor (in StubContainerInterceptor ci); - StubContainerInterceptor unregister_stub_interceptor (in Components::Cookie cookie) - raises(InvalidRegistration); - }; - }; -}; - -#endif /* CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CIAO_Value.idl b/CIAO/ciao/CIAO_Value.idl new file mode 100644 index 00000000000..52efed12f75 --- /dev/null +++ b/CIAO/ciao/CIAO_Value.idl @@ -0,0 +1,21 @@ +// $Id$ + +/** + * @file CIAO_Value.idl + * + * @brief Some CIAO valuetype extension for internal use. + */ + +#include "CCM_Base.idl" + +/** + * @ Note: This needs deprecation. + * + */ +module CIAO +{ + valuetype Cookie : Components::Cookie + { + CORBA::OctetSeq get_cookie (); + }; +}; diff --git a/CIAO/ciao/Client_init.cpp b/CIAO/ciao/Client_init.cpp index 15325cf7a4e..7dd0b874b54 100644 --- a/CIAO/ciao/Client_init.cpp +++ b/CIAO/ciao/Client_init.cpp @@ -3,7 +3,7 @@ #include "Client_init.h" #include "CIAO_common.h" #include "CCM_ComponentC.h" -#include "CCM_StandardConfiguratorC.h" +#include "CIAO_ValueC.h" #include "ace/Env_Value_T.h" int @@ -11,6 +11,8 @@ CIAO::Client_init (CORBA::ORB_ptr o) { CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init, Components::Cookie); + CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init, + CIAO::Cookie); CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init, Components::PortDescription); CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init, diff --git a/CIAO/ciao/Components.idl b/CIAO/ciao/Components.idl index f58740eae6a..ad85c28e448 100644 --- a/CIAO/ciao/Components.idl +++ b/CIAO/ciao/Components.idl @@ -9,10 +9,7 @@ #if !defined (CIAO_COMPONENTS_IDL) #define CIAO_COMPONENTS_IDL -#include "ciao/CCM_Component.idl" -#include "ciao/CCM_KeylessCCMHome.idl" -#include "ciao/CCM_Home.idl" -#include "ciao/CCM_Object.idl" +#include "CCM_Component.idl" #endif /* CIAO_COMPONENTS_IDL */ diff --git a/CIAO/ciao/ComponentsC.h b/CIAO/ciao/ComponentsC.h new file mode 100644 index 00000000000..f097a6ead82 --- /dev/null +++ b/CIAO/ciao/ComponentsC.h @@ -0,0 +1,101 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be/be_codegen.cpp:150 + +#ifndef _TAO_IDL_COMPONENTSC_H_ +#define _TAO_IDL_COMPONENTSC_H_ + +#include "tao/ORB.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/CDR.h" +#include "tao/Environment.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/Versioned_Namespace.h" + +#include "CCM_ComponentC.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO + +#if defined (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be/be_visitor_traits.cpp:50 + +// Traits specializations. + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +namespace TAO +{ +} +TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be/be_visitor_root/cdr_op.cpp:48 + +#ifndef __ACE_INLINE__ + +// TAO_IDL - Generated from +// be/be_visitor_root/cdr_op.cpp:64 + +#endif /* __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// be/be_codegen.cpp:911 + + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#endif /* ifndef */ diff --git a/CIAO/ciao/ComponentsS.h b/CIAO/ciao/ComponentsS.h new file mode 100644 index 00000000000..9a025aac8d7 --- /dev/null +++ b/CIAO/ciao/ComponentsS.h @@ -0,0 +1,63 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be/be_codegen.cpp:390 + +#ifndef _TAO_IDL_COMPONENTSS_H_ +#define _TAO_IDL_COMPONENTSS_H_ + + +#include "CCM_ComponentS.h" +#include "ComponentsC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#endif /* ifndef */ diff --git a/CIAO/ciao/Container_Base.pidl b/CIAO/ciao/Container_Base.pidl new file mode 100644 index 00000000000..e698ea66b45 --- /dev/null +++ b/CIAO/ciao/Container_Base.pidl @@ -0,0 +1,33 @@ +// $Id$ + +/** + * CIAO's internal container interface definitions. + */ + +//#define CIAO_HAS_IMPORT_KEYWORD + +#if !defined (CONTAINER_BASE_PIDL) +#define CONTAINER_BASE_PIDL + +#include "CIAO_Component.pidl" +#include <SecurityLevel2.idl> +#include "CIAO_Transaction.pidl" + +// *************** Basic Container interfaces *************** + +module CIAO +{ + typeprefix Components "wustl.edu"; + + local interface Container + { + // Return the POA + PortableServer::POA the_POA (); + }; + + local interface SessionContainer + { + + }; +}; +#endif /* CONTAINER_BASE_PIDL */ diff --git a/CIAO/ciao/Cookies.h b/CIAO/ciao/Cookies.h index 995629378d2..dd4f11407a8 100644 --- a/CIAO/ciao/Cookies.h +++ b/CIAO/ciao/Cookies.h @@ -12,13 +12,15 @@ #define CIAO_COOKIES_H #include /**/ "ace/pre.h" -#include "CCM_CookieC.h" +#include "CCM_BaseC.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "CIAO_Container_Export.h" +#include "CIAO_ValueC.h" #include "ace/Active_Map_Manager.h" namespace CIAO diff --git a/CIAO/ciao/CosPersistentState.idl b/CIAO/ciao/CosPersistentState.idl index a5211d071aa..64f127539e2 100644 --- a/CIAO/ciao/CosPersistentState.idl +++ b/CIAO/ciao/CosPersistentState.idl @@ -13,12 +13,11 @@ #define CIAO_COSPERSISTENTSTATE_PIDL module CosPersistentState { + local interface CatalogBase + { + }; - local interface CatalogBase - { - }; - - typedef sequence<octet> _TypeId; - typedef string Pid; + typedef sequence<octet> _TypeId; + typedef string Pid; }; #endif /* CIAO_COSPERSISTENTSTATE_PIDL */ diff --git a/CIAO/ciao/Deployment.idl b/CIAO/ciao/Deployment.idl index 793c44fc853..cf3b49ff457 100644 --- a/CIAO/ciao/Deployment.idl +++ b/CIAO/ciao/Deployment.idl @@ -3,8 +3,10 @@ #ifndef DEPLOYMENT_IDL #define DEPLOYMENT_IDL -#include "ciao/Deployment_Packaging_Data.idl" -#include "ciao/Deployment_Target_Data.idl" +#include "Deployment_Data.idl" +#include "Packaging_Data.idl" +#include "Target_Data.idl" +#include "ServerResources.idl" module Deployment { @@ -16,6 +18,9 @@ module Deployment { exception NoSuchName { }; + exception LastConfiguration { + }; + exception InvalidReference { }; @@ -30,7 +35,27 @@ module Deployment { string name; string plan_uuid; }; + + /** + * @struct Sched_Params + * @brief Carries Scheduling Params + * @description CIAO specific structure to carry the scheduling params + * to set the process, required by RACE + */ + struct Sched_Params + { + long policy_; + long priority_; + long scope_; + long msec_; + }; + typedef sequence < ComponentPlan > ComponentPlans; + + typedef sequence < Application > Applications; + + interface Logger { + }; }; #endif /* DEPLOYMENT_IDL */ diff --git a/CIAO/ciao/Deployment_Application.idl b/CIAO/ciao/Deployment_Application.idl deleted file mode 100644 index df03887cf7d..00000000000 --- a/CIAO/ciao/Deployment_Application.idl +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -#if !defined (DEPLOYMENT_APPLICATION_IDL) -#define DEPLOYMENT_APPLICATION_IDL - -#include "ciao/Deployment_Connection.idl" - -module Deployment -{ - exception StartError - { - string name; - string reason; - }; - - exception InvalidConnection - { - string name; - string reason; - }; - - interface Application - { - void finishLaunch (in Connections providedReference, - in boolean start, - in boolean is_ReDAC) - raises (StartError, InvalidConnection); - void start () - raises (StartError); - }; - typedef sequence < Application > Applications; -}; - -#endif /* DEPLOYMENT_APPLICATION_IDL */ diff --git a/CIAO/ciao/Deployment_ApplicationManager.idl b/CIAO/ciao/Deployment_ApplicationManager.idl deleted file mode 100644 index 98fe247f2f9..00000000000 --- a/CIAO/ciao/Deployment_ApplicationManager.idl +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ -#ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL -#define DEPLOYMENT_APPLICATIONMANAGER_IDL - -#include "ciao/Deployment_Core.idl" -#include "ciao/Deployment.idl" - -module Deployment { - exception ResourceNotAvailable { - string name; - string resourceType; - string propertyName; - string elementName; - string resourceName; - }; - - interface ApplicationManager { - /// @todo Spec mentions another few exceptions in the raises cluase - Application startLaunch (in Properties configProperty, - out Connections providedReference, - in boolean start) - raises (ResourceNotAvailable, StartError, InvalidProperty); - void destroyApplication (in Application app) - raises (StopError); - }; -}; - -#endif /* DEPLOYMENT_APPLICATIONMANAGER_IDL */ diff --git a/CIAO/ciao/Deployment_Base.idl b/CIAO/ciao/Deployment_Base.idl index cb98f5d05b6..caadccf2fee 100644 --- a/CIAO/ciao/Deployment_Base.idl +++ b/CIAO/ciao/Deployment_Base.idl @@ -3,21 +3,10 @@ #ifndef DEPLOYMENT_BASE_IDL #define DEPLOYMENT_BASE_IDL -module Deployment { - - struct Property - { - string name; - any value; - }; - typedef sequence < Property > Properties; +#include <orb.idl> +#include "Deployment_Core.idl" - struct Requirement { - string resourceType; - string name; - Properties property; - }; - typedef sequence < Requirement > Requirements; +module Deployment { enum SatisfierPropertyKind { Quantity, @@ -34,7 +23,65 @@ module Deployment { boolean dynamic; any value; }; + typedef sequence < SatisfierProperty > SatisfierProperties; + + struct SharedResource { + string name; + ::CORBA::StringSeq resourceType; + ::CORBA::ULongSeq nodeRef; + SatisfierProperties property; + }; + + typedef sequence < SharedResource > SharedResources; + + struct Resource { + string name; + ::CORBA::StringSeq resourceType; + SatisfierProperties property; + }; + + typedef sequence < Resource > Resources; + + struct Node { + string name; + string label; + ::CORBA::ULongSeq sharedResourceRef; + ::CORBA::ULongSeq connectionRef; + Resources resource; + }; + + typedef sequence < Node > Nodes; + + struct Interconnect { + string name; + string label; + ::CORBA::ULongSeq connectionRef; + ::CORBA::ULongSeq connectRef; + Resources resource; + }; + + typedef sequence < Interconnect > Interconnects; + + struct Bridge { + string name; + string label; + ::CORBA::ULongSeq connectRef; + Resources resource; + }; + + typedef sequence < Bridge > Bridges; + + struct Domain { + string UUID; + string label; + SharedResources sharedResource; + Nodes node; + Interconnects interconnect; + Bridges bridge; + Properties infoProperty; + }; + }; #endif /* DEPLOYMENT_BASE_IDL */ diff --git a/CIAO/ciao/Deployment_Connection.idl b/CIAO/ciao/Deployment_Connection.idl deleted file mode 100644 index 769c331a748..00000000000 --- a/CIAO/ciao/Deployment_Connection.idl +++ /dev/null @@ -1,43 +0,0 @@ -// $Id$ - -#if !defined (DEPLOYMENT_CONNECTION_IDL) -#define DEPLOYMENT_CONNECTION_IDL - -#include "ciao/Deployment_DeploymentPlan.idl" -#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl> - -// *************** Packaging and Deployment *************** -module Deployment -{ - typedef sequence < Object > Endpoints; - //typedef Object Endpoint; - - // CIAO's specific <Connection> type defition. - // To avoid the connection info in the plan being passed to the - // local node and to make the implementation not very cumbersome - // I changed the connection struct to include some extra informations. - struct Connection - { - string instanceName; - string portName; - CCMComponentPortKind kind; - - string endpointInstanceName; // CIAO specific extension - string endpointPortName; // CIAO specific extension - - // the endpoints member is change to endpoint. - // Since we will not have more than 1 objref in there. - Object endpoint; - - // A wrapper facade interface to provision different event - // communication mechanisms, including RTEC, etc. - CIAO::CIAO_Event_Service event_service; - - // The properties of this connection, particularly useful - // to speicfy QoS properties of pub/sub service connections. - Properties config; - }; - - typedef sequence < Connection > Connections; -}; -#endif /* DEPLOYMENT_CONNECTION_IDL */ diff --git a/CIAO/ciao/Deployment_Container.idl b/CIAO/ciao/Deployment_Container.idl deleted file mode 100644 index 55ac0c7dfdd..00000000000 --- a/CIAO/ciao/Deployment_Container.idl +++ /dev/null @@ -1,93 +0,0 @@ -// $Id$ - -#if !defined (DEPLOYMENT_CONTAINER_IDL) -#define DEPLOYMENT_CONTAINER_IDL - -#include "ciao/Deployment_Application.idl" -#include "ciao/Deployment_Core.idl" - -// *************** Packaging and Deployment *************** -module Deployment -{ - interface NodeApplication; // Forward decl. - - /// CIAO specific - struct Component_Info - { - string component_instance_name; - Components::CCMObject component_ref; - }; - - /// CIAO specific - typedef sequence < Component_Info > ComponentInfos; - - /// CIAO specific - struct ComponentImplementationInfo - { - string component_instance_name; - string executor_dll; - string executor_entrypt; - string servant_dll; - string servant_entrypt; - Properties component_config; - // Properties home_config; //ignored for now. - }; - - /// CIAO specific - typedef sequence <ComponentImplementationInfo> ComponentImplementationInfos; - - // ContainerImplementationInfo contains a list of components to be installed and - // policy configuration for the container which hosts these components - /// CIAO specific - struct ContainerImplementationInfo - { - ComponentImplementationInfos impl_infos; - Properties container_config; - }; - - /// CIAO specific - typedef sequence <ContainerImplementationInfo> ContainerImplementationInfos; - - /// CIAO specific interface, which could deal with installing multiple - /// containers into a single NodeApplication. - interface Container - { - readonly attribute ::Deployment::Properties properties; - - /// Get the NodeApplication which created us - NodeApplication get_node_application (); - - /// Initialize the container with policies - // long init (in ::CORBA::PolicyList policies); - - // NW: The following should be component specific info because the - // container has already been created and initialized at this - // time. So there's not much container configuration to be done - // at this stage. - //@@ The container_impl_info will contain - //1 component instance name as the key. - //2 dll/so name of the exec - //3 entry point of the exec - //4 dll/so name of the svnt - //5 entry point of the svnt - //6 Poosible other configuration for container/home/component - - /// Install all homes and components - Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info) - raises (UnknownImplId, - ImplEntryPointNotFound, - InstallationFailure, - ::Components::InvalidConfiguration); - - /// Remove all homes and components - void remove () - raises (::Components::RemoveFailure); - - /// Remove a component instance - void remove_component (in string inst_name) - raises (::Components::RemoveFailure); - }; - - typedef sequence<Container> Containers; -}; -#endif /* DEPLOYMENT_CONTAINER_IDL */ diff --git a/CIAO/ciao/Deployment_Core.idl b/CIAO/ciao/Deployment_Core.idl index fbaa5ea18c6..b61836faf7d 100644 --- a/CIAO/ciao/Deployment_Core.idl +++ b/CIAO/ciao/Deployment_Core.idl @@ -3,10 +3,8 @@ #if !defined (DEPLOYMENT_CORE_IDL) #define DEPLOYMENT_CORE_IDL -#include "ciao/CCM_Component.idl" -#include "ciao/Deployment_TargetData.idl" -#include "ciao/Deployment_Data.idl" -#include "ciao/Deployment_Application.idl" +#include "CCM_Component.idl" +#include "Deployment_Events.idl" // *************** Packaging and Deployment *************** module Deployment @@ -14,36 +12,297 @@ module Deployment // Typeprefix Components "omg.org"; // OMG threw these things away, didn't it. - /// CIAO specific exception UnknownImplId { string name; string reason; }; - /// CIAO specific + exception InvalidLocation {}; exception InstallationFailure { string name; string reason; }; - - /// CIAO specific exception ImplEntryPointNotFound { string name; string reason; }; - /** - * The StopError exception is raised if a problem occurred while terminating - * an application, either during the terminate operation of the - * ApplicationManager or during the destroyManager operation of the - * ExecutionManager. - */ + //Below are from the OMG Deployment.idl + + exception StartError + { + string name; + string reason; + }; + exception StopError { string name; string reason; }; + + exception InvalidConnection + { + string name; + string reason; + }; + + //==============property================== + struct Property + { + string name; + any value; + }; + + typedef sequence < Property > Properties; + + //============connection================== + + typedef sequence < Object > Endpoints; + //typedef Object Endpoint; + + enum CCMComponentPortKind + { + Facet, + SimplexReceptacle, + MultiplexReceptacle, + EventEmitter, + EventPublisher, + EventConsumer + }; + + // CIAO's specific <Connection> type defition. + // To avoid the connection info in the plan being passed to the + // local node and to make the implementation not very cumbersome + // I changed the connection struct to include some extra informations. + struct Connection + { + string instanceName; + string portName; + CCMComponentPortKind kind; + + string endpointInstanceName; // CIAO specific extension + string endpointPortName; // CIAO specific extension + + // the endpoints member is change to endpoint. + // Since we will not have more than 1 objref in there. + Object endpoint; + + // A wrapper facade interface to provision different event + // communication mechanisms, including RTEC, etc. + CIAO::CIAO_Event_Service event_service; + + // The properties of this connection, particularly useful + // to speicfy QoS properties of pub/sub service connections. + Properties config; + }; + + typedef sequence < Connection > Connections; + + //======================================= + struct ComponentImplementationInfo + { + string component_instance_name; + string executor_dll; + string executor_entrypt; + string servant_dll; + string servant_entrypt; + Properties component_config; + // Properties home_config; //ignored for now. + }; + + typedef sequence <ComponentImplementationInfo> ComponentImplementationInfos; + + // ContainerImplementationInfo contains a list of components to be installed and + // policy configuration for the container which hosts these components + struct ContainerImplementationInfo + { + ComponentImplementationInfos impl_infos; + Properties container_config; + }; + + typedef sequence <ContainerImplementationInfo> ContainerImplementationInfos; + + struct NodeImplementationInfo + { + ContainerImplementationInfos impl_infos; + Properties nodeapp_config; + }; + + //================================== + interface Application + { + void finishLaunch (in Connections providedReference, + in boolean start, + in boolean is_ReDAC) + raises (StartError, InvalidConnection); + void start () + raises (StartError); + }; + + struct Component_Info + { + string component_instance_name; + Components::CCMObject component_ref; + }; + + typedef sequence < Component_Info > ComponentInfos; + + // @@ (OO) You're altering an OMG defined interface below. In + // order to avoid confusion, it is probably better to create + // another NodeApplication interface in the CIAO namespace + // that inherits from Deployment::NodeApplication. You'd + // then use the CIAO::NodeApplication in your + // implementation. + // + // Alternatively, you should at least place a CIAO-specific + // typeprefix within your altered NodeApplication interface + // to prevent interoperability issues. + + interface NodeApplication; // Forward decl. + typedef sequence<NodeApplication> NodeApplications; + + /// CIAO specific interface, which could deal with installing multiple + /// containers into a single NodeApplication. + interface Container + { + readonly attribute ::Deployment::Properties properties; + + /// Get the NodeApplication which created us + NodeApplication get_node_application (); + + /// Initialize the container with policies + // long init (in ::CORBA::PolicyList policies); + + // NW: The following should be component specific info because the + // container has already been created and initialized at this + // time. So there's not much container configuration to be done + // at this stage. + //@@ The container_impl_info will contain + //1 component instance name as the key. + //2 dll/so name of the exec + //3 entry point of the exec + //4 dll/so name of the svnt + //5 entry point of the svnt + //6 Poosible other configuration for container/home/component + + /// Install all homes and components + Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info) + raises (UnknownImplId, + ImplEntryPointNotFound, + InstallationFailure, + ::Components::InvalidConfiguration); + + /// Remove all homes and components + void remove () + raises (::Components::RemoveFailure); + + /// Remove a component instance + void remove_component (in string inst_name) + raises (::Components::RemoveFailure); + }; + + typedef sequence<Container> Containers; + typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services; + + /* + /// CIAO specific extension + /// This struct captures the installation information of a particular + /// CIAO_Event_Service, as defined in <ciaosvcs/Events/CIAO_Events.idl> + struct ESInstallationInfo + { + string id; + CIAO::EventServiceType type; + string svcconf; + //Properties es_config; + }; + + /// CIAO specific extension + typedef sequence<ESInstallationInfo> ESInstallationInfos; + */ + + interface NodeApplication : Application + { + readonly attribute ::Deployment::Properties properties; + + /// CIAO specific operation to handle dynamic system redeployment + /// and reconfiguration + /// @@ Initialize the nodeapplication, so it will know what + /// components it will create and home many of them are + /// there. However the real create action will take place when + /// start launch is called on NodeApplicationManager. + long init (); + + /// @@ This operation will be called by NodeApplicationManager + /// client to really start to create homes and components. + ComponentInfos install (in NodeImplementationInfo node_impl_info) + raises (UnknownImplId, + ImplEntryPointNotFound, + InstallationFailure, + ::Components::InvalidConfiguration, + ::Components::RemoveFailure); + + /// CIAO specific extension + /// This operation will create one CIAO_Event_Service object + /// within the NodeApplication, which will be used to mediate the + /// communication of CCM events + CIAO::CIAO_Event_Service install_es ( + in CIAO::DAnCE::EventServiceDeploymentDescription es_info) + raises (InstallationFailure); + + /// CIAO specific extensions + ///@@ We know that Deployment::NodeApplicationManager will be returned, + /// however to avoid the size of the shared object of CIAO_Server. + /// we return an Object. + Object get_node_application_manager (); + + /// CIAO specific extension + Container create_container (in ::Deployment::Properties properties) + raises (::Components::CreateFailure, + ::Components::InvalidConfiguration); + + /// CIAO specific extension + void remove_container (in Container cref) + raises (::Components::RemoveFailure); + + /// CIAO specific extension + Containers get_containers (); + + /// CIAO specific extension + /// Remove a component instance from the NodeApplication + void remove_component (in string inst_name) + raises (::Components::RemoveFailure); + + /// CIAO specific extensions + /// Activate a component instance from the NodeApplication + void activate_component (in string inst_name) + raises (::Deployment::StartError); + + /// CIAO specific extensions + /// Passivate a component instance from the NodeApplication + void passivate_component (in string inst_name) + raises (::Components::RemoveFailure); + + /// Remove all containers, components and component homes. + /// Shuts down the ORB of the NodeApplication to terminate the process. + oneway void remove (); + + /// CIAO specific extension. This will enforce the component to + /// be activated (preactivate, activate, postactivated) before the assembly + /// is established + void ciao_preactivate () + raises (StartError); + + /// CIAO specific extension + void ciao_postactivate () + raises (StartError); + + /// CIAO specific extension + void ciao_passivate () + raises (StopError); + }; + }; #endif /* DEPLOYMENT_CORE_IDL */ diff --git a/CIAO/ciao/Deployment_Data.idl b/CIAO/ciao/Deployment_Data.idl index 0c296a815ba..7b475947add 100644 --- a/CIAO/ciao/Deployment_Data.idl +++ b/CIAO/ciao/Deployment_Data.idl @@ -2,11 +2,193 @@ #ifndef DEPLOYMENT_DATA_IDL #define DEPLOYMENT_DATA_IDL - -#include "ciao/Deployment_DeploymentPlan.idl" +#include "Deployment_Base.idl" module Deployment { + struct ComponentPortDescription { + string name; + string specificType; + ::CORBA::StringSeq supportedType; + boolean provider; + boolean exclusiveProvider; + boolean exclusiveUser; + boolean optional; + CCMComponentPortKind kind; + }; + + typedef sequence < ComponentPortDescription > ComponentPortDescriptions; + + struct ComponentPropertyDescription { + string name; + CORBA::TypeCode type; + }; + + typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions; + + struct ComponentInterfaceDescription { + string label; + string UUID; + string specificType; + ::CORBA::StringSeq supportedType; + ::CORBA::StringSeq idlFile; + Properties configProperty; + ComponentPortDescriptions port; + ComponentPropertyDescriptions property; + Properties infoProperty; + }; + + struct Requirement { + string resourceType; + string name; + Properties property; + }; + + typedef sequence < Requirement > Requirements; + + struct MonolithicDeploymentDescription { + string name; + ::CORBA::StringSeq source; + ::CORBA::ULongSeq artifactRef; + Properties execParameter; + Requirements deployRequirement; + }; + + typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions; + + enum ResourceUsageKind { + None, + InstanceUsesResource, + ResourceUsesInstance, + PortUsesResource, + ResourceUsesPort + }; + + struct InstanceResourceDeploymentDescription { + ResourceUsageKind resourceUsage; + string requirementName; + string resourceName; + Properties property; + }; + + typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions; + + struct InstanceDeploymentDescription { + string name; + string node; + ::CORBA::StringSeq source; + unsigned long implementationRef; + Properties configProperty; + InstanceResourceDeploymentDescriptions deployedResource; + InstanceResourceDeploymentDescriptions deployedSharedResource; + }; + + typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions; + + struct ComponentExternalPortEndpoint { + string portName; + }; + + typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints; + + struct PlanSubcomponentPortEndpoint { + string portName; + boolean provider; + CCMComponentPortKind kind; + unsigned long instanceRef; + }; + + typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints; + + struct ExternalReferenceEndpoint { + string location; + }; + + typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints; + + struct ConnectionResourceDeploymentDescription { + string targetName; + string requirementName; + string resourceName; + Properties property; + }; + + typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions; + + struct PlanConnectionDescription { + string name; + ::CORBA::StringSeq source; + Requirements deployRequirement; + ComponentExternalPortEndpoints externalEndpoint; + PlanSubcomponentPortEndpoints internalEndpoint; + ExternalReferenceEndpoints externalReference; + ConnectionResourceDeploymentDescriptions deployedResource; + }; + + typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions; + + struct PlanSubcomponentPropertyReference { + string propertyName; + unsigned long instanceRef; + }; + + typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences; + + struct PlanPropertyMapping { + string name; + ::CORBA::StringSeq source; + string externalName; + PlanSubcomponentPropertyReferences delegatesTo; + }; + + typedef sequence < PlanPropertyMapping > PlanPropertyMappings; + + struct ImplementationDependency { + string requiredType; + }; + + typedef sequence < ImplementationDependency > ImplementationDependencies; + + struct ResourceDeploymentDescription { + string requirementName; + string resourceName; + Properties property; + }; + + typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions; + + struct ArtifactDeploymentDescription { + string name; + ::CORBA::StringSeq location; + string node; + ::CORBA::StringSeq source; + Properties execParameter; + Requirements deployRequirement; + ResourceDeploymentDescriptions deployedResource; + }; + + typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions; + + struct DeploymentPlan { + string label; + string UUID; + ComponentInterfaceDescription realizes; + MonolithicDeploymentDescriptions implementation; + InstanceDeploymentDescriptions instance; + PlanConnectionDescriptions connection; + PlanPropertyMappings externalProperty; + ImplementationDependencies dependsOn; + ArtifactDeploymentDescriptions artifact; + Properties infoProperty; + }; + + enum DomainUpdateKind { + Add, + Delete, + UpdateAll, + UpdateAvailable + }; + struct ComponentPackageReference { string requiredUUID; string requiredName; @@ -35,6 +217,12 @@ module Deployment { }; typedef sequence < Capability > Capabilities; + + struct RequirementSatisfier { + string name; + ::CORBA::StringSeq resourceType; + SatisfierProperties property; + }; }; #endif /* DEPLOYMENT_DATA_IDL */ diff --git a/CIAO/ciao/Deployment_DeploymentPlan.idl b/CIAO/ciao/Deployment_DeploymentPlan.idl deleted file mode 100644 index e8dbde8ae2b..00000000000 --- a/CIAO/ciao/Deployment_DeploymentPlan.idl +++ /dev/null @@ -1,192 +0,0 @@ -// $Id$ - -#ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL -#define DEPLOYMENT_DEPLOYMENTPLAN_IDL - -#include "ciao/Deployment_Base.idl" -#include "tao/StringSeq.pidl" -#include "tao/ULongSeq.pidl" -#include "tao/Typecode_types.pidl" - -module Deployment { - - enum CCMComponentPortKind - { - Facet, - SimplexReceptacle, - MultiplexReceptacle, - EventEmitter, - EventPublisher, - EventConsumer - }; - - struct ComponentPortDescription { - string name; - string specificType; - ::CORBA::StringSeq supportedType; - boolean provider; - boolean exclusiveProvider; - boolean exclusiveUser; - boolean optional; - CCMComponentPortKind kind; - }; - - typedef sequence < ComponentPortDescription > ComponentPortDescriptions; - - struct ComponentPropertyDescription { - string name; - CORBA::TypeCode type; - }; - - typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions; - - struct ComponentInterfaceDescription { - string label; - string UUID; - string specificType; - ::CORBA::StringSeq supportedType; - ::CORBA::StringSeq idlFile; - Properties configProperty; - ComponentPortDescriptions port; - ComponentPropertyDescriptions property; - Properties infoProperty; - }; - - struct MonolithicDeploymentDescription { - string name; - ::CORBA::StringSeq source; - ::CORBA::ULongSeq artifactRef; - Properties execParameter; - Requirements deployRequirement; - }; - - typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions; - - enum ResourceUsageKind { - None, - InstanceUsesResource, - ResourceUsesInstance, - PortUsesResource, - ResourceUsesPort - }; - - struct InstanceResourceDeploymentDescription { - ResourceUsageKind resourceUsage; - string requirementName; - string resourceName; - Properties property; - }; - - typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions; - - struct InstanceDeploymentDescription { - string name; - string node; - ::CORBA::StringSeq source; - unsigned long implementationRef; - Properties configProperty; - InstanceResourceDeploymentDescriptions deployedResource; - InstanceResourceDeploymentDescriptions deployedSharedResource; - }; - - typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions; - - struct ComponentExternalPortEndpoint { - string portName; - }; - - typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints; - - struct PlanSubcomponentPortEndpoint { - string portName; - boolean provider; - CCMComponentPortKind kind; - unsigned long instanceRef; - }; - - typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints; - - struct ExternalReferenceEndpoint { - string location; - }; - - typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints; - - struct ConnectionResourceDeploymentDescription { - string targetName; - string requirementName; - string resourceName; - Properties property; - }; - - typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions; - - struct PlanConnectionDescription { - string name; - ::CORBA::StringSeq source; - Requirements deployRequirement; - ComponentExternalPortEndpoints externalEndpoint; - PlanSubcomponentPortEndpoints internalEndpoint; - ExternalReferenceEndpoints externalReference; - ConnectionResourceDeploymentDescriptions deployedResource; - }; - - typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions; - - struct PlanSubcomponentPropertyReference { - string propertyName; - unsigned long instanceRef; - }; - - typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences; - - struct PlanPropertyMapping { - string name; - ::CORBA::StringSeq source; - string externalName; - PlanSubcomponentPropertyReferences delegatesTo; - }; - - typedef sequence < PlanPropertyMapping > PlanPropertyMappings; - - struct ImplementationDependency { - string requiredType; - }; - - typedef sequence < ImplementationDependency > ImplementationDependencies; - - struct ResourceDeploymentDescription { - string requirementName; - string resourceName; - Properties property; - }; - - typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions; - - struct ArtifactDeploymentDescription { - string name; - ::CORBA::StringSeq location; - string node; - ::CORBA::StringSeq source; - Properties execParameter; - Requirements deployRequirement; - ResourceDeploymentDescriptions deployedResource; - }; - - typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions; - - struct DeploymentPlan { - string label; - string UUID; - ComponentInterfaceDescription realizes; - MonolithicDeploymentDescriptions implementation; - InstanceDeploymentDescriptions instance; - PlanConnectionDescriptions connection; - PlanPropertyMappings externalProperty; - ImplementationDependencies dependsOn; - ArtifactDeploymentDescriptions artifact; - Properties infoProperty; - }; -}; - -#endif /* DEPLOYMENT_DATA_IDL */ diff --git a/CIAO/ciao/Deployment_Events.idl b/CIAO/ciao/Deployment_Events.idl index b0559dfe164..95774dba3f7 100644 --- a/CIAO/ciao/Deployment_Events.idl +++ b/CIAO/ciao/Deployment_Events.idl @@ -11,7 +11,7 @@ #if !defined (CIAO_DEPLOYMENT_EVENT_SERVICES_IDL) #define CIAO_DEPLOYMENT_EVENT_SERVICES_IDL -#include "tao/StringSeq.pidl" +#include <orb.idl> // EventServiceType definition #include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl> diff --git a/CIAO/ciao/Deployment_NodeApplication.idl b/CIAO/ciao/Deployment_NodeApplication.idl deleted file mode 100644 index 7c0a0db93b7..00000000000 --- a/CIAO/ciao/Deployment_NodeApplication.idl +++ /dev/null @@ -1,122 +0,0 @@ -// $Id$ - -#if !defined (DEPLOYMENT_NODEAPPLICATION_IDL) -#define DEPLOYMENT_NODEAPPLICATION_IDL - -#include "Deployment_Application.idl" -#include "Deployment_Core.idl" -#include "Deployment_Container.idl" -#include "Deployment_Events.idl" - -// *************** Packaging and Deployment *************** -module Deployment -{ - /// CIAO specific extension - /// This struct captures the installation information of a particular - /// CIAO_Event_Service, as defined in <ciaosvcs/Events/CIAO_Events.idl> - struct ESInstallationInfo - { - string id; - CIAO::EventServiceType type; - string svcconf; - //Properties es_config; - }; - - /// CIAO specific - struct NodeImplementationInfo - { - ContainerImplementationInfos impl_infos; - Properties nodeapp_config; - }; - - /// CIAO specific - typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services; - - /// CIAO specific extension - typedef sequence<ESInstallationInfo> ESInstallationInfos; - - interface NodeApplication : Application - { - /// CIAO specific extensions - readonly attribute ::Deployment::Properties properties; - - /// CIAO specific operation to handle dynamic system redeployment - /// and reconfiguration - /// @@ Initialize the nodeapplication, so it will know what - /// components it will create and home many of them are - /// there. However the real create action will take place when - /// start launch is called on NodeApplicationManager. - long init (); - - /// @@ This operation will be called by NodeApplicationManager - /// client to really start to create homes and components. - /// CIAO specific extensions - ComponentInfos install (in NodeImplementationInfo node_impl_info) - raises (UnknownImplId, - ImplEntryPointNotFound, - InstallationFailure, - ::Components::InvalidConfiguration, - ::Components::RemoveFailure); - - /// CIAO specific extension - /// This operation will create one or more CIAO_Event_Service objects - /// within the NodeApplication, which will be used to mediate the - /// communication of CCM events - CIAO::CIAO_Event_Service install_es ( - in CIAO::DAnCE::EventServiceDeploymentDescription es_info) - raises (InstallationFailure); - - /// CIAO specific extensions - ///@@ We know that Deployment::NodeApplicationManager will be returned, - /// however to avoid the size of the shared object of CIAO_Server. - /// we return an Object. - Object get_node_application_manager (); - - /// CIAO specific extension - Container create_container (in ::Deployment::Properties properties) - raises (::Components::CreateFailure, - ::Components::InvalidConfiguration); - - /// CIAO specific extension - void remove_container (in Container cref) - raises (::Components::RemoveFailure); - - /// CIAO specific extension - Containers get_containers (); - - /// CIAO specific extension - /// Remove a component instance from the NodeApplication - void remove_component (in string inst_name) - raises (::Components::RemoveFailure); - - /// CIAO specific extensions - /// Activate a component instance from the NodeApplication - void activate_component (in string inst_name) - raises (::Deployment::StartError); - - /// CIAO specific extensions - /// Passivate a component instance from the NodeApplication - void passivate_component (in string inst_name) - raises (::Components::RemoveFailure); - - /// Remove all containers, components and component homes. - /// Shuts down the ORB of the NodeApplication to terminate the process. - oneway void remove (); - - /// CIAO specific extension. This will enforce the component to - /// be activated (preactivate, activate, postactivated) before the assembly - /// is established - void ciao_preactivate () - raises (StartError); - - /// CIAO specific extension - void ciao_postactivate () - raises (StartError); - - /// CIAO specific extension - void ciao_passivate () - raises (StopError); - }; - -}; -#endif /* DEPLOYMENT_CORE_IDL */ diff --git a/CIAO/ciao/Deployment_TargetData.idl b/CIAO/ciao/Deployment_TargetData.idl deleted file mode 100644 index 82cff14ca83..00000000000 --- a/CIAO/ciao/Deployment_TargetData.idl +++ /dev/null @@ -1,64 +0,0 @@ -//$Id$ - -#ifndef DEPLOYMENT_TARGETDATA_IDL -#define DEPLOYMENT_TARGETDATA_IDL - -#include "ciao/Deployment_Base.idl" -#include "tao/StringSeq.pidl" -#include "tao/ULongSeq.pidl" - -module Deployment { - - struct Resource { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; - typedef sequence < Resource > Resources; - - struct SharedResource { - string name; - ::CORBA::StringSeq resourceType; - ::CORBA::ULongSeq nodeRef; - SatisfierProperties property; - }; - typedef sequence < SharedResource > SharedResources; - - struct Node { - string name; - string label; - ::CORBA::ULongSeq sharedResourceRef; - ::CORBA::ULongSeq connectionRef; - Resources resource; - }; - typedef sequence < Node > Nodes; - - struct Interconnect { - string name; - string label; - ::CORBA::ULongSeq connectionRef; - ::CORBA::ULongSeq connectRef; - Resources resource; - }; - typedef sequence < Interconnect > Interconnects; - - struct Bridge { - string name; - string label; - ::CORBA::ULongSeq connectRef; - Resources resource; - }; - typedef sequence < Bridge > Bridges; - - struct Domain { - string UUID; - string label; - SharedResources sharedResource; - Nodes node; - Interconnects interconnect; - Bridges bridge; - Properties infoProperty; - }; -}; - -#endif /* DEPLOYMENT_TARGETDATA_IDL */ diff --git a/CIAO/ciao/Deployment_Target_Data.idl b/CIAO/ciao/Deployment_Target_Data.idl deleted file mode 100644 index 0e08248972a..00000000000 --- a/CIAO/ciao/Deployment_Target_Data.idl +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#ifndef TARGET_DATA_IDL -#define TARGET_DATA_IDL - -module Deployment { - - exception PlanError { - string name; - string reason; - }; -}; - -#endif /* TARGET_DATA_IDL */ diff --git a/CIAO/ciao/Deployment_DomainApplicationManager.idl b/CIAO/ciao/DomainApplicationManager.idl index 65b7523959e..c0030465638 100644 --- a/CIAO/ciao/Deployment_DomainApplicationManager.idl +++ b/CIAO/ciao/DomainApplicationManager.idl @@ -2,34 +2,26 @@ #ifndef DOMAINAPPLICATIONMANAGER_IDL #define DOMAINAPPLICATIONMANAGER_IDL -#include "ciao/Deployment.idl" -#include "ciao/Deployment_NodeApplication.idl" -#include "ciao/Deployment_ApplicationManager.idl" +#include "Deployment.idl" module Deployment { /// CIAO 's DomainApplicationManager interface differs spec-defined interface /// in the same that it also integrates the spec-defined interface for /// DomainApplication into itself - /// This should be derived from ApplicationManager interface DomainApplicationManager { DeploymentPlan getPlan (); - /// This method is missing from CIAO but in the spec - /// Applications getApplications (); - /// CIAO specific version of startLaunch implementation, this one /// differs with spec-defined operation in the sense that it doesn't /// return DomainApplication object reference. void startLaunch (in Properties configProperty, in boolean start) raises (ResourceNotAvailable, StartError, InvalidProperty); - /// This method has CIAO specific arguments and is not spec compliant void finishLaunch (in boolean start, in boolean is_ReDAC) raises (StartError, InvalidConnection); - /// CIAO specific extension void start () raises (StartError); diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp index 1400766070d..11883fc6056 100644 --- a/CIAO/ciao/Dynamic_Component_Activator.cpp +++ b/CIAO/ciao/Dynamic_Component_Activator.cpp @@ -1,6 +1,5 @@ -#include "ciao/Dynamic_Component_Activator.h" -#include "ciao/Dynamic_Component_Servant_Base.h" -#include "ciao/CIAO_common.h" +#include "Dynamic_Component_Activator.h" +#include "CIAO_common.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" @@ -63,6 +62,9 @@ namespace CIAO if (this->servant_map_.unbind (oid, servant) != 0) { ACE_DEBUG ((LM_DEBUG, "Invalid object reference\n")); + return; } + + return; } } diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h index 504d8887ed9..a8d0b26549a 100644 --- a/CIAO/ciao/Dynamic_Component_Activator.h +++ b/CIAO/ciao/Dynamic_Component_Activator.h @@ -11,8 +11,8 @@ */ //============================================================================= -#ifndef CIAO_DYNAMIC_COMPONENT_ACTIVATOR_H -#define CIAO_DYNAMIC_COMPONENT_ACTIVATOR_H +#ifndef CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H +#define CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H #include /**/ "ace/pre.h" #include "ciao/CIAO_Server_Export.h" @@ -23,6 +23,7 @@ #include "ciao/CCM_ContainerC.h" #include "ciao/Deployment_CoreC.h" +#include "ciao/Dynamic_Component_Servant_Base.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServer.h" @@ -93,6 +94,7 @@ namespace CIAO ACE_Equal_To<PortableServer::ObjectId>, ACE_SYNCH_MUTEX> servant_map_; + }; } @@ -101,4 +103,4 @@ namespace CIAO #endif /* _MSC_VER */ #include /**/ "ace/post.h" -#endif /* CIAO_DYNAMIC_COMPONENT_ACTIVATOR_H */ +#endif /*CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H*/ diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.cpp b/CIAO/ciao/Dynamic_Component_Servant_Base.cpp index 773004e6741..16a9f40ea3a 100644 --- a/CIAO/ciao/Dynamic_Component_Servant_Base.cpp +++ b/CIAO/ciao/Dynamic_Component_Servant_Base.cpp @@ -1,5 +1,5 @@ -#include "ciao/CIAO_common.h" -#include "ciao/Dynamic_Component_Servant_Base.h" +#include "Dynamic_Component_Servant_Base.h" +#include "CIAO_common.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.h b/CIAO/ciao/Dynamic_Component_Servant_Base.h index 0e826cf40ab..15aab6cace3 100644 --- a/CIAO/ciao/Dynamic_Component_Servant_Base.h +++ b/CIAO/ciao/Dynamic_Component_Servant_Base.h @@ -10,18 +10,20 @@ //============================================================================= -#ifndef CIAO_DYNAMIC_COMPONENT_SERVANT_BASE__H -#define CIAO_DYNAMIC_COMPONENT_SERVANT_BASE__H +#ifndef CIAO_DYNAMIC_COMPONENT_SERVANT_BASE_H +#define CIAO_DYNAMIC_COMPONENT_SERVANT_BASE_H #include /**/ "ace/pre.h" -#include "ciao/CIAO_Server_Export.h" +// @@ Jai, why is this includion necessary. Looks heavy weight to me. +#include "CCM_ComponentS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/PortableServer.h" +#include "CIAO_Server_Export.h" namespace CIAO { @@ -52,4 +54,4 @@ namespace CIAO #include /**/ "ace/post.h" -#endif /* CIAO_DYNAMIC_COMPONENT_SERVANT_BASE__H */ +#endif /* CIAO_DYNAMIC_COMPONENT_SERVANT_BASE_H */ diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h index 5ca9fab815e..29f9f801707 100644 --- a/CIAO/ciao/Dynamic_Component_Servant_T.h +++ b/CIAO/ciao/Dynamic_Component_Servant_T.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "Dynamic_Component_Servant_Base.h" -#include "CIAO_SwapExecC.h" +#include "SwapExecC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/ciao/Deployment_ExecutionManager.idl b/CIAO/ciao/ExecutionManager.idl index 39c2ba6053b..a5108b77281 100644 --- a/CIAO/ciao/Deployment_ExecutionManager.idl +++ b/CIAO/ciao/ExecutionManager.idl @@ -2,25 +2,23 @@ #ifndef EXECUTIONMANAGER_IDL #define EXECUTIONMANAGER_IDL -#include "ciao/Deployment.idl" -#include "ciao/Deployment_DomainApplicationManager.idl" +#include "Deployment.idl" +#include "DomainApplicationManager.idl" module Deployment { interface ExecutionManager { - /// @todo ResourceCommitmentManger is missing DomainApplicationManager preparePlan (in DeploymentPlan plan, in boolean commitResources) raises (ResourceNotAvailable, PlanError, StartError); DomainApplicationManagers getManagers (); - void destroyManager (in DomainApplicationManager manager) - raises (StopError); - - /// CIAO Specific extension DomainApplicationManager getManager (in string plan_uuid) raises (PlanNotExist); + void destroyManager (in DomainApplicationManager manager) + raises (StopError); + /// CIAO specific extention /// Destroy ApplicationManagers by plan_uuid, the unique semantics of this /// operation lies in the fact that if some components are diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h index 848259f72d5..a8752b95218 100644 --- a/CIAO/ciao/Home_Servant_Impl_Base.h +++ b/CIAO/ciao/Home_Servant_Impl_Base.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "CCM_HomeS.h" +#include "CCM_ComponentS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp index ec85dc8be6a..12ce1132f10 100644 --- a/CIAO/ciao/Home_Servant_Impl_T.cpp +++ b/CIAO/ciao/Home_Servant_Impl_T.cpp @@ -72,7 +72,7 @@ namespace CIAO return; } - typedef typename COMP_SVNT::_stub_type stub_type; + typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type _ciao_comp = stub_type::_narrow (ccm_obj_var.in () ACE_ENV_ARG_PARAMETER); @@ -149,10 +149,10 @@ namespace CIAO CIAO_TRACE ("Home_Servant_Impl<>::create"); if (this->executor_.in () == 0) - { - ACE_THROW_RETURN (CORBA::INTERNAL (), - COMP_SVNT::_stub_type::_nil ()); - } + { + ACE_THROW_RETURN (CORBA::INTERNAL (), + COMP_SVNT::_stub_type::_nil ()); + } ::Components::EnterpriseComponent_var _ciao_ec = this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/CIAO/ciao/NodeApp_CB_Impl.h b/CIAO/ciao/NodeApp_CB_Impl.h index 95cc3de30e5..824f3605d8f 100644 --- a/CIAO/ciao/NodeApp_CB_Impl.h +++ b/CIAO/ciao/NodeApp_CB_Impl.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CIAO_NodeApplication_CallBackS.h" +#include "NodeApplication_CallBackS.h" namespace CIAO { diff --git a/CIAO/ciao/Deployment_NodeApplicationManager.idl b/CIAO/ciao/NodeApplicationManager.idl index 32f3f0d21f9..1c3e33ad05b 100644 --- a/CIAO/ciao/Deployment_NodeApplicationManager.idl +++ b/CIAO/ciao/NodeApplicationManager.idl @@ -2,26 +2,18 @@ #ifndef NODEAPPLICATIONMANAGER_IDL #define NODEAPPLICATIONMANAGER_IDL -#include "Deployment_Core.idl" -#include "Deployment_ApplicationManager.idl" #include "Deployment.idl" module Deployment { - /** - * CIAO specific structure to carry the scheduling params - * to set the process, required by RACE - * @struct Sched_Params - * @brief Carries Scheduling Params - */ - struct Sched_Params - { - long policy_; - long priority_; - long scope_; - long msec_; + interface ApplicationManager { + Application startLaunch (in Properties configProperty, + out Connections providedReference, + in boolean start) + raises (ResourceNotAvailable, StartError, InvalidProperty); + void destroyApplication (in Application app) + raises (StopError); }; - interface NodeApplicationManager : ApplicationManager { @@ -29,7 +21,7 @@ module Deployment { /// and reconfiguration /// This operation could handle dynamic redeployment for /// a node-level deployment plan within a node - /// @param add_or_remove If true, we add new components only, vice vesa. + /// @para add_or_remove If true, we add new components only, vice vesa. Application perform_redeployment (in Properties configProperty, out Connections providedReference, in boolean add_or_remove, @@ -45,12 +37,12 @@ module Deployment { /// CIAO specific operation to reset deployment plan void reset_plan (in DeploymentPlan plan); - /// CIAO specific operation to set the information of + /// CIAO speicfic operation to set the information of /// "shared components" (through NodeManager) void set_shared_components (in ComponentPlans components); - + /// CIAO specific function to set priority - /// of component, required by RACE + /// o component , required by RACE long set_priority (in string cid , in Sched_Params params); }; }; diff --git a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl b/CIAO/ciao/NodeApplication_CallBack.idl index 35cf8afabdd..d0f8daeb42e 100644 --- a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl +++ b/CIAO/ciao/NodeApplication_CallBack.idl @@ -9,8 +9,8 @@ * NodeApplication. */ -#include "ciao/Deployment_NodeApplication.idl" -#include "ciao/Deployment_NodeApplicationManager.idl" +#include "Deployment.idl" +#include "NodeApplicationManager.idl" module CIAO { diff --git a/CIAO/ciao/Deployment_NodeManager.idl b/CIAO/ciao/NodeManager.idl index e6672764115..47651ac52bb 100644 --- a/CIAO/ciao/Deployment_NodeManager.idl +++ b/CIAO/ciao/NodeManager.idl @@ -2,37 +2,22 @@ #ifndef NODEMANAGER_IDL #define NODEMANAGER_IDL -#include "ciao/Deployment.idl" -#include "ciao/Deployment_Core.idl" -#include "ciao/Deployment_TargetManager.idl" +#include "Deployment.idl" module Deployment { - interface Logger { - }; - interface NodeApplicationManager; interface NodeManager { - /* - * @todo 06-02-01 mentions a 4th argument:in long updateInterval - */ void joinDomain (in Domain ciao_domain, in TargetManager manager, in Logger log); void leaveDomain (); - /* - * @todo According to 06-02-01 there should also be a ResourceCommitmentManager - * as second argument - */ NodeApplicationManager preparePlan (in DeploymentPlan plan) raises (StartError, PlanError); - /* - * @todo According to 06-02-01 InvalidReference shouldn't be here - */ void destroyManager (in NodeApplicationManager appManager) raises (StopError, InvalidReference); @@ -47,11 +32,6 @@ module Deployment { /// CIAO specific extension /// Get all the shared components installed in this node ComponentPlans get_shared_components (); - - /* - * @todo According to 06-02-01 missing is: - * Resources getDynamicResources (); - */ }; }; diff --git a/CIAO/ciao/Deployment_Packaging_Data.idl b/CIAO/ciao/Packaging_Data.idl index ed3d0feecb2..533116196eb 100644 --- a/CIAO/ciao/Deployment_Packaging_Data.idl +++ b/CIAO/ciao/Packaging_Data.idl @@ -3,7 +3,7 @@ #ifndef PACKAGING_DATA_IDL #define PACKAGING_DATA_IDL -#include "ciao/Deployment_Data.idl" +#include "Deployment_Data.idl" module Deployment { diff --git a/CIAO/ciao/Port_Activator.cpp b/CIAO/ciao/Port_Activator.cpp index 3a16c75b0d0..e428102a355 100644 --- a/CIAO/ciao/Port_Activator.cpp +++ b/CIAO/ciao/Port_Activator.cpp @@ -20,22 +20,15 @@ namespace CIAO } const char* - Port_Activator::oid (void) const + Port_Activator::name (void) const { // @@ TODO, need to be inlined. return this->oid_.in (); } void - Port_Activator::oid (const char* oid) + Port_Activator::set_name (const char* name) { - this->oid_ = oid; - } - - const char* - Port_Activator::name (void) const - { - // @@ TODO, need to be inlined. - return this->name_.in (); + this->oid_ = name; } } diff --git a/CIAO/ciao/Port_Activator.h b/CIAO/ciao/Port_Activator.h index db047575405..5ab3adb2604 100644 --- a/CIAO/ciao/Port_Activator.h +++ b/CIAO/ciao/Port_Activator.h @@ -51,14 +51,11 @@ namespace CIAO virtual ~Port_Activator (void); - /// Return the oid of port that this activator encapulates. - const char* oid (void) const; + /// Return the name of port that this activator encapulates. + const char* name (void) const; - /// Set the oid - void oid (const char* oid); - - /// Return the oid of port that this activator encapulates. - const char* name (void) const; + /// Set the name + void set_name (const char* name); /// Activate the servant reponsible for this port. /** @@ -83,7 +80,7 @@ namespace CIAO CORBA::String_var name_; /// What type of port is it, a consumer or facet. - Type const t_; + Type t_; }; } diff --git a/CIAO/ciao/Deployment_RepositoryManager.idl b/CIAO/ciao/RepositoryManager.idl index 539d2954416..c5645bcab69 100644 --- a/CIAO/ciao/Deployment_RepositoryManager.idl +++ b/CIAO/ciao/RepositoryManager.idl @@ -2,8 +2,8 @@ #ifndef REPOSITORY_MANAGER_IDL #define REPOSITORY_MANAGER_IDL -#include "ciao/Deployment_Packaging_Data.idl" -#include "ciao/Deployment.idl" +#include "Packaging_Data.idl" +#include "Deployment.idl" module Deployment { @@ -16,7 +16,7 @@ module Deployment { }; interface RepositoryManager { - void installPackage (in string installationName, + void installPackage (in string installationName, in string location, in boolean replace) raises (NameExists, PackageError); diff --git a/CIAO/ciao/Security.idl b/CIAO/ciao/Security.idl deleted file mode 100644 index 199ae210c31..00000000000 --- a/CIAO/ciao/Security.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @@ This is just a temporary file. CIAO doesn't sue the security - * service in its implementation but just using this local - * interface below from the real security service pulls in - * 250Kb of footprint - * - * $Id$ - */ - -#if !defined (CIAO_SECURITY_IDL) -#define CIAO_SECURITY_IDL - -#pragma prefix "omg.org" - -module SecurityLevel2 { - -# pragma version SecurityLevel2 1.8 - - local interface Credentials - { - }; -}; -#endif /* CIAO_SECURITY_IDL */ diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp index 2638133fa23..cf194524ec7 100644 --- a/CIAO/ciao/Servant_Activator.cpp +++ b/CIAO/ciao/Servant_Activator.cpp @@ -25,7 +25,7 @@ namespace CIAO guard, this->mutex_); - size_t const sz = this->slot_index_; + const size_t sz = this->slot_index_; for (size_t t = 0; t != sz; ++t) { @@ -49,16 +49,16 @@ namespace CIAO guard, this->mutex_, 0); - size_t const sz = this->slot_index_; + const size_t sz = this->slot_index_; for (size_t t = 0; t != sz; ++t) { Port_Activator *&tmp = this->pa_[t]; - if (ACE_OS::strcmp (tmp->oid (), str.in ()) == 0) - { - tmp->oid ("dummy"); - //delete tmp; - //--this->slot_index_; - } + if (ACE_OS::strcmp (tmp->name (), str.in ()) == 0) + { + tmp->set_name ("dummy"); + //delete tmp; + //--this->slot_index_; + } } } return true; @@ -86,7 +86,7 @@ namespace CIAO this->mutex_, 0); - size_t const sz = this->slot_index_; + const size_t sz = this->slot_index_; Port_Activator *tmp = 0; @@ -104,7 +104,7 @@ namespace CIAO " value from the array is null \n")); continue; } - if (ACE_OS::strcmp (tmp->oid (), + if (ACE_OS::strcmp (tmp->name (), str.in ()) == 0) { // We should try avoiding making outbound calls with the @@ -135,7 +135,7 @@ namespace CIAO CORBA::String_var str = PortableServer::ObjectId_to_string (oid); - size_t const sz = this->slot_index_; + const size_t sz = this->slot_index_; Port_Activator *tmp = 0; @@ -152,7 +152,7 @@ namespace CIAO ACE_DEBUG ((LM_DEBUG, "Port Activator is NULL\n")); continue; } - if (ACE_OS::strcmp (tmp->oid (), + if (ACE_OS::strcmp (tmp->name (), str.in ()) == 0) { ACE_DEBUG ((LM_DEBUG, "Deactivating Port %s\n", diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp index daa48f70014..dc50e0bd0f8 100644 --- a/CIAO/ciao/Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servant_Impl_Base.cpp @@ -29,6 +29,8 @@ namespace CIAO ::Components::NoKeyAvailable)) { ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0); + + return 0; } CORBA::IRObject_ptr @@ -65,8 +67,9 @@ namespace CIAO this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong const facet_len = facets->length (); - for (CORBA::ULong i = 0; i < facet_len; ++i) + const CORBA::ULong facet_len = facets->length (); + CORBA::ULong i = 0; + for (i = 0; i < facet_len; ++i) { PortableServer::ObjectId_var facet_id = this->container_->the_facet_cons_POA ()->reference_to_id @@ -91,8 +94,9 @@ namespace CIAO this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong const consumer_len = consumers->length (); - for (CORBA::ULong j = 0; j < consumer_len; ++j) + const CORBA::ULong consumer_len = consumers->length (); + CORBA::ULong j = 0; + for (j = 0; j < consumer_len; ++j) { PortableServer::ObjectId_var cons_id = this->container_->the_facet_cons_POA ()->reference_to_id @@ -228,13 +232,13 @@ namespace CIAO ::Components::FacetDescriptions, 0); Components::FacetDescriptions_var safe_retval = retval; - CORBA::ULong const len = names.length (); + CORBA::ULong len = names.length (); safe_retval->length (len); + ::Components::FacetDescription *tmp = 0; for (CORBA::ULong i = 0; i < len; ++i) { - ::Components::FacetDescription *tmp = - this->lookup_facet_description (names[i]); + tmp = this->lookup_facet_description (names[i]); if (0 == tmp) { @@ -298,6 +302,7 @@ namespace CIAO iter != this->consumer_table_.end (); ++iter, ++i) { + // ACE_DEBUG ((LM_DEBUG, "EXECUTING \n")); ConsumerTable::const_reference entry = *iter; retval[i] = entry.second; } @@ -345,13 +350,13 @@ namespace CIAO ::Components::ConsumerDescriptions, 0); Components::ConsumerDescriptions_var safe_retval = retval; - CORBA::ULong const len = names.length (); + CORBA::ULong len = names.length (); safe_retval->length (len); + ::Components::ConsumerDescription *tmp = 0; for (CORBA::ULong i = 0; i < len; ++i) { - ::Components::ConsumerDescription *tmp = - this->lookup_consumer_description (names[i]); + tmp = this->lookup_consumer_description (names[i]); if (0 == tmp) { @@ -434,6 +439,7 @@ namespace CIAO } /// Protected operations. + void Servant_Impl_Base::add_facet (const char *port_name, ::CORBA::Object_ptr port_ref @@ -448,21 +454,20 @@ namespace CIAO ::Components::FacetDescription *fd = 0; ACE_NEW (fd, - ::OBV_Components::FacetDescription ( - port_name, - port_ref->_interface_repository_id (), - port_ref)); + ::OBV_Components::FacetDescription); ::Components::FacetDescription_var safe = fd; + fd->name (port_name); + fd->type_id (port_ref->_interface_repository_id ()); + fd->facet_ref (port_ref); + FacetTable::value_type entry; entry.first = port_name; entry.second = safe._retn (); - { - ACE_WRITE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); + ACE_WRITE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); - (void) this->facet_table_.insert (entry); - } + (void) this->facet_table_.insert (entry); } CORBA::Object_ptr @@ -499,14 +504,15 @@ namespace CIAO } ::Components::FacetDescription_var fd; + FacetTable::const_iterator iter; { ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); - FacetTable::const_iterator iter = - this->facet_table_.find (port_name); + + iter = this->facet_table_.find (port_name); if (iter != this->facet_table_.end ()) { @@ -537,17 +543,19 @@ namespace CIAO safe = rd; rd->name (receptacle_name); - rd->type_id (); + rd->type_id (recept_ref->_interface_repository_id ()); // The receptacle is a multiplex receptacle if and only if a // cookie was given. rd->is_multiple (cookie != 0); ::Components::ConnectionDescription *cd = 0; ACE_NEW (cd, - OBV_Components::ConnectionDescription ( - cookie, - recept_ref)); + OBV_Components::ConnectionDescription); ::Components::ConnectionDescription_var cd_safe = cd; + + cd->ck (cookie); + cd->objref (recept_ref); + ::Components::ConnectionDescriptions cds (1); cds.length (1); @@ -561,10 +569,12 @@ namespace CIAO ::Components::ConnectionDescription *cd = 0; ACE_NEW (cd, - OBV_Components::ConnectionDescription ( - cookie, - recept_ref)); + OBV_Components::ConnectionDescription); ::Components::ConnectionDescription_var cd_safe = cd; + + cd->ck (cookie); + cd->objref (recept_ref); + ::Components::ConnectionDescriptions & cds = rd->connections (); CORBA::ULong old_length = cds.length (); ACE_DEBUG ((LM_DEBUG, "Old length was %d\n", old_length)); diff --git a/CIAO/ciao/Servant_Impl_Base.h b/CIAO/ciao/Servant_Impl_Base.h index c96add04588..a68270392b2 100644 --- a/CIAO/ciao/Servant_Impl_Base.h +++ b/CIAO/ciao/Servant_Impl_Base.h @@ -28,11 +28,10 @@ #include "ace/Active_Map_Manager_T.h" #include "ace/Thread_Mutex.h" -#include "CCM_EventsC.h" +#include "CCM_EventC.h" #include "CIAO_Server_Export.h" -#include "CCM_ContainerC.h" -#include "CCM_ObjectS.h" -#include "CCM_StandardConfiguratorC.h" +#include "CCM_ComponentS.h" +#include "CCM_ContainerS.h" #include "Home_Servant_Impl_Base.h" #include "Servant_Activator.h" @@ -138,7 +137,7 @@ namespace CIAO ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); - + virtual ::Components::ReceptacleDescriptions * get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp index c1e7a6ce117..b9476f72333 100644 --- a/CIAO/ciao/Servant_Impl_T.cpp +++ b/CIAO/ciao/Servant_Impl_T.cpp @@ -4,7 +4,6 @@ #define CIAO_SERVANT_IMPL_T_C #include "Servant_Impl_T.h" -#include "CCM_EntityContextC.h" namespace CIAO { diff --git a/CIAO/ciao/CIAO_ServerResources.idl b/CIAO/ciao/ServerResources.idl index de14402f835..2269357ce38 100644 --- a/CIAO/ciao/CIAO_ServerResources.idl +++ b/CIAO/ciao/ServerResources.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @file CIAO_ServerResources.idl + * @file ServerResources.idl * * @brief A collection of IDL data types for * @@ -41,7 +41,7 @@ module CIAO typedef string SvcconfURI; /** - * @brief enumeration of ORB Resource Types (ORT) supported in RT + * @breif enumeration of ORB Resource Types (ORT) supported in RT * extension. */ enum ORBResourceType diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp index 8e1428382d0..efb4e9144af 100644 --- a/CIAO/ciao/Server_init.cpp +++ b/CIAO/ciao/Server_init.cpp @@ -3,7 +3,6 @@ #include "Server_init.h" #include "CIAO_common.h" #include "CCM_ComponentC.h" -#include "CCM_StandardConfiguratorC.h" #include "Cookies.h" #include "ace/OS_NS_stdio.h" @@ -14,6 +13,8 @@ namespace CIAO { CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init, Components::Cookie); + CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init, + CIAO::Cookie); CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init, Components::PortDescription); CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init, diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h index 558137b64d5..a743c4d231f 100644 --- a/CIAO/ciao/StandardConfigurator_Impl.h +++ b/CIAO/ciao/StandardConfigurator_Impl.h @@ -18,7 +18,7 @@ #define CIAO_STANDARDCONFIGURATOR_IMPL_H # include /**/ "ace/pre.h" -#include "CCM_StandardConfiguratorS.h" +#include "CCM_ComponentS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/ciao/CIAO_SwapExec.idl b/CIAO/ciao/SwapExec.idl index 2349988f46d..1a6d00c3575 100644 --- a/CIAO/ciao/CIAO_SwapExec.idl +++ b/CIAO/ciao/SwapExec.idl @@ -1,6 +1,7 @@ // $Id$ -#include "ciao/CCM_EnterpriseComponent.idl" +#include "CCM_Container.idl" + module CIAO { diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h index 5e118476f18..66258261e7d 100644 --- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h +++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CCM_HomeS.h" +#include "CCM_ComponentS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/ciao/Deployment_TargetManager.idl b/CIAO/ciao/Target_Data.idl index 78723ab3b3d..ba1d895c784 100644 --- a/CIAO/ciao/Deployment_TargetManager.idl +++ b/CIAO/ciao/Target_Data.idl @@ -1,24 +1,26 @@ // $Id$ -#ifndef TARGETMANAGER_IDL -#define TARGETMANAGER_IDL +#ifndef TARGET_DATA_IDL +#define TARGET_DATA_IDL -#include "ciao/Deployment_Target_Data.idl" -#include "ciao/Deployment_TargetData.idl" -#include "ciao/Deployment_DeploymentPlan.idl" -// Only needed for ResourceNotAvailable but that should go, so this include also -#include "ciao/Deployment_ApplicationManager.idl" +#include "Deployment_Data.idl" module Deployment { - /// @todo, UpdateAvailable is not in the spec, must be UpdateDynamic - enum DomainUpdateKind { - Add, - Delete, - UpdateAll, - UpdateAvailable + exception ResourceNotAvailable { + string name; + string resourceType; + string propertyName; + string elementName; + string resourceName; }; + exception PlanError { + string name; + string reason; + }; + + /** * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not * part of the Target Manager yet @@ -37,4 +39,4 @@ module Deployment { }; }; -#endif /* TARGETMANAGER_IDL */ +#endif /* TARGET_DATA_IDL */ diff --git a/CIAO/ciao/CIAO_UpgradeableContext.idl b/CIAO/ciao/UpgradeableContext.idl index 6d4b315ae85..0fe4a332986 100644 --- a/CIAO/ciao/CIAO_UpgradeableContext.idl +++ b/CIAO/ciao/UpgradeableContext.idl @@ -1,7 +1,10 @@ // $Id$ -#include "ciao/CCM_Container.idl" +#include "CCM_Container.idl" +#include "CCM_Base.idl" +#include "CCM_Event.idl" #include "tao/PortableServer/PortableServer_include.pidl" +#include <orb.idl> module CIAO { diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h index dc8d3269fcf..18e5272b205 100644 --- a/CIAO/ciao/Upgradeable_Context_Impl_T.h +++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "ciao/CIAO_UpgradeableContextC.h" +#include "ciao/UpgradeableContextC.h" #include "ciao/Context_Impl_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h index a5583673907..f3994eb086f 100644 --- a/CIAO/ciao/Version.h +++ b/CIAO/ciao/Version.h @@ -4,6 +4,6 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release. #define CIAO_MAJOR_VERSION 0 -#define CIAO_MINOR_VERSION 5 -#define CIAO_BETA_VERSION 4 -#define CIAO_VERSION "0.5.4" +#define CIAO_MINOR_VERSION 5 +#define CIAO_BETA_VERSION 3 +#define CIAO_VERSION "0.5.3" diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp index ad5aba294bf..58e7ee9c9e3 100644 --- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp +++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp @@ -24,8 +24,7 @@ namespace CIAO void EventServiceBase::ciao_push_event ( ::Components::EventBase * evt, - const char * source_id, - ::CORBA::TypeCode_ptr tc + const char * source_id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, @@ -33,6 +32,5 @@ namespace CIAO { ACE_UNUSED_ARG (evt); ACE_UNUSED_ARG (source_id); - ACE_UNUSED_ARG (tc); } } diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h index cec5777ae6e..f20de7591b0 100644 --- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h +++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h @@ -114,8 +114,7 @@ namespace CIAO */ virtual void ciao_push_event ( ::Components::EventBase * evt, - const char * source_id, - ::CORBA::TypeCode_ptr tc + const char * source_id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl index 266f8b472e9..49393ede7a4 100644 --- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl +++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl @@ -9,11 +9,7 @@ * @brief Interfaces for configuring CIAO's event mechanism. */ -#if !defined (CIAO_EVENTS_IDL) -#define CIAO_EVENTS_IDL - -#include "ciao/CCM_EventConsumerBase.idl" -#include "ciao/CCM_Base.idl" +#include "ciao/CCM_Event.idl" module CIAO { @@ -75,5 +71,3 @@ module CIAO //void push_event (in Components::EventBase ev); }; }; - -#endif /* CIAO_EVENTS_IDL */ diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp index fa597a12a87..333fcc8f8f1 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp @@ -14,9 +14,9 @@ #include "CIAO_RTEvent.h" #include "ciao/CIAO_common.h" #include "SimpleAddressServer.h" -#include "tao/ORB_Core.h" +#include <tao/ORB_Core.h> #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" -#include "orbsvcs/CosNamingC.h" +#include <orbsvcs/CosNamingC.h> #include <sstream> @@ -529,7 +529,7 @@ namespace CIAO RTEventService::tao_rt_event_channel (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((::CORBA::SystemException)) { - return this->rt_event_channel_.in (); + return this->rt_event_channel_; } ////////////////////////////////////////////////////////////////////// diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp index d04a8528e9a..d5db60e5651 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp @@ -1,4 +1,4 @@ -/* $Id$ */ +// SimpleAddressServer.cpp #include "SimpleAddressServer.h" #include <ace/INET_Addr.h> diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h index 9e149226d53..04aabc6ea66 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h @@ -1,20 +1,12 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SimpleAddressServer.h - * - * $Id$ - * - * @author Gan Deng <dengg@dre.vanderbilt.edu> - */ -//============================================================================= +// SimpleAddressServer.h #ifndef SIMPLEADDRESSSERVER_H #define SIMPLEADDRESSSERVER_H #include <orbsvcs/RtecUDPAdminS.h> +class ACE_INET_Addr; + class SimpleAddressServer : public POA_RtecUDPAdmin::AddrServer { public: SimpleAddressServer (const ACE_INET_Addr& address); diff --git a/CIAO/docs/generate_component_mpc.html b/CIAO/docs/generate_component_mpc.html deleted file mode 100644 index 3f109e57adc..00000000000 --- a/CIAO/docs/generate_component_mpc.html +++ /dev/null @@ -1,105 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]"> - <title>TAO IDL compiler User's Guide</title> - <!-- $Id$ --> - </head> - <body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#CC0000"> - <hr> - <h3>Using The generate_component_mpc.pl Script</h3> - This document describes the options and usage of the Perl script <tt>generate_component_mpc.pl</tt> - in the <tt>$(CIAO_ROOT)/bin</tt> directory. - <HR> - <P> - <h4>Assumptions</h4> - This script is useful for generating MPC files for relatively simple component - applications. The string name passed to the script should be the name of the <em>single</em> - IDL file for that build (without the extension) and also the name of the single - CIDL file, if it is a component build. The names of export files, preprocessor - macros, and library names in the generated MPC file will all be constructed - from this string. It is also assumed that the IDL file for a component build - will contain a single component declaration. - <P> - Judicious use of the script options in the table below will generate a build - that keeps to a minimum both the code generated from IDL and the number of - linked libraries from the middleware. - <P> - <HR> - <h4><A NAME="options">Script Options</A></h4> - - <table BORDER="2" CELLSPACING="2" CELLPADDING="0"> - <tr> - <th> - Option</th> - <th> - Description</th> - <th> - Remark</th> - </tr> - <tr> - <a NAME="h"> - <td><tt>-h</tt></td> - <td>The compiler prints out the options that are given below and exits clean - </td> - <td> </td> - </tr> - <tr> - <a NAME="p"> - <td><tt>-p</tt><i> string</i></td> - <td>Indicates another make/project that this one depends on</td> - <td>Used as a project name prefix unless overridden by <tt>-u</tt> option</td> - </tr> - <tr> - <a name="l"> - <td><tt>-l</tt><i> string</i></td> - </td> - <td>Path to the dependent name value of <tt>-p</tt></td> - <td>Needed only if the dependent make/project isn't already in the search path</td> - </tr> - <tr> - <a name="n"> - <td><tt>-n</tt></td> - <td>Non-component make/project</td> - <td>Generates a <tt>*_stub</tt> and <tt>*_skel</tt> pair of builds, instead - of the default <tt>*_stub</tt>, <tt>*_svnt</tt> and <tt>*_exec</tt> - builds. Also specializes the IDL compiler command line options and linked - lib list, depending on the <tt>-e</tt> option, if it exists</td> - </tr> - <tr> - <a name="e"> - <td><tt>-e</tt></td> - <td><tt>eventtype</tt> declaration present in IDL</td> - <td>Has no effect unless the <tt>-n</tt> option is also present, in which - case the IDL compiler command line options and list of linked libs will - change to reflect the fact that IDL eventtypes require typecode support - and depend on libs in CIAO, which for a non-component build would - otherwise not be the case</td> - </tr> - <tr> - <a name="i"> - <td><tt>-i</tt></td> - <td>Use an executor IDL file</td> - <td>Indicates the presence of an IDL file in the executor make/project, - from which the actual executor implementation will inherit. Assumes - the name of this IDL file is of the form <tt>[<i>component_name</i>]EI.idl</tt></td> - </tr> - <tr> - <a name="c"> - <td><tt>-c</tt></td> - <td>Create a client make/project</td> - <td>Generates a build for a "driver" executable. Assumes there is a single - C++ source file named <tt>client.cpp</tt></td> - </tr> - <tr> - <a name="u"> - <td><tt>-u</tt></tt><i> string</i></td> - <td>Unique project name prefix</td> - <td>Occasionally needed since MPC doesn't accept duplicate project names - anywhere in the tree over which it is proecessing. This option - overrides the value of the <tt>-p</tt> option, if present</td> - </tr> - </table> - </body> -</html> diff --git a/CIAO/docs/tutorials/CoSMIC/index.html b/CIAO/docs/tutorials/CoSMIC/index.html index 74547224422..0deb8d7aa03 100644 --- a/CIAO/docs/tutorials/CoSMIC/index.html +++ b/CIAO/docs/tutorials/CoSMIC/index.html @@ -2,11 +2,11 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - + <meta name="generator" content="HTML Tidy for Mac OS X (vers 1st December 2004), see www.w3.org" /> - + <title>Building a Stock Quoter with TAO - A Tutorial</title> <!-- $Id$ --> </head> @@ -15,13 +15,13 @@ <body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link="#000fff" vlink="#ff0f0f"> - + <h3>Building a Stock Quoter with CoSMIC and DAnCE - A Tutorial<br /> </h3> - + <p>This tutorial provides a step-by-step lesson on developing component-based distributed applications using <a href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> modeling toolkit and <a href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO/DAnCE</a> @@ -41,7 +41,7 @@ </p> - + <div style="text-align: center;"> <img alt="" src="Images/fig1.jpg" style="width: 362px; height: 193px;" /><br /> @@ -52,7 +52,7 @@ </div> - + <p>This tutorial will show you how to use generic modeling techniques <a href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> to assist the development process of CIAO applications. All the necessary steps @@ -60,9 +60,9 @@ documented here.</p> - + <blockquote> - + <hr /> <strong>Note:</strong><br /> @@ -77,7 +77,7 @@ CosMIC 0.5.2. It will be subject to change as version of GME and CoSMIC evolves.<br /> - + <hr /> </blockquote> <strong><big>Prerequisites</big></strong><br /> @@ -86,13 +86,13 @@ Before you start, you will need the following: - + <ol> <li><strong>ACE+TAO+CIAO (Component Integraated ACE ORB).</strong> ACE + TAO + CIAO provide the CCM infrastructure necessary to enable the CCM-based distributed component - interaction. You can click <a href="http://download.dre.vanderbilt.edu">here</a> to download + interaction. You can click <a href="http://deuce.doc.wustl.edu/Download.html">here</a> to download the latest ACE + TAO + CIAO and click <a href="../../../../../ACE-Install.html"> here</a> for information on how to build ACE+TAO+CIAO.</li> @@ -107,18 +107,18 @@ <li><strong>CoSMIC toolkit.</strong> Click <a href="http://www.dre.vanderbilt.edu/cosmic/">here</a> to download the latest CoSMIC release.</li> - + </ol> - + <blockquote> - + <hr /> <strong>Note:</strong><br /> - + <ol> <li>Please use only the version of GME that the CoSMIC @@ -128,10 +128,10 @@ <li>Make sure you install GME before you install CoSMIC.</li> - + </ol> - + <hr /> </blockquote> <strong><a href="01.html">Getting @@ -180,10 +180,10 @@ <br /> - + <hr /> - + <address> <a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br /> </a> diff --git a/CIAO/docs/tutorials/Quoter/Simple/01.html b/CIAO/docs/tutorials/Quoter/Simple/01.html deleted file mode 100644 index fb33ed38008..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/01.html +++ /dev/null @@ -1,838 +0,0 @@ -<!-- $Id$ --> -<html xmlns:v="urn:schemas-microsoft-com:vml" -xmlns:o="urn:schemas-microsoft-com:office:office" -xmlns:w="urn:schemas-microsoft-com:office:word" -xmlns:p="urn:schemas-microsoft-com:office:powerpoint" -xmlns:oa="urn:schemas-microsoft-com:office:activation" -xmlns="http://www.w3.org/TR/REC-html40"> - -<head> -<meta http-equiv=Content-Type content="text/html; charset=us-ascii"> -<meta name=ProgId content=Word.Document> -<meta name=Generator content="Microsoft Word 11"> -<meta name=Originator content="Microsoft Word 11"> -<link rel=File-List href="01_files/filelist.xml"> -<link rel=Edit-Time-Data href="01_files/editdata.mso"> -<!--[if !mso]> -<style> -v\:* {behavior:url(#default#VML);} -o\:* {behavior:url(#default#VML);} -w\:* {behavior:url(#default#VML);} -.shape {behavior:url(#default#VML);} -</style> -<![endif]--> -<title>Getting Started</title> -<!--[if gte mso 9]><xml> - <o:DocumentProperties> - <o:Author>Abdullah Sowayan</o:Author> - <o:LastAuthor>Abdullah Sowayan</o:LastAuthor> - <o:Revision>22</o:Revision> - <o:TotalTime>244</o:TotalTime> - <o:Created>2006-10-09T18:21:00Z</o:Created> - <o:LastSaved>2006-12-01T17:30:00Z</o:LastSaved> - <o:Pages>1</o:Pages> - <o:Words>859</o:Words> - <o:Characters>4900</o:Characters> - <o:Company>Maritime Systems & Sensors</o:Company> - <o:Lines>40</o:Lines> - <o:Paragraphs>11</o:Paragraphs> - <o:CharactersWithSpaces>5748</o:CharactersWithSpaces> - <o:Version>11.8107</o:Version> - </o:DocumentProperties> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:WordDocument> - <w:SpellingState>Clean</w:SpellingState> - <w:GrammarState>Clean</w:GrammarState> - <w:ValidateAgainstSchemas/> - <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> - <w:IgnoreMixedContent>false</w:IgnoreMixedContent> - <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> - <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> - </w:WordDocument> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> - </w:LatentStyles> -</xml><![endif]--> -<style> -<!-- - /* Font Definitions */ - @font-face - {font-family:Tahoma; - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - mso-generic-font-family:swiss; - mso-font-pitch:variable; - mso-font-signature:1627421319 -2147483648 8 0 66047 0;} - /* Style Definitions */ - p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -h3 - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - mso-outline-level:3; - font-size:13.5pt; - font-family:"Times New Roman"; - font-weight:bold;} -a:link, span.MsoHyperlink - {color:#000FFF; - text-decoration:underline; - text-underline:single;} -a:visited, span.MsoHyperlinkFollowed - {color:#FF0F0F; - text-decoration:underline; - text-underline:single;} -p - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -address - {margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - font-style:italic;} -code - {font-family:"Courier New"; - mso-ascii-font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman"; - mso-hansi-font-family:"Courier New"; - mso-bidi-font-family:"Courier New";} -p.MsoAcetate, li.MsoAcetate, div.MsoAcetate - {mso-style-noshow:yes; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - font-family:Tahoma; - mso-fareast-font-family:"Times New Roman";} -span.SpellE - {mso-style-name:""; - mso-spl-e:yes;} -span.GramE - {mso-style-name:""; - mso-gram-e:yes;} -@page Section1 - {size:8.5in 11.0in; - margin:1.0in 1.25in 1.0in 1.25in; - mso-header-margin:.5in; - mso-footer-margin:.5in; - mso-paper-source:0;} -div.Section1 - {page:Section1;} - /* List Definitions */ - @list l0 - {mso-list-id:137387275; - mso-list-type:hybrid; - mso-list-template-ids:268987612 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l0:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.75in; - mso-level-number-position:left; - margin-left:.75in; - text-indent:-.25in; - font-family:Symbol;} -@list l0:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1 - {mso-list-id:425031842; - mso-list-type:hybrid; - mso-list-template-ids:158504358 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l1:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:1.75in; - mso-level-number-position:left; - margin-left:1.75in; - text-indent:-.25in; - font-family:Symbol;} -@list l1:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2 - {mso-list-id:632565866; - mso-list-type:hybrid; - mso-list-template-ids:542421050 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l2:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:1.25in; - mso-level-number-position:left; - margin-left:1.25in; - text-indent:-.25in; - font-family:Symbol;} -@list l2:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3 - {mso-list-id:974944555; - mso-list-type:hybrid; - mso-list-template-ids:1880366448 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l3:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:1.25in; - mso-level-number-position:left; - margin-left:1.25in; - text-indent:-.25in; - font-family:Symbol;} -@list l3:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4 - {mso-list-id:1876190917; - mso-list-type:hybrid; - mso-list-template-ids:-767374784 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l4:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:1.75in; - mso-level-number-position:left; - margin-left:1.75in; - text-indent:-.25in; - font-family:Symbol;} -@list l4:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -ol - {margin-bottom:0in;} -ul - {margin-bottom:0in;} ---> -</style> -<!--[if gte mso 10]> -<style> - /* Style Definitions */ - table.MsoNormalTable - {mso-style-name:"Table Normal"; - mso-tstyle-rowband-size:0; - mso-tstyle-colband-size:0; - mso-style-noshow:yes; - mso-style-parent:""; - mso-padding-alt:0in 5.4pt 0in 5.4pt; - mso-para-margin:0in; - mso-para-margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:10.0pt; - font-family:"Times New Roman"; - mso-ansi-language:#0400; - mso-fareast-language:#0400; - mso-bidi-language:#0400;} -</style> -<![endif]--><!-- 01.html,v 1.3 2006/02/10 14:34:35 mxiong Exp --><!--[if gte mso 9]><xml> - <o:shapedefaults v:ext="edit" spidmax="8194"/> -</xml><![endif]--><!--[if gte mso 9]><xml> - <o:shapelayout v:ext="edit"> - <o:idmap v:ext="edit" data="1"/> - </o:shapelayout></xml><![endif]--> -</head> - -<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval: -.5in'> - -<div class=Section1> - -<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center; -line-height:150%'><span style='color:black'>Step 1: Define your interfaces and -component types<o:p></o:p></span></h3> - -<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center; -line-height:150%'><span style='color:black'><img width=447 height=350 -id="_x0000_i1025" src="images/Step1.JPG"><o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'><o:p> </o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'>Please make sure to read the following article to -under the Stock <span class=SpellE>Quoter</span> system architecture before -delving further into the tutorial:<o:p></o:p></span></h3> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo2; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><a -href="http://www.cuj.com/documents/s=9152/cujexp0404vinoski/">The CORBA -Component Model, Part 2: Defining Components with the IDL 3.x Types</a></p> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><o:p> </o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black'>Directory Structure:<o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'>The tutorial relies on the following directory -structure. Create <span class=SpellE>Quoter</span> and all its subdirectories -as shown below. We will describe the purpose of these directories later in the -tutorial.<o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;text-indent:.5in;line-height:150%'><span -class=SpellE><span style='font-size:12.0pt;line-height:150%;color:black; -font-weight:normal;mso-bidi-font-weight:bold'>Quoter</span></span><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><span -style='mso-spacerun:yes'> -</span>|---- descriptors<o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><span -style='mso-spacerun:yes'> -</span>|---- <span class=SpellE>Stock_Base</span><o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><span -style='mso-spacerun:yes'> -</span><span style='mso-spacerun:yes'> </span>|---- Distributor<o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><span -style='mso-spacerun:yes'> -</span>|---- Broker<o:p></o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><o:p> </o:p></span></h3> - -<h3 style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='font-size:12.0pt;line-height:150%;color:black'>Preliminaries:<o:p></o:p></span></h3> - -<h3 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo2; -tab-stops:list .75in'><![if !supportLists]><span style='font-size:12.0pt; -line-height:150%;font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;font-weight:normal;mso-bidi-font-weight:bold'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='font-size:12.0pt;line-height:150%; -color:black;font-weight:normal;mso-bidi-font-weight:bold'>We use the Make -Project Creator (MPC) throughout this tutorial. Understanding MPC will aid you -in understanding this tutorial. For more information on MPC please look at the -following:<o:p></o:p></span></h3> - -<h3 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:1.5in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level3 lfo2; -tab-stops:list 1.5in'><![if !supportLists]><span style='font-size:12.0pt; -line-height:150%;color:black;font-weight:normal;mso-bidi-font-weight:bold'><span -style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span class=GramE><span style='font-size:12.0pt; -line-height:150%;color:black;font-weight:normal;mso-bidi-font-weight:bold'>MPC <a -href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">Chapter</a> in <span -class=SpellE>TAO’s</span> Developer’s Guide 1.4a.</span></span><span -style='font-size:12.0pt;line-height:150%;color:black;font-weight:normal; -mso-bidi-font-weight:bold'><o:p></o:p></span></h3> - -<h3 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:1.5in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level3 lfo2; -tab-stops:list 1.5in'><![if !supportLists]><span style='font-size:12.0pt; -line-height:150%;color:black;font-weight:normal;mso-bidi-font-weight:bold'><span -style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='font-size:12.0pt;line-height:150%; -color:black;font-weight:normal;mso-bidi-font-weight:bold'>$ACE_ROOT/MPC/README<o:p></o:p></span></h3> - -<p class=MsoNormal style='line-height:150%'><b><span style='color:black'>Interface -Design:</span></b><span style='color:black'><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height: -150%;mso-list:l0 level1 lfo2;tab-stops:list .75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black'>In the <span -class=SpellE><i style='mso-bidi-font-style:normal'>Quoter/<span -style='mso-bidi-font-style:italic'>Stock_Base</span></i></span><i> </i><span -style='mso-bidi-font-style:italic'>sub-</span>directory, place an <span -class=SpellE>idl</span> file </span><span class=SpellE><code><i><span -style='font-size:10.0pt;line-height:150%;color:black'>Stock_Base.idl</span></i></code></span><span -style='color:black'> that you could copy from <a -href="Stock_Base/Stock_Base.idl">here</a>. This file defines the interfaces and -events that will be used by both Stock Distributor and Stock Broker. We put -together the common interface definitions so the base library can be shared by -both components, reducing the size of "real" components.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height: -150%;mso-list:l0 level1 lfo2;tab-stops:list .75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black'>Next, we need to -create a Make Project Creator (MPC) file to generate the make files for us. -From the <span class=SpellE><i style='mso-bidi-font-style:normal'>Quoter/<span -style='mso-bidi-font-style:italic'>Stock_Base</span></i></span><span -style='mso-bidi-font-style:italic'> subdirectory, type the following command:</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>generate_component_mpc.pl -–n -e <span class=SpellE>Stock_Base</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span -style='color:black;mso-bidi-font-style:italic'>Note that we pass the –e option -to </span><span style='font-family:"Courier New";color:black;mso-bidi-font-style: -italic'>generate_component_mpc.pl because our </span><span class=SpellE><code><i><span -style='font-size:10.0pt;line-height:150%;color:black'>Stock_Base.idl</span></i></code></span><code><i><span -style='font-size:10.0pt;line-height:150%;color:black'> </span></i></code><span -style='color:black;mso-bidi-font-style:italic'>uses <span class=SpellE>eventtypes</span>. -If our <span class=SpellE>idl</span> file did not use <span class=SpellE>eventtypes</span>, -we would<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.5in;line-height:150%'><span -class=GramE><span style='color:black;mso-bidi-font-style:italic'>not</span></span><span -style='color:black;mso-bidi-font-style:italic'> pass the –e command line -option.<o:p></o:p></span></p> - -<p class=MsoNormal style='text-indent:.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:.75in;line-height:150%'><span -style='color:black;mso-bidi-font-style:italic'>The command above will generate -a <span class=SpellE><i>Stock_Base.mpc</i></span> file that contains two -projects <span class=SpellE><i>Stock_Base_stub</i></span><i> </i>and <span -class=SpellE><i>Stock_Base_skel</i></span><i> </i>for the Stub and Servant code -respectively. In addition, the command above will generate export files that -will portably handle platform specific issues of import/export declarations of -dynamically linked libraries (DLLs). After executing the command above you -should see the following output on your screen.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>The -following commands have been executed:<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl STOCK_BASE_STUB > <span class=SpellE>Stock_Base_stub_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> </span>generate_export_file.pl -STOCK_BASE_SKEL > <span class=SpellE>Stock_Base_skel_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:.75in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.75in;text-indent:-1.25in;line-height: -150%;mso-list:l1 level1 lfo4;tab-stops:list .75in 1.75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-style:italic'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-style: -italic'>The MPC file should look like <a href="Stock_Base/Stock_Base.mpc">this</a>. -</span><span style='font-family:"Courier New";color:black;mso-bidi-font-style: -italic'><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><b><span style='color:black'>Component -Design:</span></b><span style='color:black'><o:p></o:p></span></p> - -<p class=MsoNormal style='text-indent:.5in;line-height:150%'><b -style='mso-bidi-font-weight:normal'><span style='color:black'>Distributor:</span></b><span -style='color:black'> <o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height: -150%;mso-list:l3 level1 lfo6;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black'>In the </span><span -class=SpellE><code><i><span style='font-size:10.0pt;line-height:150%; -color:black'>Quoter</span></i></code></span><code><i><span style='font-size: -10.0pt;line-height:150%;color:black'>/Distributor </span></i></code><code><span -style='mso-ansi-font-size:12.0pt;mso-bidi-font-size:12.0pt;line-height:150%; -font-family:"Times New Roman";color:black;mso-bidi-font-style:italic'>sub-directory</span></code><span -style='color:black'>, place an <span class=SpellE>idl</span> file </span><span -class=SpellE><code><i><span style='font-size:10.0pt;line-height:150%; -color:black'>Distributor.idl</span></i></code></span><span style='color:black'> -that looks like <a href="Distributor/Distributor.idl">this</a>. This file -defines the <span class=SpellE>StockDistributor</span> component interfaces.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height: -150%;mso-list:l3 level1 lfo6;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black'>Next, we need to -create a Make Project Creator (MPC) file to generate the make files for us. -From the <span class=SpellE><i style='mso-bidi-font-style:normal'>Quoter</i></span><i -style='mso-bidi-font-style:normal'>/<span style='mso-bidi-font-style:italic'>Distributor -</span></i><span style='mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> </span>sub-directory, type the following -command:</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span -style='font-family:"Courier New";color:black'>generate_component_mpc.pl -p <span -class=SpellE>Stock_Base</span> Distributor<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span -style='color:black;mso-bidi-font-style:italic'>The command above will generate -a <span class=SpellE><i>Distirubotor.mpc</i></span> file that contains three -projects <span class=SpellE><i>Distributor_stub</i></span><i>, <span -class=SpellE>Distributor_svnt</span>, and <span class=SpellE>Distributor_exec</span> -</i>for the Stub, Servant, and Executor code respectively. In addition, the -command above will generate export files that will portably handle platform -specific issues of import/export declarations of dynamically linked libraries -(DLLs). After executing the command above you should see the following output -on your screen.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:.75in;line-height: -150%'><span style='font-family:"Courier New";color:black;mso-bidi-font-style: -italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>The -following commands have been executed:<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl DISTRIBUTOR_STUB > <span class=SpellE>Distributor_stub_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl DISTRIBUTOR_SVNT > <span class=SpellE>Distributor_svnt_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl DISTRIBUTOR_EXEC > <span class=SpellE>Distributor_exec_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span -style='color:black'>We will modify the generated MPC file to add an additional -project later in the tutorial.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height: -150%;mso-list:l4 level1 lfo8;tab-stops:list 1.25in 1.75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-style:italic'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-style: -italic'>The </span><span class=SpellE><i><span style='font-family:"Courier New"; -color:black'>Stock_Base_Distributor_stub</span></i></span><span -style='color:black;mso-bidi-font-style:italic'>, </span><span class=SpellE><i><span -style='font-family:"Courier New";color:black'>Stock_Base_Distributor_svnt</span></i></span><span -style='color:black;mso-bidi-font-style:italic'>, and </span><span class=SpellE><i><span -style='font-family:"Courier New";color:black'>Stock_Base_Distributor_exec</span></i></span><span -style='color:black;mso-bidi-font-style:italic'> projects in the MPC file should -look like <a href="Distributor/Distributor.mpc">this</a>. </span><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='text-indent:.5in;line-height:150%'><b -style='mso-bidi-font-weight:normal'><span style='color:black'>Broker:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height: -150%;mso-list:l2 level1 lfo10;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black'>In the </span><span -class=SpellE><code><i><span style='font-size:10.0pt;line-height:150%; -color:black'>Quoter</span></i></code></span><code><i><span style='font-size: -10.0pt;line-height:150%;color:black'>/Broker</span></i></code><span -style='color:black'> <code><span style='mso-ansi-font-size:12.0pt;mso-bidi-font-size: -12.0pt;line-height:150%;font-family:"Times New Roman";mso-bidi-font-style:italic'>sub-directory,</span></code> -place an <span class=SpellE>idl</span> file </span><span class=SpellE><code><i><span -style='font-size:10.0pt;line-height:150%;color:black'>Broker.id</span></i></code><code><span -style='font-size:10.0pt;line-height:150%;color:black'>l</span></code></span><span -style='color:black'> that looks like <a href="Broker/Broker.idl">this</a>. This -file defines the <span class=SpellE>StockBroker</span> component interface.<b -style='mso-bidi-font-weight:normal'><o:p></o:p></b></span></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:-.25in;line-height: -150%;mso-list:l2 level1 lfo10;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black'>Next, we need to -create a Make Project Creator (MPC) file to generate the make files for us. -From the <span class=SpellE><i style='mso-bidi-font-style:normal'>Quoter</i></span><i -style='mso-bidi-font-style:normal'>/<span style='mso-bidi-font-style:italic'>Broker</span></i><span -style='mso-bidi-font-style:italic'> sub-directory, type the following command:</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span -style='font-family:"Courier New";color:black'>generate_component_mpc.pl -p <span -class=SpellE>Stock_Base</span> Broker<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.5in;text-indent:1.25in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span -style='color:black;mso-bidi-font-style:italic'>The command above will generate -a <span class=SpellE><i>Broker.mpc</i></span> file that contains three projects -<span class=SpellE><i>Broker_stub</i></span><i>, <span class=SpellE>Broker_svnt</span>, -and <span class=SpellE>Broker_exec</span> </i>for the Stub, Servant, and -Executor code respectively. In addition, the command above will generate export -files that will portably handle platform specific issues of import/export -declarations of dynamically linked libraries (DLLs). After executing the -command above you should see the following output on your screen.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;text-indent:.75in;line-height: -150%'><span style='font-family:"Courier New";color:black;mso-bidi-font-style: -italic'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'>The -following commands have been executed:<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl BROKER_STUB > <span class=SpellE>Broker_stub_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl BROKER_SVNT > <span class=SpellE>Broker_svnt_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.5in;line-height:150%'><span -style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><span -style='mso-spacerun:yes'> -</span>generate_export_file.pl BROKER_EXEC > <span class=SpellE>Broker_exec_export.h</span><o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-left:1.25in;line-height:150%'><span -style='color:black'>We will modify the generated MPC file to add an additional -project later in the tutorial.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:1.75in;text-indent:-.75in;line-height: -150%;mso-list:l4 level1 lfo8;tab-stops:list 1.25in 1.75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-style:italic'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-style: -italic'>The </span><span class=SpellE><i><span style='font-family:"Courier New"; -color:black'>Stock_Base_Broker_stub</span></i></span><span style='color:black; -mso-bidi-font-style:italic'>, </span><span class=SpellE><i><span -style='font-family:"Courier New";color:black'>Stock_Base_Broker_svnt</span></i></span><span -style='color:black;mso-bidi-font-style:italic'>, and </span><span class=SpellE><i><span -style='font-family:"Courier New";color:black'>Stock_Base_Broker_exec</span></i></span><span -style='color:black;mso-bidi-font-style:italic'> projects in the MPC file should -look like <a href="Broker/Broker.mpc">this</a>. </span><span style='font-family: -"Courier New";color:black;mso-bidi-font-style:italic'><o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><br> -<b style='mso-bidi-font-weight:normal'>Note:<o:p></o:p></b></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'>To understand -the meaning of different parameters passed to </span><span style='font-family: -"Courier New";color:black;mso-bidi-font-style:italic'>generate_export_file.pl </span><span -style='color:black;mso-bidi-font-style:italic'>type the</span><span -style='color:black'> following command:<o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='font-family:"Courier New"; -color:black;mso-bidi-font-style:italic'>generate_export_file.pl -h</span><span -style='color:black'><br style='mso-special-character:line-break'> -<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'> -<![endif]><b style='mso-bidi-font-weight:normal'><o:p></o:p></b></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'> -<o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<address style='line-height:150%'><span style='color:black'><a -href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br> -</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address> - -<address style='line-height:150%'><span style='color:black'><o:p> </o:p></span></address> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last -modified:<!-- hhmts end --> <o:p></o:p></span></p> - -</div> - -</body> - -</html> diff --git a/CIAO/docs/tutorials/Quoter/Simple/02.html b/CIAO/docs/tutorials/Quoter/Simple/02.html deleted file mode 100644 index 9892e9722c8..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/02.html +++ /dev/null @@ -1,326 +0,0 @@ -<!-- $Id$ --> -<html xmlns:v="urn:schemas-microsoft-com:vml" -xmlns:o="urn:schemas-microsoft-com:office:office" -xmlns:w="urn:schemas-microsoft-com:office:word" -xmlns:p="urn:schemas-microsoft-com:office:powerpoint" -xmlns:oa="urn:schemas-microsoft-com:office:activation" -xmlns="http://www.w3.org/TR/REC-html40"> - -<head> -<meta http-equiv=Content-Type content="text/html; charset=us-ascii"> -<meta name=ProgId content=Word.Document> -<meta name=Generator content="Microsoft Word 11"> -<meta name=Originator content="Microsoft Word 11"> -<link rel=File-List href="02_files/filelist.xml"> -<link rel=Edit-Time-Data href="02_files/editdata.mso"> -<!--[if !mso]> -<style> -v\:* {behavior:url(#default#VML);} -o\:* {behavior:url(#default#VML);} -w\:* {behavior:url(#default#VML);} -.shape {behavior:url(#default#VML);} -</style> -<![endif]--> -<title>Getting Started</title> -<!--[if gte mso 9]><xml> - <o:DocumentProperties> - <o:Author>Abdullah Sowayan</o:Author> - <o:LastAuthor>Abdullah Sowayan</o:LastAuthor> - <o:Revision>7</o:Revision> - <o:TotalTime>88</o:TotalTime> - <o:Created>2006-10-09T19:28:00Z</o:Created> - <o:LastSaved>2006-10-09T21:48:00Z</o:LastSaved> - <o:Pages>1</o:Pages> - <o:Words>415</o:Words> - <o:Characters>2370</o:Characters> - <o:Company>Maritime Systems & Sensors</o:Company> - <o:Lines>19</o:Lines> - <o:Paragraphs>5</o:Paragraphs> - <o:CharactersWithSpaces>2780</o:CharactersWithSpaces> - <o:Version>11.8036</o:Version> - </o:DocumentProperties> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:WordDocument> - <w:ValidateAgainstSchemas/> - <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> - <w:IgnoreMixedContent>false</w:IgnoreMixedContent> - <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> - <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> - </w:WordDocument> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> - </w:LatentStyles> -</xml><![endif]--> -<style> -<!-- - /* Font Definitions */ - @font-face - {font-family:Wingdings; - panose-1:5 0 0 0 0 0 0 0 0 0; - mso-font-charset:2; - mso-generic-font-family:auto; - mso-font-pitch:variable; - mso-font-signature:0 268435456 0 0 -2147483648 0;} - /* Style Definitions */ - p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -h3 - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - mso-outline-level:3; - font-size:13.5pt; - font-family:"Times New Roman";} -a:link, span.MsoHyperlink - {color:#000FFF; - text-decoration:underline; - text-underline:single;} -a:visited, span.MsoHyperlinkFollowed - {color:#FF0F0F; - text-decoration:underline; - text-underline:single;} -address - {margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman";} -code - {font-family:"Courier New"; - mso-ascii-font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman"; - mso-hansi-font-family:"Courier New"; - mso-bidi-font-family:"Courier New";} -@page Section1 - {size:8.5in 11.0in; - margin:1.0in 1.25in 1.0in 1.25in; - mso-header-margin:.5in; - mso-footer-margin:.5in; - mso-paper-source:0;} -div.Section1 - {page:Section1;} - /* List Definitions */ - @list l0 - {mso-list-id:555236070; - mso-list-type:hybrid; - mso-list-template-ids:2061531284 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l0:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:1.25in; - mso-level-number-position:left; - margin-left:1.25in; - text-indent:-.25in; - font-family:Symbol;} -ol - {margin-bottom:0in;} -ul - {margin-bottom:0in;} ---> -</style> -<!--[if gte mso 10]> -<style> - /* Style Definitions */ - table.MsoNormalTable - {mso-style-name:"Table Normal"; - mso-tstyle-rowband-size:0; - mso-tstyle-colband-size:0; - mso-style-noshow:yes; - mso-style-parent:""; - mso-padding-alt:0in 5.4pt 0in 5.4pt; - mso-para-margin:0in; - mso-para-margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:10.0pt; - font-family:"Times New Roman"; - mso-ansi-language:#0400; - mso-fareast-language:#0400; - mso-bidi-language:#0400;} -</style> -<![endif]--><!-- 01.html,v 1.3 2006/02/10 14:34:35 mxiong Exp --><!--[if gte mso 9]><xml> - <o:shapedefaults v:ext="edit" spidmax="2050"/> -</xml><![endif]--><!--[if gte mso 9]><xml> - <o:shapelayout v:ext="edit"> - <o:idmap v:ext="edit" data="1"/> - </o:shapelayout></xml><![endif]--> -</head> - -<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval: -.5in'> - -<div class=Section1> - -<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center; -line-height:150%'><span style='color:black'>Step 2: Implement your components<o:p></o:p></span></h3> - -<h3 align=center style='text-align:center'><span style='color:black'><img -width=634 height=376 id="_x0000_i1026" src="images/Step2.JPG"><o:p></o:p></span></h3> - -<p class=MsoNormal style='margin-bottom:12.0pt'><b><span style='color:black'>Writing -CIDL files:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:.5in'><b><span style='color:black'>Distributor:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight: -bold'>In <i style='mso-bidi-font-style:normal'>Quoter/Distributor </i>sub-directory, -place a cidl file Distributor.cidl that looks like <a -href="Distributor/Distributor.cidl">this</a>. <o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight: -bold'>The MPC files we generated earlier automatically invoked the CIDLC -compiler to generate the Servants, Executors, and Contexts for us. To reduce -the amount of work and typing we need to do, we will next instruct the CIDLC -compiler to generate an empty Distributor Executor implementation (Object -implementation in the figure above). In the <i style='mso-bidi-font-style:normal'>Quoter/Distributor -</i>sub-directory, type the following:<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.5in'><span style='font-family:"Courier New";color:black; -mso-bidi-font-weight:bold'>cidlc -I$TAO_ROOT -I$TAO_ROOT/tao -I$CIAO_ROOT/ciao ---gen-exec-impl -- Distributor.cidl<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in'><span style='color:black'>The above command will generate a -<i style='mso-bidi-font-style:normal'>Distributor_exec.h </i>and <i -style='mso-bidi-font-style:normal'>Distributor_exec.cpp </i>files. These -generated files greatly reduced the amount of work we do. We’ll edit -those files later in the tutorial to insert our business logic in the -Distributor component.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:.5in'><b style='mso-bidi-font-weight:normal'><span -style='color:black'>Broker:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight: -bold'>In <i style='mso-bidi-font-style:normal'>Quoter/Broker </i>sub-directory, -place a cidl file Broker.cidl that looks like <a href="Broker/Broker.cidl">this</a>. -<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight: -bold'>The MPC files we generated earlier automatically invoked the CIDLC -compiler to generate the Servants, Executors, and Contexts for us. To reduce -the amount of work and typing we need to do, we will next instruct the CIDLC -compiler to generate an empty Distributor Executor implementation (Object -implementation in the figure above). In the <i style='mso-bidi-font-style:normal'>Quoter/Broker -</i>sub-directory, type the following:<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.5in'><span style='font-family:"Courier New";color:black; -mso-bidi-font-weight:bold'>cidlc -I$TAO_ROOT -I$TAO_ROOT/tao -I$CIAO_ROOT/ciao ---gen-exec-impl -- Broker.cidl<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in'><span style='color:black'>The above command will generate a -<i style='mso-bidi-font-style:normal'>Broker_exec.h </i>and <i -style='mso-bidi-font-style:normal'>Broker_exec.cpp </i>files. These generated -files greatly reduced the amount of work we do. We’ll edit those files -later in the tutorial to insert our business logic in the Broker component.<o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><br> -<b style='mso-bidi-font-weight:normal'>Note:<o:p></o:p></b></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'>To -understand the meaning of different parameters passed to the CIDLC compiler <span -style='mso-bidi-font-style:italic'>type the</span> following command:<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-bottom:12.0pt'><span style='font-family:"Courier New"; -color:black;mso-bidi-font-style:italic'>cidlc --h</span><span style='color: -black'><br> -<br style='mso-special-character:line-break'> -<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'> -<![endif]><o:p></o:p></span></p> - -<p class=MsoNormal style='margin-bottom:12.0pt'><b><span style='color:black'>Implement -the Components:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:.5in'><b><span style='color:black'>Distributor:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight: -bold'>The CIDLC compiler generated an empty </span><i style='mso-bidi-font-style: -normal'><span style='color:black'>Distributor_exec.h </span></i><span -style='color:black'>and <i style='mso-bidi-font-style:normal'>Distributor_exec.cpp -</i>files for us. You should now add your business logic to the executors. Look -into <i style='mso-bidi-font-style:normal'><a -href="Distributor/Distributor_exec.h">Distributor_exec.h</a> </i>and <i -style='mso-bidi-font-style:normal'><a href="Distributor/Distributor_exec.cpp">Distributor_exec.cpp</a> -</i>to see how we implemented this.<span style='mso-bidi-font-weight:bold'><o:p></o:p></span></span></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:.5in'><b style='mso-bidi-font-weight:normal'><span -style='color:black'>Broker:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='margin-top:0in;margin-right:0in;margin-bottom:12.0pt; -margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo1;tab-stops:list 1.25in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black;mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><span style='color:black;mso-bidi-font-weight: -bold'>The CIDLC compiler generated an empty </span><i style='mso-bidi-font-style: -normal'><span style='color:black'>Distributor_exec.h </span></i><span -style='color:black'>and <i style='mso-bidi-font-style:normal'>Distributor_exec.cpp -</i>files for us. You should now add your business logic to the executors. Look -into <i style='mso-bidi-font-style:normal'><a href="Broker/Broker_exec.h">Broker_exec.h</a> -</i>and <i style='mso-bidi-font-style:normal'><a href="Broker/Broker_exec.cpp">Broker_exec.cpp</a> -</i>to see how we implemented this.<span style='mso-bidi-font-weight:bold'><o:p></o:p></span></span></p> - -<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal><span style='color:black'> <o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<address><span style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming -Xiong<br> -</a><o:p></o:p></span></address> - -<p class=MsoNormal><span style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last -modified:<!-- hhmts end --> <o:p></o:p></span></p> - -</div> - -</body> - -</html> diff --git a/CIAO/docs/tutorials/Quoter/Simple/03.html b/CIAO/docs/tutorials/Quoter/Simple/03.html deleted file mode 100644 index 5a60e6fa73b..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/03.html +++ /dev/null @@ -1,1387 +0,0 @@ -<html xmlns:v="urn:schemas-microsoft-com:vml" -xmlns:o="urn:schemas-microsoft-com:office:office" -xmlns:w="urn:schemas-microsoft-com:office:word" -xmlns:p="urn:schemas-microsoft-com:office:powerpoint" -xmlns:oa="urn:schemas-microsoft-com:office:activation" -xmlns:st1="urn:schemas-microsoft-com:office:smarttags" -xmlns="http://www.w3.org/TR/REC-html40"> - -<head> -<meta http-equiv=Content-Type content="text/html; charset=us-ascii"> -<meta name=ProgId content=Word.Document> -<meta name=Generator content="Microsoft Word 11"> -<meta name=Originator content="Microsoft Word 11"> -<link rel=File-List href="03_files/filelist.xml"> -<link rel=Edit-Time-Data href="03_files/editdata.mso"> -<!--[if !mso]> -<style> -v\:* {behavior:url(#default#VML);} -o\:* {behavior:url(#default#VML);} -w\:* {behavior:url(#default#VML);} -.shape {behavior:url(#default#VML);} -</style> -<![endif]--> -<title>Getting Started</title> -<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" - name="PlaceName"/> -<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" - name="PlaceType"/> -<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" - name="place"/> -<!--[if gte mso 9]><xml> - <o:DocumentProperties> - <o:Author>Abdullah Sowayan</o:Author> - <o:LastAuthor>Abdullah Sowayan</o:LastAuthor> - <o:Revision>11</o:Revision> - <o:TotalTime>51</o:TotalTime> - <o:Created>2006-10-09T22:26:00Z</o:Created> - <o:LastSaved>2006-11-06T21:25:00Z</o:LastSaved> - <o:Pages>1</o:Pages> - <o:Words>2514</o:Words> - <o:Characters>14330</o:Characters> - <o:Company>Maritime Systems & Sensors</o:Company> - <o:Lines>119</o:Lines> - <o:Paragraphs>33</o:Paragraphs> - <o:CharactersWithSpaces>16811</o:CharactersWithSpaces> - <o:Version>11.8107</o:Version> - </o:DocumentProperties> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:WordDocument> - <w:SpellingState>Clean</w:SpellingState> - <w:GrammarState>Clean</w:GrammarState> - <w:ValidateAgainstSchemas/> - <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> - <w:IgnoreMixedContent>false</w:IgnoreMixedContent> - <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> - <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> - </w:WordDocument> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> - </w:LatentStyles> -</xml><![endif]--><!--[if !mso]><object - classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object> -<style> -st1\:*{behavior:url(#ieooui) } -</style> -<![endif]--> -<style> -<!-- - /* Font Definitions */ - @font-face - {font-family:Wingdings; - panose-1:5 0 0 0 0 0 0 0 0 0; - mso-font-charset:2; - mso-generic-font-family:auto; - mso-font-pitch:variable; - mso-font-signature:0 268435456 0 0 -2147483648 0;} - /* Style Definitions */ - p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -h3 - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - mso-outline-level:3; - font-size:13.5pt; - font-family:"Times New Roman"; - font-weight:bold;} -a:link, span.MsoHyperlink - {color:#000FFF; - text-decoration:underline; - text-underline:single;} -a:visited, span.MsoHyperlinkFollowed - {color:#FF0F0F; - text-decoration:underline; - text-underline:single;} -p - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -address - {margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - font-style:italic;} -code - {font-family:"Courier New"; - mso-ascii-font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman"; - mso-hansi-font-family:"Courier New"; - mso-bidi-font-family:"Courier New";} -kbd - {font-family:"Courier New"; - mso-ascii-font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman"; - mso-hansi-font-family:"Courier New"; - mso-bidi-font-family:"Courier New";} -pre - {margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt; - font-size:10.0pt; - font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman";} -span.SpellE - {mso-style-name:""; - mso-spl-e:yes;} -span.GramE - {mso-style-name:""; - mso-gram-e:yes;} -@page Section1 - {size:8.5in 11.0in; - margin:1.0in 1.25in 1.0in 1.25in; - mso-header-margin:.5in; - mso-footer-margin:.5in; - mso-paper-source:0;} -div.Section1 - {page:Section1;} - /* List Definitions */ - @list l0 - {mso-list-id:154345203; - mso-list-template-ids:-289649766;} -@list l0:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1 - {mso-list-id:201526982; - mso-list-template-ids:-336678638;} -@list l1:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level2 - {mso-level-number-format:bullet; - mso-level-text:o; - mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:"Courier New"; - mso-bidi-font-family:"Times New Roman";} -@list l1:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2 - {mso-list-id:521090106; - mso-list-template-ids:-1911898580;} -@list l2:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l3 - {mso-list-id:657850502; - mso-list-template-ids:1783002094;} -@list l3:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l4 - {mso-list-id:777020325; - mso-list-template-ids:-483995422;} -@list l4:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l4:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5 - {mso-list-id:907959882; - mso-list-template-ids:323885252;} -@list l5:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6 - {mso-list-id:1065254837; - mso-list-template-ids:1089662206;} -@list l6:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l6:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7 - {mso-list-id:1084494006; - mso-list-template-ids:-1504120978;} -@list l7:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l7:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8 - {mso-list-id:1153565371; - mso-list-template-ids:-169696680;} -@list l8:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l8:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l9 - {mso-list-id:1784838673; - mso-list-template-ids:1110625472;} -@list l9:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l10 - {mso-list-id:1832599161; - mso-list-template-ids:-966728002;} -@list l10:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level2 - {mso-level-number-format:bullet; - mso-level-text:o; - mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:"Courier New"; - mso-bidi-font-family:"Times New Roman";} -@list l10:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l10:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11 - {mso-list-id:1956401533; - mso-list-template-ids:-909756440;} -@list l11:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12 - {mso-list-id:2012949130; - mso-list-type:hybrid; - mso-list-template-ids:990837084 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;} -@list l12:level1 - {mso-level-tab-stop:39.0pt; - mso-level-number-position:left; - margin-left:39.0pt; - text-indent:-.25in;} -@list l12:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l12:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l11:level1 lfo5 - {mso-level-start-at:4;} -@list l1:level2 lfo7 - {mso-level-number-format:arabic; - mso-level-numbering:continue; - mso-level-text:"%2\."; - mso-level-tab-stop:none; - mso-level-number-position:left; - margin-left:0in; - text-indent:0in; - mso-ansi-font-size:10.0pt; - font-family:"Courier New"; - mso-bidi-font-family:"Times New Roman";} -ol - {margin-bottom:0in;} -ul - {margin-bottom:0in;} ---> -</style> -<!--[if gte mso 10]> -<style> - /* Style Definitions */ - table.MsoNormalTable - {mso-style-name:"Table Normal"; - mso-tstyle-rowband-size:0; - mso-tstyle-colband-size:0; - mso-style-noshow:yes; - mso-style-parent:""; - mso-padding-alt:0in 5.4pt 0in 5.4pt; - mso-para-margin:0in; - mso-para-margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:10.0pt; - font-family:"Times New Roman"; - mso-ansi-language:#0400; - mso-fareast-language:#0400; - mso-bidi-language:#0400;} -</style> -<![endif]--><!-- $Id$ --><!--[if gte mso 9]><xml> - <o:shapedefaults v:ext="edit" spidmax="4098"/> -</xml><![endif]--><!--[if gte mso 9]><xml> - <o:shapelayout v:ext="edit"> - <o:idmap v:ext="edit" data="1"/> - </o:shapelayout></xml><![endif]--> -</head> - -<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval: -.5in'> - -<div class=Section1> - -<h3 align=center style='text-align:center'><span style='color:black'>Step 3: -Package your components<o:p></o:p></span></h3> - -<h3 align=center style='text-align:center'><span style='color:black'><img -width=572 height=358 id="_x0000_i1025" src="images/Step3.JPG"><o:p></o:p></span></h3> - -<p class=MsoNormal><b><span style='color:red'><o:p> </o:p></span></b></p> - -<p class=MsoNormal><b>Brief Introduction to <span class=SpellE>CosMIC</span>:<o:p></o:p></b></p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>The -Component Synthesis using Model Integrated Computing (<span class=SpellE>CoSMIC</span>) -project is a MDA toolset being developed by the Institute for Software -Integrated Systems (ISIS) at <st1:place w:st="on"><st1:PlaceName w:st="on">Vanderbilt</st1:PlaceName> - <st1:PlaceType w:st="on">University</st1:PlaceType></st1:place> to:</p> - -<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l12 level1 lfo1; -tab-stops:list 39.0pt;mso-layout-grid-align:none;text-autospace:none'><![if !supportLists]><span -style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'> -</span></span><![endif]><i>Model and</i> <i>analyze </i>distributed real-time -and embedded application functionality and <span class=SpellE>QoS</span> -requirements.</p> - -<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l12 level1 lfo1; -tab-stops:list 39.0pt;mso-layout-grid-align:none;text-autospace:none'><![if !supportLists]><span -style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'> -</span></span><![endif]><i>Synthesize</i> CCM-specific deployment metadata -required to deliver end-to-end <span class=SpellE>QoS</span> to DRE -applications.</p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><o:p> </o:p></p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>The <span -class=SpellE>CoSMIC</span> <span class=SpellE>toolsuite</span> provides -modeling of DRE systems, their <span class=SpellE>QoS</span> requirements, and <span -class=SpellE>QoS</span> adaptation policies used for DRE application <span -class=SpellE>QoS</span> management. The component behavior, their interactions, -and <span class=SpellE>QoS</span> requirements are modeled using a domain -specific modeling language that adheres to <span style='color:black'>the <a -href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-08">OMG Deployment & -Configuration (D&C) specification (ptc/2003-07-08)</a></span>. <span -class=SpellE>CoSMIC</span> enables modeling the standards-based CCM components. -</p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><o:p> </o:p></p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>Hand-writing -the required XML descriptors to configure our components is tedious and error -prone. We therefore utilize <span class=SpellE>CosMIC</span> (we specifically -use a subset of <span class=SpellE>CosMIC</span> called PICML, which stands for -Platform-Independent Component Modeling Language) to generate the bulk of -descriptors for us.</p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><o:p> </o:p></p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>For -more information on <span class=SpellE>CosMIC</span>, please refer to the -following article:</p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span -style='mso-bidi-font-weight:bold'><a -href="http://www.cs.wustl.edu/~schmidt/PDF/mamad2003.pdf"><span class=SpellE>CoSMIC</span>: -An MDA Generative Tool for Distributed Real-time and Embedded Applications</a>.<o:p></o:p></span></p> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span -style='mso-bidi-font-weight:bold'><o:p> </o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span -style='mso-bidi-font-weight:bold'><o:p> </o:p></span></p> - -<p class=MsoNormal><b><span style='color:black'>Importing IDL to PICML</span></b><span -style='color:black'><br> -<br> - To quick start our Stock <span class=SpellE>Quoter</span> modeling -process in GME, <span class=SpellE>CoSMIC</span> introduces <span class=SpellE><em>idl_to_<span -class=GramE>picml</span></em></span><span class=GramE> ,</span> which is an -executable program that imports the IDL files you just created into PICML.<o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l5 level1 lfo2;tab-stops:list .5in'>Make sure <code><span - style='font-size:10.0pt'>%COSMIC_ROOT%\bin</span></code> is included in - the PATH variable, e.g., c:\Program Files\ISIS\<span class=SpellE>CoSMIC</span>\bin.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l5 level1 lfo2;tab-stops:list .5in'>Open a command prompt, - run VCVARS32.BAT from the MSVC .NET folder if you haven't done so. It will - set the environment for using Microsoft Visual Studio .NET tools so that <span - class=SpellE><i>idl_to_picml</i></span> works properly.<br> - in my machine, VCVARS32.bat is in C:\Program Files\Microsoft Visual Studio - .NET 2003\Vc7\bin<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l5 level1 lfo2;tab-stops:list .5in'>In the same command - prompt, change directory to <span class=SpellE><code><span - style='font-size:10.0pt'>MyQuoter</span></code></span><code><span - style='font-size:10.0pt'>\</span></code>, and type the following command:<br> - > <span class=SpellE><kbd><span style='font-size:10.0pt'>idl_to_picml</span></kbd></span><kbd><span - style='font-size:10.0pt'> -x <span class=SpellE>MyQuoter</span> -r . -I .\<span - class=SpellE>Stock_Base</span></span></kbd><br> - (if the above command does not work, you may also try this<br> - ><span class=SpellE><kbd><span style='font-size:10.0pt'>idl_to_picml</span></kbd></span><kbd><span - style='font-size:10.0pt'> -x <span class=SpellE>MyQuoter</span> -r - . -I .\<span class=SpellE>Stock_Base</span> -I %TAO_ROOT% -I - %TAO_ROOT%\<span class=SpellE>orbsvcs</span> -I %CIAO_ROOT%\ciao)</span></kbd><br> - <span class=SpellE><em>idl_to_picml</em></span> will parse your IDL - files and generated a <span class=SpellE><code><span style='font-size: - 10.0pt'>MyQuoter.xme</span></code></span> file in the <span class=SpellE><code><span - style='font-size:10.0pt'>MyQuoter</span></code></span> directory. Note - that if -x option is not used, the default <span class=SpellE>xme</span> - file name will be <span class=SpellE><code><span style='font-size:10.0pt'>PICML_default_xme_file.xme</span></code></span><code><span - style='font-size:10.0pt'>.</span></code><br> - 4. Start GME, select <strong>File->Import xml..</strong>, and choose - the <span class=SpellE>xme</span> file just generated. You should be able - to see an imported PICML model similar to the one shown in Figure 2.<o:p></o:p></li> -</ol> - -<p class=MsoNormal><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal align=center style='text-align:center'><span -style='color:black'><img border=0 width=781 height=636 id="_x0000_i1026" -src="Images/fig2.jpg"><br> -<br> -Figure 2<o:p></o:p></span></p> - -<p><span style='color:black'> In the Browser of the generated model, the <span -class=SpellE><em>PredefinedTypes</em></span> folder contains a bunch of atomic <span -class=SpellE>datatype</span> elements that will be referenced by other modeling -parts later. You don't have to worry about them for now. The models in <span -class=SpellE><em>InterfaceDefinitions</em></span> folder are the PICML -representations <span class=SpellE>ofthe</span> IDL files you just imported. -Double-click to open <em>Broker</em>, it will show you a white, document-like -entity which represents a <<<span class=SpellE>FileRef</span>>> -instance and a yellow box-shaped entity representing a <<Package>> -instance. Their equivalent representations in IDL files are -"#include" and "module" respectively. Figure 3 gives you a -clear view of GME representation of all the 3 <span class=SpellE>idl</span> -files created. We will cover the other folders in the next section.<o:p></o:p></span></p> - -<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span -style='color:black'><img border=0 width=223 height=336 id="_x0000_i1027" -src="Images/fig3.jpg"><br> -<br> -Figure 3<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'>Now -we are ready to model the rest of the Stock <span class=SpellE>Quoter</span> -systems.<br> -<br style='mso-special-character:line-break'> -<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'> -<![endif]><o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3>Building Stock <span class=SpellE>Quoter</span> system in PICML<span -style='color:black'><o:p></o:p></span></h3> - -<p><span style='color:black'>This section describes modeling the <span -class=SpellE>Quoter</span> application using PICML. If you have trouble -producing a functioning model from this tutorial, please see the, <a -href="Model/Quoter.xme">pre-built <span class=SpellE>Quoter</span> model</a> -which is provided for your reference. This model contains all elements created -as part of this tutorial.<o:p></o:p></span></p> - -<div> - -<p class=MsoNormal><strong><span style='color:black'>Note:</span></strong><span -style='color:black'> To import an XML file in GME, select <em>File->Import -XML..</em> from GME and choose your XML model<o:p></o:p></span></p> - -</div> - -<p><span style='color:black'>The PICML paradigm is designed for the <a -href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-08">OMG Deployment & -Configuration (D&C) specification (ptc/2003-07-08)</a>, so the modeling -process is straightforward if you are familiar with the specification. Please -see the <a href="../../releasenotes/dance.html"><span class=SpellE>DAnCE</span> -project</a> for more information. For those who hate specification -(including me, :-)), an <a -href="http://www.cs.wustl.edu/%7Eschmidt/PDF/DAnCE.pdf">overview of D&C</a> -and as well as a <a -href="http://www.cs.wustl.edu/%7Eschmidt/OMG-CCM-Tutorial.ppt">tutorial of -D&C and CCM</a> can help to reduce the learning curve. (Thanks to Sowayan, <span -class=SpellE>Abdulah</span> for pointing this out). In addition, it is also -helpful to read through Chapter 32 of <span class=SpellE>TAO's</span> -Developer's Guide 1.4a (CIAO and CCM) which thoroughly describes the various -descriptors required for a component (*.<span class=SpellE>iad</span>, *.<span -class=SpellE>ccd</span>, *.cid, etc). <o:p></o:p></span></p> - -<h3><span style='color:black'>Table of Contents<o:p></o:p></span></h3> - -<ul type=disc> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#1"><span - class=SpellE>ImplementationArtifacts</span></a><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#2"><span - class=SpellE>ComponentImplementations</span></a><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#3"><span - class=SpellE>ComponentPackages</span></a><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#4"><span - class=SpellE>PackageConfiguration</span></a><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#5"><span - class=SpellE>TopLevelPackage</span></a><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#6">Targets</a><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo3;tab-stops:list .5in'><a href="#7"><span - class=SpellE>DeploymentPlan</span></a><o:p></o:p></li> -</ul> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<p><span style='color:black'>The complete PICML <span class=SpellE>Quoter</span> -model consists of modeling elements distributed across various folders. If you -used <span class=SpellE><em>idl_to_picml</em></span> to generate the initial -model, you will see that it has created all these folders and some of the -tedious boilerplate modeling for us. The rest of the section will explain the purpose -of each folder as well as the modeling entities contained in these folders. We -will also show how to model some of the folders that have to be done by hand.<o:p></o:p></span></p> - -<p><b><span style='font-variant:small-caps;color:red;background:silver; -mso-highlight:silver'>Important:</span></b><span style='color:black;background: -silver;mso-highlight:silver'> The interpreters that generate deployment -artifacts expect very strict constraints in the model. When you finish your -model, and any time you wish to generate anything, it is a good idea to check -constraints by clicking on <em>File->Check->Check All</em> in GME. This -will help you find many logic errors in your model.</span><span -style='color:black'><o:p></o:p></span></p> - -<h3><span class=SpellE><span style='color:black'>ImplementationArtifacts</span></span><span -style='color:black'><o:p></o:p></span></h3> - -<p><span style='color:black'>This folder contains implementation artifacts -associated with components. <span class=SpellE><em>idl_to_picml</em></span> has -created these artifacts for us, with their dependency relationships correctly -captured. Figure 4 shows the Implementation Artifacts for <em>Broker</em>.<o:p></o:p></span></p> - -<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span -style='color:black'><img border=0 width=891 height=552 id="_x0000_i1030" -src="Images/fig4.jpg"><br> -<span class=GramE>Figure 4.</span><o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><a name=1></a><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3><span class=SpellE><span style='color:black'>ComponentImplementation</span></span><a -name=2></a><span style='color:black'><o:p></o:p></span></h3> - -<p><span style='color:black'>This folder contains models that describe the -implementations of component interfaces. In the <span class=SpellE>Quoter</span> -example, we will have two monolithic component implementations - named <span -class=SpellE><em>StockDistributorImplementation</em></span> and <span -class=SpellE><em>StockBrokerImplementation</em></span> - and an assembly -component implementation named <span class=SpellE><em>StockQuoter</em></span>, -which is an assembly of <span class=SpellE><em>StockDistributorImplementation</em></span> -and <span class=SpellE><em>StockBrokerImplementaion</em></span>. <span -class=SpellE><em>idl_to_picml</em></span> has created the monolithic component -implementations for us, as shown in figure 5 for example, but we have to -specify the connections between them in order to construct a <span -class=SpellE>Quoter</span> system.<o:p></o:p></span></p> - -<p class=MsoNormal align=center style='text-align:center'><span -style='color:black'><img border=0 width=922 height=639 id="_x0000_i1032" -src="Images/fig5.jpg"><br> -Figure 5<o:p></o:p></span></p> - -<p><span style='color:black'>Assembly components provide a boundary for the -composition of monolithic components and even other assemblies. Assembly -components do not provide actual implementations for their interface, it is a -virtual component that delegates its ports and attributes to one or more of the -entities it contains. There are slight differences between modeling an assembly -and modeling a monolithic component. Since the assembly is a virtual component, -it is not necessary to model a </span><span class=SpellE><code><span -style='font-size:10.0pt;color:black'>MonolithicImplementation</span></code></span><span -style='color:black'>. Instead, <em>instances</em> of other components are -placed within the assembly and connected. Let's try to assemble the <span -class=SpellE><em>StockQuoter</em></span>.<o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>Right click the <span - class=SpellE><em>ComponentImplementations</em></span> folder, choose <strong>Insert - Model-><span class=SpellE>ComponentImplementationContainer</span></strong>, - rename it as "<span class=SpellE>StockQuoterImplementation</span>" - in the Attribute Panel. Double click to open it.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>From the Part Browser, - drag a <<<span class=SpellE>ComponentAssembly</span>>> to the - modeling window, name it "<span class=SpellE>StockQuoter</span>". - Double click to open it.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>Now we will create two - instances for interfaces <span class=SpellE><em>StockBroker</em></span> - and <span class=SpellE><em>StockDistributor</em></span>. To do that, - expand the folder <span class=SpellE><em><span style='font-size:10.0pt; - font-family:"Courier New"'>InterfaceDefinitions</span></em></span>, then - expand the <span class=SpellE><em><span style='font-size:10.0pt; - font-family:"Courier New"'>InterfaceDefinitions</span></em></span><em><span - style='font-size:10.0pt;font-family:"Courier New"'>/</span></em> <em>Broker</em>, - then <span class=SpellE><em><span style='font-size:10.0pt;font-family: - "Courier New"'>InterfaceDefinitions</span></em></span><em><span - style='font-size:10.0pt;font-family:"Courier New"'>/</span></em> <em>Broker/ - Stock</em> until the interface definition of <span class=SpellE><em>StockBroker</em></span> - shows. While expanding the tree, always keep the "<span class=SpellE>StockQuoter</span>" - <<<span class=SpellE>ComponentAssembly</span>>> window open. - Then drag <span class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</span></code></span> - in the browser to the "<span class=SpellE>StockQuoter</span>" - <<<span class=SpellE>ComponentAssembly</span>>> window while - pressing ALT key. Repeat the same steps for <code><span style='font-size: - 10.0pt'>MyQuoter/InterfaceDefinitions/Distributor/Stock/StockDistributor</span></code>, - and you will see two instances of component interfaces have been created - as shown in Figure 6 (the black line in the figure only indicates - .mapping)<o:p></o:p></li> -</ol> - -<p class=MsoNormal><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal align=center style='text-align:center'><span -style='color:black'><img border=0 width=972 height=714 id="_x0000_i1046" -src="Images/fig6.jpg"><br> -<br> -Figure 6<o:p></o:p></span></p> - -<ol start=4 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l11 level1 lfo5;tab-stops:list .5in'>Create an <<<span - class=SpellE>PublishConnector</span>>>.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l11 level1 lfo5;tab-stops:list .5in'>Now assemble the - components together according to <a href="Images/fig1.jpg">Figure 1</a>(make - sure you change to connect <span class=GramE>mode </span><img border=0 - width=32 height=32 id="_x0000_i1047" src="Icons/AddConnMode.gif">) and the - resulting assembly model should look like Figure 7. Note that to create - connections between <span class=SpellE>StockDistributor.notify_out</span> - and <span class=SpellE>StockBroker.notify_in</span>, you will need the - intermediate connector <<<span class=SpellE>PublishConnector</span>>>.<o:p></o:p></li> -</ol> - -<p class=MsoNormal align=center style='text-align:center'><span -style='color:black'><img border=0 width=724 height=402 id="_x0000_i1048" -src="Images/fig7.jpg"><!-- hhmts end -->><br> -<br> -Figure 7<o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3><a name=3></a><span class=SpellE><span style='color:black'>ComponentPackage</span></span><span -style='color:black'><o:p></o:p></span></h3> - -<p class=MsoNormal><span style='color:black'>This folder contains deployable -component packages. Every instance in an assembly should have a corresponding monolithic -implementation and packaged in a <span class=SpellE>ComponentPackagebe</span> -To create a package for <span class=SpellE><em>StockBroker</em>.instance</span><o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Right click folder <span - class=SpellE><em>ComponentPackage</em>s</span> , insert a <<<span - class=SpellE>PackageContainer</span>>>, name it "Broker"; - Double click to open it.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>From the <span - class=SpellE>PartBrowser</span>, add the following:<o:p></o:p></li> - <ul type=circle> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a <<<span - class=SpellE>ComponentPackage</span>>> named "Broker";<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a <<<span - class=SpellE>ComponentImplementationReference</span>>> named - "Broker";<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a <<<span - class=SpellE>ComponentRef</span>>> named "Broker";<o:p></o:p></li> - </ul> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Refer the <<<span - class=SpellE>ComponentImplementationReference</span>>> <em>Broker</em> - to <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockBroker</span></code>Implementation/StockBrokerMonolithicImpl. - Refer the <<<span class=SpellE>ComponentRef</span>>> <em>Broker</em> - to <span class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</span></code></span>. - To create a reference in GME, simply drag the tree node in the Browser - "into" the reference model. For example, you should drag the - tree node <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockBroker</span></code>Implementation/StockBrokerMonolithicImpl - into <<<span class=SpellE>ComponentImplementationReference</span>>> - <em>Broker.</em> Check GME manual(tutorials) for more information.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Switch to Connect Mode - and create two connections according to the following relationship.<o:p></o:p></li> - <ul type=circle> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'><<<span - class=SpellE>ComponentImplementationReference</span>>> <em>Broker</em> - implements <<<span class=SpellE>ComponentPackage</span>>> <em>Broker</em>;<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'><<<span - class=SpellE>ComponentPackage</span>>> <em>Broker</em> realizes - <<<span class=SpellE>ComponentRef</span>>> <em>Broker</em>.<o:p></o:p></li> - </ul> -</ol> - -<p class=MsoNormal style='mso-margin-top-alt:auto;margin-bottom:12.0pt; -margin-left:.5in'><span style='color:black'><br> -<br> - The model you built should resemble Figure 8.<o:p></o:p></span></p> - -<p class=MsoNormal align=center style='mso-margin-top-alt:auto;margin-bottom: -12.0pt;margin-left:.5in;text-align:center'><span style='color:black'><img -border=0 width=675 height=497 id="_x0000_i1034" src="Images/fig8.jpg"><!-- hhmts start -->><br> -<br> -Figure 8<o:p></o:p></span></p> - -<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; -margin-left:.5in'><span style='color:black'>Now create a <span class=SpellE>ComponentPackage/StockDistributor</span> -following the same steps. <o:p></o:p></span></p> - -<ol start=5 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo6;tab-stops:list .5in;list-style-position:outside'><br> - We will also need to create a package for the assembly component <span - class=SpellE>StockQuoter</span>. Remember assembly component is a virtual - component, it does not "realize" a certain interface, so - different from the Broker and Distributor packages, the <span - class=SpellE>StockQuoter</span> does not need a <<<span - class=SpellE>ComponentRef</span>>>. To create this model: <o:p></o:p></li> -</ol> - -<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; -margin-left:.5in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists]><span -style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Courier New"; -mso-fareast-font-family:"Courier New";color:black'><span style='mso-list:Ignore'>1.<span -style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><span -style='color:black'>Insert a <<<span class=SpellE>ComponentPackage</span>>> -named "<span class=SpellE>StockQuoter</span>"<o:p></o:p></span></p> - -<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; -margin-left:1.0in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists]><span -style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Courier New"; -mso-fareast-font-family:"Courier New";color:black'><span style='mso-list:Ignore'>2.<span -style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><span -style='color:black'>Add a <<<span class=SpellE>ComponentImplementationReference</span>>> -named "<span class=SpellE>StockQuoter</span>", refer it to <span -class=SpellE>MyQuoter<code><span style='font-size:10.0pt'>/ComponentImplementations/StockQuoter/StockQuoter</span></code></span><o:p></o:p></span></p> - -<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; -margin-left:1.0in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists]><span -style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Courier New"; -mso-fareast-font-family:"Courier New";color:black'><span style='mso-list:Ignore'>3.<span -style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><span -style='color:black'>Switch to connect mode and connect <<<span -class=SpellE>ComponentImplementationReference</span>>> <span -class=SpellE>StockQuoter</span> with <<<span class=SpellE>ComponentPackage</span>>> -<span class=SpellE>StockQuoter</span>, as in Figure 9.<o:p></o:p></span></p> - -<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span -style='color:black'><img border=0 width=549 height=354 id="_x0000_i1035" -src="Images/fig9.jpg"><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->><br> -<br> -Figure 9<o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3><a name=4></a><span class=SpellE><span style='color:black'>PackageConfiguration</span></span><span -style='color:black'><o:p></o:p></span></h3> - -<p class=MsoNormal><span style='color:black'>This folder contains just one -model capturing specific configuration of Component packages.<o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l8 level1 lfo8;tab-stops:list .5in'>In the folder <span - class=SpellE><em>PackageConfiguratio</em>n</span>, and create a <<<span - class=SpellE>PackageConfigurationContainer</span>>>, name it - "Default", click to open it.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l8 level1 lfo8;tab-stops:list .5in'>Add a <<<span - class=SpellE>PackageConfiguration</span>>> named "default" - and a <<<span class=SpellE>ComponentPackageReference</span>>>, - name it "<span class=SpellE>StockQuoter</span>", connect - "Default" to "<span class=SpellE>StockQuoter</span>"<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l8 level1 lfo8;tab-stops:list .5in'>Refer <<<span - class=SpellE>ComponentPackageReference</span>>> <span class=SpellE>StockQuoter</span> - to <<<span class=SpellE>ComponentPackage</span>>> <span - class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/ComponentPackage/StockQuoter/StockQuoter</span></code></span><span - style='font-size:10.0pt;font-family:"Courier New"'><br> - <code>(Not <<<span class=SpellE>ComponentImplementationReference</span>>></code></span> - <span class=SpellE><code><span style='font-size:10.0pt'>MyQuoter/ComponentPackage/StockQuoter/StockQuoter</span></code></span><code><span - style='font-size:10.0pt'>!) </span></code><o:p></o:p></li> -</ol> - -<p class=MsoNormal><span style='color:black'><o:p> </o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3><a name=5></a><span class=SpellE><span style='color:black'>ToplevelPackage</span></span><span -style='color:black'><o:p></o:p></span></h3> - -<p class=MsoNormal><span style='color:black'>This folder contains one model -capturing information about the top-level element that will be fed to the -application.<o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l6 level1 lfo9;tab-stops:list .5in'>In the folder <span - class=SpellE><em>ToplevelPackage</em></span>, and create a <<<span - class=SpellE>ToplevelPackageContainer</span>>>, name it - "Default", double click to open it.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l6 level1 lfo9;tab-stops:list .5in'>Add a <<<span - class=SpellE>ToplevelPackage</span>>> named "<span - class=SpellE>ToplevelPackage</span>" and a <<<span - class=SpellE>PackageConfigurationReference</span>>>, name it - "Default", connect "<span class=SpellE>ToplevelPackage</span>" - to "Default"<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l6 level1 lfo9;tab-stops:list .5in'>Refer - "Default" to <span class=SpellE>My<code><span style='font-size: - 10.0pt'>Quoter/PackageConfiguration/Default/Default</span></code></span><o:p></o:p></li> -</ol> - -<p class=MsoNormal><span style='color:black'><o:p> </o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3><a name=6></a><span style='color:black'>Targets<o:p></o:p></span></h3> - -<p class=MsoNormal><span style='color:black'>This folder contains -domain-specific models capturing information about the target environment in -which component-based application will be deployed. In this <span class=SpellE>Quoter</span> -example, we can either deploy the two components into ONE host, or into TWO -different host. We will deploy the <span class=SpellE>Quoter</span> into two -different host.<o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l7 level1 lfo10;tab-stops:list .5in'>In the folder <i>Targets</i>, - insert a new <<Domain>> named "Domain"; double click - to open it.<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l7 level1 lfo10;tab-stops:list .5in'>From the Part Browser, - add two <<Node>> named "Broker" and - "Distributor" respectively.<o:p></o:p></li> -</ol> - -<p class=MsoNormal><span style='color:black'><br> -Now we are ready to deploy our Components to the actual physical environment.<o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<h3><a name=7></a><span class=SpellE><span style='color:black'>DeploymentPlan</span></span><span -style='color:black'><o:p></o:p></span></h3> - -<p class=MsoNormal><span style='color:black'>This folder contains a plan model that -captures information about the assignment of component to nodes.<o:p></o:p></span></p> - -<ol start=1 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l10 level1 lfo11;tab-stops:list .5in'>In the folder <span - class=SpellE><em>DeploymentPlan</em></span>, insert a model <<<span - class=SpellE>DeploymentPlan</span>>>; name it "Plan", - click to open it<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l10 level1 lfo11;tab-stops:list .5in'>From the <span - class=SpellE>PartBrowser</span>, add the following:<o:p></o:p></li> - <ul type=circle> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l10 level2 lfo11;tab-stops:list 1.0in'>Two <<<span - class=SpellE>CollocationGroup</span>>><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l10 level2 lfo11;tab-stops:list 1.0in'>Two <<<span - class=SpellE>NodeReference</span>>> named "<span class=SpellE>Node_Broker</span>" - and "<span class=SpellE>Node_Distributor</span>" respectively, <span - class=SpellE>refering</span> to <span class=SpellE><code><span - style='font-size:10.0pt'>MyQuoter</span></code></span><code><span - style='font-size:10.0pt'>/Targets/Domain/Broker</span></code> and <span - class=SpellE><code><span style='font-size:10.0pt'>MyQuoter</span></code></span><code><span - style='font-size:10.0pt'>/Targets/Domain/Distributor</span></code> - respectively<o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l10 level2 lfo11;tab-stops:list 1.0in'>Two <<<span - class=SpellE>ComponentRef</span>>> named "<span class=SpellE>StockBroker</span>" - and "<span class=SpellE>StockDistributor</span>" respectively, <span - class=SpellE>refering</span> to <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockBroker</span></code> - and <code><span style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockDistributor</span></code> - respectively. Note that the <<<span class=SpellE>ComponentRef</span>>> - in <span class=SpellE>DeploymentPlan</span> is not referring to the interface, - but rather the actual instance of the implementation.<o:p></o:p></li> - </ul> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;margin-bottom: - 12.0pt;mso-list:l10 level1 lfo11;tab-stops:list .5in'>Switch to Connect - Mode, connect one <<<span class=SpellE>CollocationGroup</span>>> - to <<<span class=SpellE>NodeReference</span>>> <span - class=SpellE><em>Node_Broker</em></span>, connect another <<<span - class=SpellE>CollocationGroup</span>>> to <<<span - class=SpellE>NodeReference</span>>> <span class=SpellE><em>Node_Distributor</em></span>. - Now the model looks like the following.<o:p></o:p></li> -</ol> - -<p class=MsoNormal align=center style='mso-margin-top-alt:auto;margin-bottom: -12.0pt;margin-left:.5in;text-align:center'><span style='color:black'><img -border=0 width=752 height=530 id="_x0000_i1040" src="Images/fig10.jpg"><br> -<br> -<span class=GramE>Figure 10.</span><o:p></o:p></span></p> - -<ol start=4 type=1> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;margin-bottom: - 12.0pt;mso-list:l10 level1 lfo11;tab-stops:list .5in'>Now we need to - associate <<<span class=SpellE>ComponentRef</span>>> <span - class=SpellE>StockBroker</span> to the <<<span class=SpellE>CollocationGroup</span>>> - running on the <<<span class=SpellE>NodeReference</span>>> - Broker, and <<<span class=SpellE>ComponentRef</span>>> <span - class=SpellE>StockDistributor</span> to the <<<span class=SpellE>CollocationGroup</span>>> - running on the <<<span class=SpellE>NodeReference</span>>> - Distributor. To do that, switch the Edit Mode Bar to Set Mode (<img - border=0 width=32 height=32 id="_x0000_i1041" src="Icons/SetMode.gif">), - and move the cursor to the <<<span class=SpellE>CollocationGroup</span>>> - running on <<<span class=SpellE>NodeReference</span>>> - Distributor, right-click on it. You will find the cursor is changed to set - mode cursor, and only the <<<span class=SpellE>CollocationGroup</span>>> - you clicked in is highlighted, as shown in Figure 11.<o:p></o:p></li> -</ol> - -<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span -style='color:black'><img border=0 width=672 height=505 id="_x0000_i1042" -src="Images/fig11.jpg"><!-- 01.html,v 1.3 2006/02/10 14:34:35 mxiong Exp -->><br> -<br> -Figure 11<o:p></o:p></span></p> - -<p><span style='color:black'>Now move your cursor to <<<span -class=SpellE>ComponentRef</span>>> <span class=SpellE>StockDistributor</span>, -and left-click it, so that it looks like Figure 12.<o:p></o:p></span></p> - -<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span -style='color:black'><img border=0 width=672 height=505 id="_x0000_i1043" -src="Images/fig12.jpg"> - -<!doctype HTML> - -><br> -<br> -Figure 12<o:p></o:p></span></p> - -<p style='margin-bottom:12.0pt'><span style='color:black'>This operation -associates <span class=SpellE><em>StockDistributor</em></span> component to the -<<<span class=SpellE>CollocationGroup</span>>> running on <em>Distributor</em> -node. To do the same with Broker, just right-click on another <<<span -class=SpellE>CollocationGroup</span>>>, and left-click on <span -class=SpellE>StockBroker</span> <<<span class=SpellE>CollocationGroup</span>>> -which is highlighted.<o:p></o:p></span></p> - -<div class=MsoNormal align=center style='text-align:center'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<p><a name=8></a><span style='color:black'>Up to this point, we are basically -done with the modeling part. Before we generate anything from this model -though, please <b>DO</b> remember to check the constraints of the model as we -mentioned earlier.<o:p></o:p></span></p> - -<p><span style='color:black'>After we are done with the modeling, the <span -class=SpellE>flattened_deploymentplan</span> interpreter that comes along with -PICML will help us to generate a <span class=SpellE>flattened_deploymentplan.cdp</span> -file. Please make sure you generate this file to <span class=SpellE>MyQuoter</span>/descriptors. -Note that to get the example <span class=SpellE>working<span style='font-family: -"Courier New"'>,</span>a</span> Node Map file should be created to map <span -class=SpellE>logicalnodes</span> to <span class=SpellE>NodeManager</span> -object <span class=SpellE>references,e.g</span>:<o:p></o:p></span></p> - -<pre wrap=""><span class=SpellE><span style='color:black'>DistributorNode</span></span><span -style='color:black'> corbaloc<span class=GramE>:iiop:localhost:30000</span>/NodeManager<o:p></o:p></span></pre><pre><span -class=SpellE><span style='color:black'>BrokerNode</span></span><span -style='color:black'><span style='mso-spacerun:yes'> </span>corbaloc<span -class=GramE>:iiop:localhost:40000</span>/NodeManager<o:p></o:p></span></pre><pre><span -style='color:black'><o:p> </o:p></span></pre><pre><span style='color:black'><o:p> </o:p></span></pre> - -<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span -style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br> -</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address> - -<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span -style='color:black'><o:p> </o:p></span></address> - -<p class=MsoNormal style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span -style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last -modified:<!-- hhmts end --> <o:p></o:p></span></p> - -</div> - -</body> - -</html> diff --git a/CIAO/docs/tutorials/Quoter/Simple/04.html b/CIAO/docs/tutorials/Quoter/Simple/04.html deleted file mode 100644 index 4e259355ba1..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/04.html +++ /dev/null @@ -1,413 +0,0 @@ -<html xmlns:v="urn:schemas-microsoft-com:vml" -xmlns:o="urn:schemas-microsoft-com:office:office" -xmlns:w="urn:schemas-microsoft-com:office:word" -xmlns:p="urn:schemas-microsoft-com:office:powerpoint" -xmlns:oa="urn:schemas-microsoft-com:office:activation" -xmlns="http://www.w3.org/TR/REC-html40"> - -<head> -<meta http-equiv=Content-Type content="text/html; charset=us-ascii"> -<meta name=ProgId content=Word.Document> -<meta name=Generator content="Microsoft Word 11"> -<meta name=Originator content="Microsoft Word 11"> -<link rel=File-List href="04_files/filelist.xml"> -<link rel=Edit-Time-Data href="04_files/editdata.mso"> -<!--[if !mso]> -<style> -v\:* {behavior:url(#default#VML);} -o\:* {behavior:url(#default#VML);} -w\:* {behavior:url(#default#VML);} -.shape {behavior:url(#default#VML);} -</style> -<![endif]--> -<title>Building a Stock Quoter with TAO - A Tutorial</title> -<!--[if gte mso 9]><xml> - <o:DocumentProperties> - <o:Author>Abdullah Sowayan</o:Author> - <o:LastAuthor>Abdullah Sowayan</o:LastAuthor> - <o:Revision>3</o:Revision> - <o:TotalTime>1</o:TotalTime> - <o:Created>2006-11-06T21:26:00Z</o:Created> - <o:LastSaved>2006-11-06T21:34:00Z</o:LastSaved> - <o:Pages>1</o:Pages> - <o:Words>285</o:Words> - <o:Characters>1629</o:Characters> - <o:Company>Lockheed Martin</o:Company> - <o:Lines>13</o:Lines> - <o:Paragraphs>3</o:Paragraphs> - <o:CharactersWithSpaces>1911</o:CharactersWithSpaces> - <o:Version>11.8107</o:Version> - </o:DocumentProperties> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:WordDocument> - <w:ValidateAgainstSchemas/> - <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> - <w:IgnoreMixedContent>false</w:IgnoreMixedContent> - <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> - <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> - </w:WordDocument> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> - </w:LatentStyles> -</xml><![endif]--> -<style> -<!-- - /* Font Definitions */ - @font-face - {font-family:Wingdings; - panose-1:5 0 0 0 0 0 0 0 0 0; - mso-font-charset:2; - mso-generic-font-family:auto; - mso-font-pitch:variable; - mso-font-signature:0 268435456 0 0 -2147483648 0;} - /* Style Definitions */ - p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -h3 - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - mso-outline-level:3; - font-size:13.5pt; - font-family:"Times New Roman"; - font-weight:bold;} -a:link, span.MsoHyperlink - {color:#000FFF; - text-decoration:underline; - text-underline:single;} -a:visited, span.MsoHyperlinkFollowed - {color:#FF0F0F; - text-decoration:underline; - text-underline:single;} -p - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -address - {margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - font-style:italic;} -code - {font-family:"Courier New"; - mso-ascii-font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman"; - mso-hansi-font-family:"Courier New"; - mso-bidi-font-family:"Courier New";} -@page Section1 - {size:8.5in 11.0in; - margin:1.0in 1.25in 1.0in 1.25in; - mso-header-margin:.5in; - mso-footer-margin:.5in; - mso-paper-source:0;} -div.Section1 - {page:Section1;} - /* List Definitions */ - @list l0 - {mso-list-id:20934335; - mso-list-template-ids:-306000872;} -@list l0:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l1 - {mso-list-id:67775701; - mso-list-template-ids:1355323582;} -@list l1:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l1:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2 - {mso-list-id:170876734; - mso-list-template-ids:1310460404;} -@list l2:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l2:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3 - {mso-list-id:232472744; - mso-list-template-ids:1463160066;} -@list l3:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0A7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Wingdings;} -@list l4 - {mso-list-id:333609146; - mso-list-template-ids:-1273693138;} -@list l4:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0A7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Wingdings;} -@list l4:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l5 - {mso-list-id:1166676480; - mso-list-template-ids:-2033257756;} -@list l5:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -ol - {margin-bottom:0in;} -ul - {margin-bottom:0in;} ---> -</style> -<!--[if gte mso 10]> -<style> - /* Style Definitions */ - table.MsoNormalTable - {mso-style-name:"Table Normal"; - mso-tstyle-rowband-size:0; - mso-tstyle-colband-size:0; - mso-style-noshow:yes; - mso-style-parent:""; - mso-padding-alt:0in 5.4pt 0in 5.4pt; - mso-para-margin:0in; - mso-para-margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:10.0pt; - font-family:"Times New Roman"; - mso-ansi-language:#0400; - mso-fareast-language:#0400; - mso-bidi-language:#0400;} -</style> -<![endif]--><!-- $Id$ --><!--[if gte mso 9]><xml> - <o:shapedefaults v:ext="edit" spidmax="3074"/> -</xml><![endif]--><!--[if gte mso 9]><xml> - <o:shapelayout v:ext="edit"> - <o:idmap v:ext="edit" data="1"/> - </o:shapelayout></xml><![endif]--> -</head> - -<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval: -.5in'> - -<div class=Section1> - -<h3 align=center style='text-align:center'><span style='color:black'>Step 6: System -Deployment<o:p></o:p></span></h3> - -<h3 align=center style='text-align:center'><span style='color:black'><img -width=432 height=223 id="_x0000_i1025" src="images/Step6.JPG"><o:p></o:p></span></h3> - -<p class=MsoNormal><span style='color:black'>Now that we have all the -components and driver programs successfully built, along with the -flattened_deploymentplan generated by PICML, we will be able to run our -application<br> -<br> -From different command prompts in </span><code><span style='font-size:10.0pt; -color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/descriptors/</span></code><span -style='color:black'> directory: <o:p></o:p></span></p> - -<ul type=disc> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'>Start NodeManagers - (NodeDameon) by running <code><span style='font-size:10.0pt'>runNodeDaemon.pl</span></code><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'>Start the execution - manager <code><span style='font-size:10.0pt'>%CIAO_ROOT%/DAnCE/ExecutionManager/Execution_Manager - -o ior -i Stock.dat</span></code> <o:p></o:p></li> -</ul> - -<p><span style='color:black'>The </span><code><span style='font-size:10.0pt; -color:black'>Stock.dat</span></code><span style='color:black'> file describes -the deployment daemons CIAO's Execution_Manager will contact to instantiate -ComponentServer's, home's, and component instances. Each line specify the name -of a installation "destination" and the corresponding IOR for the -CIAO_Daemon.<o:p></o:p></span></p> - -<ul type=square> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l4 level1 lfo6;tab-stops:list .5in'><em>NOTE</em>: As one - can see, we use the "Stock.dat" file to instruct the - Execution_Manager how to find the endpoint of each individual NodeManager - (i.e., Node Daemon) where component(s) will be deployed, so this is - non-standard. We plan to use Naming Service to do this in the future.<o:p></o:p></li> -</ul> - -<ul type=disc> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo9;tab-stops:list .5in'>Start the plan_launcher - by running <code><span style='font-size:10.0pt'>%CIAO_ROOT%/DAnCE/Plan_Launcher/Plan_Launcher - -p flattened_deploymentplan.cdp -k file://ior</span></code><o:p></o:p></li> - <li class=MsoNormal style='color:black;mso-margin-top-alt:auto;mso-margin-bottom-alt: - auto;mso-list:l1 level1 lfo9;tab-stops:list .5in'>By now the components - should be successfully deployed. You may run the driver program to start - the application. e.g. you can try the following<o:p></o:p></li> -</ul> - -<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'> -</span><code><span style='font-size:10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe --o</span></code><span style='color:black'><br> -<br> - </span><code><span style='font-size: -10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe --s MSFT</span></code><span style='color:black'><br> -<br> - </span><code><span style='font-size: -10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe --s IBM</span></code><span style='color:black'><br> -<br> - </span><code><span style='font-size: -10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe --u MSFT</span></code><span style='color:black'><br> -<br> - </span><code><span style='font-size: -10.0pt;color:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe -–f</span></code><code><span style='font-size:10.0pt'><o:p></o:p></span></code></p> - -<p class=MsoNormal style='margin-bottom:12.0pt'><code><span style='font-size: -10.0pt;color:black'><o:p> </o:p></span></code></p> - -<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span -style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br> -</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address> - -<address style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span -style='color:black'><o:p> </o:p></span></address> - -<p class=MsoNormal style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span -style='color:black'><!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->Last -modified:<!-- hhmts end --> <o:p></o:p></span></p> - -<p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'><o:p> </o:p></span></p> - -</div> - -</body> - -</html> diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc index 627feb516a9..70d9efbce53 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc +++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc @@ -5,12 +5,7 @@ project(Stock_Base_Broker_stub): ciao_client_dnc { avoids += ace_for_tao after += Stock_Base_stub sharedname = Broker_stub - idlflags -= -GT - idlflags += -St \ - -Wb,stub_export_macro=BROKER_STUB_Export \ - -Wb,stub_export_include=Broker_stub_export.h \ - -Wb,skel_export_macro=BROKER_SVNT_Export \ - -Wb,skel_export_include=Broker_svnt_export.h + idlflags += -Wb,stub_export_macro=BROKER_STUB_Export -Wb,stub_export_include=Broker_stub_export.h -Wb,skel_export_macro=BROKER_SVNT_Export -Wb,skel_export_include=Broker_svnt_export.h dynamicflags = BROKER_STUB_BUILD_DLL libs += Stock_Base_stub @@ -25,14 +20,11 @@ project(Stock_Base_Broker_stub): ciao_client_dnc { project(Stock_Base_Broker_svnt) : ciao_servant_dnc { avoids += ace_for_tao - after += Stock_Base_skel Stock_Base_Broker_stub + after += Stock_Base_svnt Stock_Base_Broker_stub sharedname = Broker_svnt - libs += Broker_stub Stock_Base_stub Stock_Base_skel + libs += Broker_stub Stock_Base_stub Stock_Base_svnt - idlflags -= -GT - idlflags += -SS -St \ - -Wb,export_macro=BROKER_SVNT_Export \ - -Wb,export_include=Broker_svnt_export.h + idlflags += -Wb,export_macro=BROKER_SVNT_Export -Wb,export_include=Broker_svnt_export.h dynamicflags = BROKER_SVNT_BUILD_DLL CIDL_Files { @@ -55,14 +47,17 @@ project(Stock_Base_Broker_exec) : ciao_component_dnc { avoids += ace_for_tao after += Stock_Base_Broker_svnt sharedname = Broker_exec - libs += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_skel + libs += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_svnt + idlflags += -Wb,export_macro=BROKER_EXEC_Export -Wb,export_include=Broker_exec_export.h dynamicflags = BROKER_EXEC_BUILD_DLL IDL_Files { + } Source_Files { + Broker_exec.cpp } } diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc index aad6ad54195..295c8d0004c 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc +++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc @@ -5,12 +5,7 @@ project(Stock_Base_Distributor_stub): ciao_client_dnc { avoids += ace_for_tao after += Stock_Base_stub sharedname = Distributor_stub - idlflags -= -GT - idlflags += -St \ - -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export \ - -Wb,stub_export_include=Distributor_stub_export.h \ - -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export \ - -Wb,skel_export_include=Distributor_svnt_export.h + idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export -Wb,stub_export_include=Distributor_stub_export.h -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export -Wb,skel_export_include=Distributor_svnt_export.h dynamicflags = DISTRIBUTOR_STUB_BUILD_DLL libs += Stock_Base_stub @@ -26,14 +21,11 @@ project(Stock_Base_Distributor_stub): ciao_client_dnc { project(Stock_Base_Distributor_svnt) : ciao_servant_dnc { avoids += ace_for_tao - after += Stock_Base_skel Stock_Base_Distributor_stub + after += Stock_Base_svnt Stock_Base_Distributor_stub sharedname = Distributor_svnt - libs += Distributor_stub Stock_Base_stub Stock_Base_skel + libs += Distributor_stub Stock_Base_stub Stock_Base_svnt - idlflags -= -GT - idlflags += -SS -St \ - -Wb,export_macro=DISTRIBUTOR_SVNT_Export \ - -Wb,export_include=Distributor_svnt_export.h + idlflags += -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL CIDL_Files { @@ -56,17 +48,17 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc { avoids += ace_for_tao after += Stock_Base_Distributor_svnt sharedname = Distributor_exec - libs += Distributor_stub \ - Distributor_svnt \ - Stock_Base_stub \ - Stock_Base_skel + libs += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt + idlflags += -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h dynamicflags = DISTRIBUTOR_EXEC_BUILD_DLL - IDL_Files { + IDL_Files { + } - Source_Files { + Source_Files { + Distributor_exec.cpp } } diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc index 6f3cde298ff..b294d5db74e 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc +++ b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc @@ -4,11 +4,7 @@ project(Stock_Base_stub): ciao_client_dnc { sharedname = Stock_Base_stub - idlflags -= -GT - idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export \ - -Wb,stub_export_include=Stock_Base_stub_export.h \ - -Wb,skel_export_macro=STOCK_BASE_SKEL_Export \ - -Wb,skel_export_include=Stock_Base_skel_export.h + idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export -Wb,stub_export_include=Stock_Base_stub_export.h -Wb,skel_export_macro=STOCK_BASE_SVNT_Export -Wb,skel_export_include=Stock_Base_svnt_export.h dynamicflags = STOCK_BASE_STUB_BUILD_DLL IDL_Files { @@ -20,17 +16,13 @@ project(Stock_Base_stub): ciao_client_dnc { } } -project(Stock_Base_skel) : ciao_servant_dnc { +project(Stock_Base_svnt) : ciao_servant_dnc { after += Stock_Base_stub - sharedname = Stock_Base_skel + sharedname = Stock_Base_svnt libs += Stock_Base_stub - idlflags -= -GT - idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export \ - -Wb,stub_export_include=Stock_Base_stub_export.h \ - -Wb,skel_export_macro=STOCK_BASE_SKEL_Export \ - -Wb,skel_export_include=Stock_Base_skel_export.h - dynamicflags = STOCK_BASE_SKEL_BUILD_DLL + idlflags += -Wb,export_macro=STOCK_BASE_SVNT_Export -Wb,export_include=Stock_Base_svnt_export.h + dynamicflags = STOCK_BASE_SVNT_BUILD_DLL IDL_Files { Stock_Base.idl diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h deleted file mode 100644 index 262ab650fed..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_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 STOCK_BASE_SVNT -// ------------------------------ -#ifndef STOCK_BASE_SKEL_EXPORT_H -#define STOCK_BASE_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (STOCK_BASE_SKEL_HAS_DLL) -# define STOCK_BASE_SKEL_HAS_DLL 1 -#endif /* ! STOCK_BASE_SKEL_HAS_DLL */ - -#if defined (STOCK_BASE_SKEL_HAS_DLL) && (STOCK_BASE_SKEL_HAS_DLL == 1) -# if defined (STOCK_BASE_SKEL_BUILD_DLL) -# define STOCK_BASE_SKEL_Export ACE_Proper_Export_Flag -# define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* STOCK_BASE_SKEL_BUILD_DLL */ -# define STOCK_BASE_SKEL_Export ACE_Proper_Import_Flag -# define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* STOCK_BASE_SKEL_BUILD_DLL */ -#else /* STOCK_BASE_SKEL_HAS_DLL == 1 */ -# define STOCK_BASE_SKEL_Export -# define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) -# define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* STOCK_BASE_SKEL_HAS_DLL == 1 */ - -// Set STOCK_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (STOCK_BASE_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define STOCK_BASE_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define STOCK_BASE_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !STOCK_BASE_SKEL_NTRACE */ - -#if (STOCK_BASE_SKEL_NTRACE == 1) -# define STOCK_BASE_SKEL_TRACE(X) -#else /* (STOCK_BASE_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define STOCK_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (STOCK_BASE_SKEL_NTRACE == 1) */ - -#endif /* STOCK_BASE_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h new file mode 100644 index 00000000000..b3dfe948823 --- /dev/null +++ b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl STOCK_BASE_SVNT +// ------------------------------ +#ifndef STOCK_BASE_SVNT_EXPORT_H +#define STOCK_BASE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (STOCK_BASE_SVNT_HAS_DLL) +# define STOCK_BASE_SVNT_HAS_DLL 1 +#endif /* ! STOCK_BASE_SVNT_HAS_DLL */ + +#if defined (STOCK_BASE_SVNT_HAS_DLL) && (STOCK_BASE_SVNT_HAS_DLL == 1) +# if defined (STOCK_BASE_SVNT_BUILD_DLL) +# define STOCK_BASE_SVNT_Export ACE_Proper_Export_Flag +# define STOCK_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define STOCK_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* STOCK_BASE_SVNT_BUILD_DLL */ +# define STOCK_BASE_SVNT_Export ACE_Proper_Import_Flag +# define STOCK_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define STOCK_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* STOCK_BASE_SVNT_BUILD_DLL */ +#else /* STOCK_BASE_SVNT_HAS_DLL == 1 */ +# define STOCK_BASE_SVNT_Export +# define STOCK_BASE_SVNT_SINGLETON_DECLARATION(T) +# define STOCK_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* STOCK_BASE_SVNT_HAS_DLL == 1 */ + +// Set STOCK_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (STOCK_BASE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define STOCK_BASE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define STOCK_BASE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !STOCK_BASE_SVNT_NTRACE */ + +#if (STOCK_BASE_SVNT_NTRACE == 1) +# define STOCK_BASE_SVNT_TRACE(X) +#else /* (STOCK_BASE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define STOCK_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (STOCK_BASE_SVNT_NTRACE == 1) */ + +#endif /* STOCK_BASE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl index 7437f0ed341..b00cced27eb 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl +++ b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib "../../../../../../bin"; use PerlACE::Run_Test; $status = 0; diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG Binary files differdeleted file mode 100644 index b0346ee841b..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG Binary files differdeleted file mode 100644 index a4526901307..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG Binary files differdeleted file mode 100644 index d7687394851..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG Binary files differdeleted file mode 100644 index e1e3b28055d..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg Binary files differdeleted file mode 100644 index ddccdc2b373..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig1.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig1.jpg Binary files differdeleted file mode 100644 index a8550fe1176..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig1.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig10.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig10.jpg Binary files differdeleted file mode 100644 index 3db5ac174e0..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig10.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig11.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig11.jpg Binary files differdeleted file mode 100644 index c5eaf705384..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig11.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig12.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig12.jpg Binary files differdeleted file mode 100644 index ea2a885af6b..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig12.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig2.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig2.jpg Binary files differdeleted file mode 100644 index 49d6f90c3b0..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig2.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig3.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig3.jpg Binary files differdeleted file mode 100644 index 0559dc7382b..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig3.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig4.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig4.jpg Binary files differdeleted file mode 100644 index 8fb89eccb57..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig4.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig5.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig5.jpg Binary files differdeleted file mode 100644 index e847b9290d6..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig5.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig6.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig6.jpg Binary files differdeleted file mode 100644 index 0a214c84ea8..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig6.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig7.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig7.jpg Binary files differdeleted file mode 100644 index 67d90b775b0..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig7.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig8.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig8.jpg Binary files differdeleted file mode 100644 index a565c2ab989..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig8.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/fig9.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/fig9.jpg Binary files differdeleted file mode 100644 index 996d90d800b..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/images/fig9.jpg +++ /dev/null diff --git a/CIAO/docs/tutorials/Quoter/Simple/index.html b/CIAO/docs/tutorials/Quoter/Simple/index.html deleted file mode 100644 index f865a43cc6c..00000000000 --- a/CIAO/docs/tutorials/Quoter/Simple/index.html +++ /dev/null @@ -1,655 +0,0 @@ -<!-- $Id$ --> -<html xmlns:v="urn:schemas-microsoft-com:vml" -xmlns:o="urn:schemas-microsoft-com:office:office" -xmlns:w="urn:schemas-microsoft-com:office:word" -xmlns:p="urn:schemas-microsoft-com:office:powerpoint" -xmlns:oa="urn:schemas-microsoft-com:office:activation" -xmlns="http://www.w3.org/TR/REC-html40"> - -<head> -<meta http-equiv=Content-Type content="text/html; charset=us-ascii"> -<meta name=ProgId content=Word.Document> -<meta name=Generator content="Microsoft Word 11"> -<meta name=Originator content="Microsoft Word 11"> -<link rel=File-List href="index_files/filelist.xml"> -<link rel=Edit-Time-Data href="index_files/editdata.mso"> -<!--[if !mso]> -<style> -v\:* {behavior:url(#default#VML);} -o\:* {behavior:url(#default#VML);} -w\:* {behavior:url(#default#VML);} -.shape {behavior:url(#default#VML);} -</style> -<![endif]--> -<title>Building a Stock Quoter with TAO - A Tutorial</title> -<!--[if gte mso 9]><xml> - <o:DocumentProperties> - <o:Author>Abdullah Sowayan</o:Author> - <o:LastAuthor>Abdullah Sowayan</o:LastAuthor> - <o:Revision>13</o:Revision> - <o:TotalTime>64</o:TotalTime> - <o:Created>2006-10-06T22:35:00Z</o:Created> - <o:LastSaved>2006-11-06T21:35:00Z</o:LastSaved> - <o:Pages>1</o:Pages> - <o:Words>851</o:Words> - <o:Characters>4851</o:Characters> - <o:Company>Maritime Systems & Sensors</o:Company> - <o:Lines>40</o:Lines> - <o:Paragraphs>11</o:Paragraphs> - <o:CharactersWithSpaces>5691</o:CharactersWithSpaces> - <o:Version>11.8107</o:Version> - </o:DocumentProperties> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:WordDocument> - <w:ValidateAgainstSchemas/> - <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> - <w:IgnoreMixedContent>false</w:IgnoreMixedContent> - <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> - <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> - </w:WordDocument> -</xml><![endif]--><!--[if gte mso 9]><xml> - <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> - </w:LatentStyles> -</xml><![endif]--> -<style> -<!-- - /* Style Definitions */ - p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -h3 - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - mso-outline-level:3; - font-size:13.5pt; - font-family:"Times New Roman"; - font-weight:bold;} -a:link, span.MsoHyperlink - {color:#000FFF; - text-decoration:underline; - text-underline:single;} -a:visited, span.MsoHyperlinkFollowed - {color:#FF0F0F; - text-decoration:underline; - text-underline:single;} -p - {mso-margin-top-alt:auto; - margin-right:0in; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - mso-fareast-font-family:"Times New Roman";} -address - {margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - font-family:"Times New Roman"; - font-style:italic;} -code - {font-family:"Courier New"; - mso-ascii-font-family:"Courier New"; - mso-fareast-font-family:"Times New Roman"; - mso-hansi-font-family:"Courier New"; - mso-bidi-font-family:"Courier New";} -span.intbody - {mso-style-name:intbody;} -@page Section1 - {size:8.5in 11.0in; - margin:1.0in 1.25in 1.0in 1.25in; - mso-header-margin:.5in; - mso-footer-margin:.5in; - mso-paper-source:0;} -div.Section1 - {page:Section1;} - /* List Definitions */ - @list l0 - {mso-list-id:137387275; - mso-list-type:hybrid; - mso-list-template-ids:-1837205732 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l0:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.75in; - mso-level-number-position:left; - margin-left:.75in; - text-indent:-.25in; - font-family:Symbol;} -@list l0:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l0:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1 - {mso-list-id:271979655; - mso-list-template-ids:-2025148996;} -@list l1:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.75in; - mso-level-number-position:left; - margin-left:.75in; - text-indent:-.25in; - font-family:Symbol;} -@list l1:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l1:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2 - {mso-list-id:398870737; - mso-list-type:hybrid; - mso-list-template-ids:-1758177826 -1301365556 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;} -@list l2:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-weight:bold;} -@list l2:level2 - {mso-level-number-format:alpha-lower; - mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l2:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3 - {mso-list-id:1284144513; - mso-list-type:hybrid; - mso-list-template-ids:120510300 -1301365556 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;} -@list l3:level1 - {mso-level-tab-stop:.5in; - mso-level-number-position:left; - text-indent:-.25in; - mso-ansi-font-weight:bold;} -@list l3:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l3:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4 - {mso-list-id:1734621206; - mso-list-type:hybrid; - mso-list-template-ids:-1370594096 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l4:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:.75in; - mso-level-number-position:left; - margin-left:.75in; - text-indent:-.25in; - font-family:Symbol;} -@list l4:level2 - {mso-level-tab-stop:1.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level3 - {mso-level-tab-stop:1.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level4 - {mso-level-tab-stop:2.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level5 - {mso-level-tab-stop:2.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level6 - {mso-level-tab-stop:3.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level7 - {mso-level-tab-stop:3.5in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level8 - {mso-level-tab-stop:4.0in; - mso-level-number-position:left; - text-indent:-.25in;} -@list l4:level9 - {mso-level-tab-stop:4.5in; - mso-level-number-position:left; - text-indent:-.25in;} -ol - {margin-bottom:0in;} -ul - {margin-bottom:0in;} ---> -</style> -<!--[if gte mso 10]> -<style> - /* Style Definitions */ - table.MsoNormalTable - {mso-style-name:"Table Normal"; - mso-tstyle-rowband-size:0; - mso-tstyle-colband-size:0; - mso-style-noshow:yes; - mso-style-parent:""; - mso-padding-alt:0in 5.4pt 0in 5.4pt; - mso-para-margin:0in; - mso-para-margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:10.0pt; - font-family:"Times New Roman"; - mso-ansi-language:#0400; - mso-fareast-language:#0400; - mso-bidi-language:#0400;} -</style> -<![endif]--><!-- index.html,v 1.3 2006/05/06 02:29:31 schmidt Exp --><!--[if gte mso 9]><xml> - <o:shapedefaults v:ext="edit" spidmax="7170"/> -</xml><![endif]--><!--[if gte mso 9]><xml> - <o:shapelayout v:ext="edit"> - <o:idmap v:ext="edit" data="1"/> - </o:shapelayout></xml><![endif]--> -</head> - -<body bgcolor=white lang=EN-US link="#000FFF" vlink="#FF0F0F" style='tab-interval: -.5in'> - -<div class=Section1> - -<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center; -line-height:150%'><span style='color:black'>Building a Stock Quoter with CIAO, -CoSMIC, and DAnCE - A Tutorial<o:p></o:p></span></h3> - -<h3 align=center style='margin:0in;margin-bottom:.0001pt;text-align:center; -line-height:150%'><span style='color:black'><o:p> </o:p></span></h3> - -<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'>This tutorial provides a step-by-step lesson on developing -component-based distributed applications using <a -href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> modeling toolkit and the -<a href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO DAnCE</a> -framework. The example application used in this tutorial is a Stock Quoter that -consists of two components; the <i>StockDistributor</i> and the <i>StockBroker</i>. -The <i>StockDistributor</i> notifies one or more stock brokers whenever a stock -price changes. Upon receiving the notification, the <i>StockBroker</i> fetches -information about a particular stock from the <i>StockDistributor</i>. The -figure bellow shows the application diagram. This Stock Quoter application is -based on a series of <a -href="http://www.cs.wustl.edu/%7Eschmidt/report-doc.html">CORBA component model</a> -columns written by <a href="http://www.cs.wustl.edu/%7Eschmidt/">Doug Schmidt</a> -and <a href="http://www.iona.com/hyplan/vinoski/">Steve Vinoski</a> for <a -href="http://www.cuj.com">C/C++ Users Journal</a> and has consistently been -used as an example for <a href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a>.<o:p></o:p></span></p> - -<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal align=center style='text-align:center;line-height:150%'><span -style='color:black'><img border=0 width=434 height=232 id="_x0000_i1025" -src="images/fig1.jpg"><br> -Stock Quoter application Diagram <o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p> </o:p></span></p> - -<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'>This is a step-by-step tutorial that will walk you through -the development and deployment phases of a CCM application (Stock Quoter). This -tutorial assumes that you have read and understood the following articles that -describe the example:<o:p></o:p></span></p> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><a -href="http://www.cuj.com/documents/s=9039/cujexp0402vinoski/">The CORBA -Component Model, Part 1: Evolving Towards Component Middleware</a></p> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><a -href="http://www.cuj.com/documents/s=9152/cujexp0404vinoski/">The CORBA -Component Model, Part 2: Defining Components with the IDL 3.x Types</a></p> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><a -href="http://www.cuj.com/documents/s=9301/cujexp0409vinoski/">The CORBA -Component Model, Part 3: The CCM Container Architecture and Component -Implementation Framework</a></p> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo1; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><a -href="http://www.cuj.com/documents/s=9360/cujexp0410vinoski/">The CORBA -Component Model Part 4: The CORBA Component Model Part 4: Implementing -Components with CCM</a></p> - -<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'><o:p> </o:p></span></p> - -<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'><span style='mso-spacerun:yes'> </span>In addition to -the articles above, reading and understanding the resources below will greatly -help you follow through this tutorial:<o:p></o:p></span></p> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l4 level1 lfo2; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol;color:black'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><a -href="http://www.cs.wustl.edu/~schmidt/PDF/DAnCE.pdf">DAnCE: A QoS-enabled -Component Deployment and Conguration Engine</a><span style='color:black'><o:p></o:p></span></p> - -<p style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; -margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l4 level1 lfo2; -tab-stops:list .75in'><![if !supportLists]><span style='font-family:Symbol; -mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'><span -style='mso-list:Ignore'>·<span style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]>TAO’s Developer’s Guide Version -1.4a. Chapter 32 : CIAO and CCM.</p> - -<p style='margin:0in;margin-bottom:.0001pt;line-height:150%'><span -style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><b><span style='font-size:14.0pt; -line-height:150%;color:black'>Prerequisites:</span></b><b><span -style='font-size:13.5pt;line-height:150%;color:black'><br> -</span></b><span style='color:black'> Before you start, you need the -following: <o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height: -150%;mso-list:l1 level1 lfo3;tab-stops:list .75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><b><span style='color:black'>ACE+TAO+CIAO -(Component Integraated ACE ORB).</span></b><span style='color:black'> ACE + TAO -+ CIAO provide the CCM infrastructure necessary to enable the CCM-based distributed -component interaction. You can click <a -href="http://download.dre.vanderbilt.edu">here</a> to download the latest -ACE + TAO + CIAO and click <a -href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/CIAO-INSTALL.html">here</a> -for information on how to build ACE+TAO+CIAO.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height: -150%;mso-list:l1 level1 lfo3;tab-stops:list .75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><b><span style='color:black'>Generic Modeling -Environment (GME).</span></b><span style='color:black'> GME is a configurable -toolkit for creating domain-specific modeling and program synthesis -environments. It provides the execution environment for CoSMIC toolkits. Click <a -href="http://www.isis.vanderbilt.edu/Projects/gme/download.html">here</a> to -download GME.<o:p></o:p></span></p> - -<p class=MsoNormal style='margin-left:.75in;text-indent:-.25in;line-height: -150%;mso-list:l1 level1 lfo3;tab-stops:list .75in'><![if !supportLists]><span -style='font-family:Symbol;mso-fareast-font-family:Symbol;mso-bidi-font-family: -Symbol;color:black'><span style='mso-list:Ignore'>·<span -style='font:7.0pt "Times New Roman"'> -</span></span></span><![endif]><b><span style='color:black'>CoSMIC toolkit.</span></b><span -style='color:black'> Click <a href="http://www.dre.vanderbilt.edu/cosmic/">here</a> -to download the latest CoSMIC release.<o:p></o:p></span></p> - -<blockquote style='margin-top:5.0pt;margin-bottom:5.0pt'> - -<div style='margin-left:-.5in'> - -<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -</div> - -<p class=MsoNormal style='margin-left:-.5in;line-height:150%'><strong><span -style='color:black'>Note:</span></strong><strong><span style='font-weight:normal'><o:p></o:p></span></strong></p> - -<p class=MsoNormal style='margin-left:0in;text-indent:-.25in;line-height:150%; -mso-list:l3 level1 lfo4;tab-stops:list 0in .5in'><![if !supportLists]><b -style='mso-bidi-font-weight:normal'><span style='mso-list:Ignore'>1.<span -style='font:7.0pt "Times New Roman"'> </span></span></b><![endif]><span -style='color:black'>Usually you should download the latest GME, but it is -possible that CoSMIC hasn't been updated yet to support the very latest -GME..The installation process of CoSMIC will tell you which version it is -expecting. So <span class=intbody>please make sure the GME version you -are using is the version required by CoSMIC. A different version of </span>GME -may result in undefined errors. </span></p> - -<p class=MsoNormal style='margin-left:0in;text-indent:-.25in;line-height:150%; -mso-list:l3 level1 lfo4;tab-stops:list 0in .5in'><![if !supportLists]><b -style='mso-bidi-font-weight:normal'><span style='color:black'><span -style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'> -</span></span></span></b><![endif]><span style='color:black'>Make sure you -install GME first before you start with CoSMIC toolkits.<o:p></o:p></span></p> - -<div style='margin-left:-.5in'> - -<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -</div> - -</blockquote> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><b style='mso-bidi-font-weight: -normal'><span style='font-size:14.0pt;line-height:150%;color:black'>Steps for -Developing the Stock Quoter Application:<o:p></o:p></span></b></p> - -<p class=MsoNormal style='line-height:150%'><b style='mso-bidi-font-weight: -normal'><span style='font-size:14.0pt;line-height:150%;color:black'><o:p> </o:p></span></b></p> - -<p class=MsoNormal align=center style='text-align:center;line-height:150%'><b -style='mso-bidi-font-weight:normal'><span style='font-size:14.0pt;line-height: -150%;color:black'><img border=0 width=960 height=521 id="_x0000_i1028" -src="images/Steps%20for%20Developing%20CCM%20Applications.jpg"><o:p></o:p></span></b></p> - -<p class=MsoNormal align=center style='text-align:center;line-height:150%'><span -style='color:black'>Steps for Developing Stock Quoter Application<o:p></o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p> </o:p></span></p> - -<p class=MsoNormal style='line-height:150%'><span style='color:black'>Listed -below are the steps for developing the Stock Quoter application. Each link is a -step-by-step tutorial of the specific step.</span><b style='mso-bidi-font-weight: -normal'><span style='font-size:14.0pt;line-height:150%;color:black'><o:p></o:p></span></b></p> - -<ol style='margin-top:0in' start=1 type=1> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5; - tab-stops:list .5in'><b><a href="01.html">Define your interfaces and - component types</a>:</b><o:p></o:p></li> - <ol style='margin-top:0in' start=1 type=a> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level2 lfo5; - tab-stops:list 1.0in'><b>Define your interfaces using IDL 2.x features</b>, - e.g., use the familiar CORBA types (such as <span style='mso-bidi-font-weight: - bold'>struct</span>, <span style='mso-bidi-font-weight:bold'>sequence</span>, - <span style='mso-bidi-font-weight:bold'>long</span>, <span - style='mso-bidi-font-weight:bold'>Object</span>, <span style='mso-bidi-font-weight: - bold'>interface</span>, <span style='mso-bidi-font-weight:bold'>raises</span>, - etc.) to define your interfaces & exceptions.<o:p></o:p></li> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level2 lfo5; - tab-stops:list 1.0in'><b>Define your component types using IDL 3.x - features</b>, e.g., use the new CCM keywords (such as <span - style='mso-bidi-font-weight:bold'>component</span>, <span - style='mso-bidi-font-weight:bold'>provides</span>, <span - style='mso-bidi-font-weight:bold'>uses</span>, <span style='mso-bidi-font-weight: - bold'>publishes</span>, <span style='mso-bidi-font-weight:bold'>emits</span>, - & <span style='mso-bidi-font-weight:bold'>consumes</span>) to group - the IDL 2.x types together to form components.<b><o:p></o:p></b></li> - </ol> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5; - tab-stops:list .5in'><b><a href="02.html">Implement your components</a></b>, - e.g., using C++ or Java & the Component Implementation Definition - Language (CIDL), which generates component servants, executor interfaces, - associated metadata, & compositions.<b><o:p></o:p></b></li> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5; - tab-stops:list .5in'><b style='mso-bidi-font-weight:normal'><a - href="03.html">Package your components</a></b>, <span style='color:red'>[Ming, - can you add a brief description here?]</span><b><o:p></o:p></b></li> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5; - tab-stops:list .5in'><b><a href="03.html">Assemble your components</a></b>, - e.g., group related components together & characterize their metadata - that describes the components present in the assembly.<span - style='mso-bidi-font-weight:bold'><o:p></o:p></span></li> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5; - tab-stops:list .5in'><b style='mso-bidi-font-weight:normal'><a - href="03.html">Plan your deployment</a></b>, <span style='color:red'>[Ming, - can you add a brief description here?]</span><span style='mso-bidi-font-weight: - bold'><o:p></o:p></span></li> - <li class=MsoNormal style='color:black;line-height:150%;mso-list:l2 level1 lfo5; - tab-stops:list .5in'><b><a href="04.html">Deploy your components & run - your application</a></b>, e.g., move the component assembly packages to - the appropriate nodes in the distributed system & invoke operations on - components to perform the application logic.<b style='mso-bidi-font-weight: - normal'><o:p></o:p></b></li> -</ol> - -<div class=MsoNormal align=center style='text-align:center;line-height:150%'><span -style='color:black'> - -<hr size=2 width="100%" align=center> - -</span></div> - -<address style='line-height:150%'><a href="mailto:ming.xiong@vanderbilt.edu">Ming -Xiong<br> -</a><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></address> - -<address style='line-height:150%'>Last modified: Fri May 5 21:29:07 CDT 2006 <span -style='color:black'><o:p></o:p></span></address> - -</div> - -</body> - -</html> diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc index 0b834017746..f706edb968d 100644 --- a/CIAO/examples/Display/Display_Base/Display_Base.mpc +++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc @@ -6,9 +6,9 @@ project(Display_Base_stub): ciao_client_dnc { sharedname = Display_Base_stub idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \ -Wb,stub_export_include=Display_Base_stub_export.h \ - -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \ - -Wb,skel_export_include=Display_Base_skel_export.h - dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL + -Wb,skel_export_macro=DISPLAY_BASE_SVNT_Export \ + -Wb,skel_export_include=Display_Base_svnt_export.h + dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL IDL_Files { Display_Base.idl @@ -17,22 +17,16 @@ project(Display_Base_stub): ciao_client_dnc { Source_Files { Display_BaseC.cpp } - - Header_Files { - Display_Base_stub_export.h - } } -project(Display_Base_skel) : ciao_servant_dnc { +project(Display_Base_svnt) : ciao_servant_dnc { after += Display_Base_stub - sharedname = Display_Base_skel + sharedname = Display_Base_svnt libs += Display_Base_stub - idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \ - -Wb,stub_export_include=Display_Base_stub_export.h \ - -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \ - -Wb,skel_export_include=Display_Base_skel_export.h - dynamicflags = DISPLAY_BASE_SKEL_BUILD_DLL + idlflags += -Wb,export_macro=DISPLAY_BASE_SVNT_Export \ + -Wb,export_include=Display_Base_svnt_export.h + dynamicflags = DISPLAY_BASE_SVNT_BUILD_DLL IDL_Files { Display_Base.idl @@ -41,10 +35,6 @@ project(Display_Base_skel) : ciao_servant_dnc { Source_Files { Display_BaseS.cpp } - - Header_Files { - Display_Base_skel_export.h - } } diff --git a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h b/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h deleted file mode 100644 index 2dc444fe8e0..00000000000 --- a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT -// ------------------------------ -#ifndef DISPLAY_BASE_SKEL_EXPORT_H -#define DISPLAY_BASE_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SKEL_HAS_DLL) -# define DISPLAY_BASE_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SKEL_HAS_DLL */ - -#if !defined (DISPLAY_BASE_SKEL_HAS_DLL) -# define DISPLAY_BASE_SKEL_HAS_DLL 1 -#endif /* ! DISPLAY_BASE_SKEL_HAS_DLL */ - -#if defined (DISPLAY_BASE_SKEL_HAS_DLL) && (DISPLAY_BASE_SKEL_HAS_DLL == 1) -# if defined (DISPLAY_BASE_SKEL_BUILD_DLL) -# define DISPLAY_BASE_SKEL_Export ACE_Proper_Export_Flag -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DISPLAY_BASE_SKEL_BUILD_DLL */ -# define DISPLAY_BASE_SKEL_Export ACE_Proper_Import_Flag -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DISPLAY_BASE_SKEL_BUILD_DLL */ -#else /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */ -# define DISPLAY_BASE_SKEL_Export -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */ - -// Set DISPLAY_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DISPLAY_BASE_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define DISPLAY_BASE_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DISPLAY_BASE_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DISPLAY_BASE_SKEL_NTRACE */ - -#if (DISPLAY_BASE_SKEL_NTRACE == 1) -# define DISPLAY_BASE_SKEL_TRACE(X) -#else /* (DISPLAY_BASE_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DISPLAY_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DISPLAY_BASE_SKEL_NTRACE == 1) */ - -#endif /* DISPLAY_BASE_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h new file mode 100644 index 00000000000..7e0460322a5 --- /dev/null +++ b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT +// ------------------------------ +#ifndef DISPLAY_BASE_SVNT_EXPORT_H +#define DISPLAY_BASE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SVNT_HAS_DLL) +# define DISPLAY_BASE_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SVNT_HAS_DLL */ + +#if !defined (DISPLAY_BASE_SVNT_HAS_DLL) +# define DISPLAY_BASE_SVNT_HAS_DLL 1 +#endif /* ! DISPLAY_BASE_SVNT_HAS_DLL */ + +#if defined (DISPLAY_BASE_SVNT_HAS_DLL) && (DISPLAY_BASE_SVNT_HAS_DLL == 1) +# if defined (DISPLAY_BASE_SVNT_BUILD_DLL) +# define DISPLAY_BASE_SVNT_Export ACE_Proper_Export_Flag +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* DISPLAY_BASE_SVNT_BUILD_DLL */ +# define DISPLAY_BASE_SVNT_Export ACE_Proper_Import_Flag +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* DISPLAY_BASE_SVNT_BUILD_DLL */ +#else /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */ +# define DISPLAY_BASE_SVNT_Export +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */ + +// Set DISPLAY_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (DISPLAY_BASE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define DISPLAY_BASE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define DISPLAY_BASE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !DISPLAY_BASE_SVNT_NTRACE */ + +#if (DISPLAY_BASE_SVNT_NTRACE == 1) +# define DISPLAY_BASE_SVNT_TRACE(X) +#else /* (DISPLAY_BASE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define DISPLAY_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (DISPLAY_BASE_SVNT_NTRACE == 1) */ + +#endif /* DISPLAY_BASE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc index 1846215380e..8ac7f0d6fba 100644 --- a/CIAO/examples/Display/GPS/GPS.mpc +++ b/CIAO/examples/Display/GPS/GPS.mpc @@ -4,11 +4,7 @@ project(Display_Base_GPS_stub): ciao_client_dnc { after += Display_Base_stub sharedname = GPS_stub - idlflags += -St \ - -Wb,stub_export_macro=GPS_STUB_Export \ - -Wb,stub_export_include=GPS_stub_export.h \ - -Wb,skel_export_macro=GPS_SVNT_Export \ - -Wb,skel_export_include=GPS_svnt_export.h + idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h dynamicflags = GPS_STUB_BUILD_DLL libs += Display_Base_stub @@ -19,20 +15,14 @@ project(Display_Base_GPS_stub): ciao_client_dnc { Source_Files { GPSC.cpp } - - Header_Files { - GPS_stub_export.h - } } project(Display_Base_GPS_svnt) : ciao_servant_dnc { - after += Display_Base_skel Display_Base_GPS_stub + after += Display_Base_svnt Display_Base_GPS_stub sharedname = GPS_svnt - libs += GPS_stub Display_Base_stub Display_Base_skel - - idlflags += -SS -St \ - -Wb,export_macro=GPS_SVNT_Export \ - -Wb,export_include=GPS_svnt_export.h + libs += GPS_stub Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h dynamicflags = GPS_SVNT_BUILD_DLL CIDL_Files { @@ -48,35 +38,25 @@ project(Display_Base_GPS_svnt) : ciao_servant_dnc { GPSS.cpp GPS_svnt.cpp } - - Header_Files { - GPS_svnt_export.h - } } project(Display_Base_GPS_exec) : ciao_component_dnc { after += Display_Base_GPS_svnt sharedname = GPS_exec - libs += GPS_stub GPS_svnt Display_Base_stub Display_Base_skel - - idlflags += -SS -St \ - -Wb,export_macro=GPS_EXEC_Export \ - -Wb,export_include=GPS_exec_export.h + libs += GPS_stub GPS_svnt Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h dynamicflags = GPS_EXEC_BUILD_DLL IDL_Files { - GPSEI.idl + GPSEI.idl } Source_Files { GPSEIC.cpp GPS_exec.cpp } - - Header_Files { - GPS_exec_export.h - } } diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc index a3ee533d6f5..3a32fa49d3f 100644 --- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc +++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc @@ -5,8 +5,7 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc { after += Display_Base_stub sharedname = NavDisplay_stub libs += Display_Base_stub - idlflags += -St \ - -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \ + idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \ -Wb,stub_export_include=NavDisplay_stub_export.h \ -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export \ -Wb,skel_export_include=NavDisplay_svnt_export.h @@ -19,21 +18,16 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc { Source_Files { NavDisplayC.cpp } - - Header_Files { - NavDisplay_stub_export.h - } } project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc { - after += Display_Base_skel Display_Base_NavDisplay_stub + after += Display_Base_svnt Display_Base_NavDisplay_stub sharedname = NavDisplay_svnt libs += NavDisplay_stub \ Display_Base_stub \ - Display_Base_skel + Display_Base_svnt - idlflags += -SS -St \ - -Wb,export_macro=NAVDISPLAY_SVNT_Export \ + idlflags += -Wb,export_macro=NAVDISPLAY_SVNT_Export \ -Wb,export_include=NavDisplay_svnt_export.h dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL @@ -50,10 +44,6 @@ project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc { NavDisplayS.cpp NavDisplay_svnt.cpp } - - Header_Files { - NavDisplay_svnt_export.h - } } @@ -63,19 +53,19 @@ project(Display_Base_NavDisplay_exec) : ciao_component_dnc { libs += NavDisplay_stub \ NavDisplay_svnt \ Display_Base_stub \ - Display_Base_skel + Display_Base_svnt - dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL + idlflags += -Wb,export_macro=NAVDISPLAY_EXEC_Export \ + -Wb,export_include=NavDisplay_exec_export.h + dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL IDL_Files { + } Source_Files { - NavDisplay_exec.cpp - } - Header_Files { - NavDisplay_exec_export.h + NavDisplay_exec.cpp } } diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc index 5ec6cfec169..2727c557efe 100644 --- a/CIAO/examples/Display/RateGen/RateGen.mpc +++ b/CIAO/examples/Display/RateGen/RateGen.mpc @@ -4,11 +4,7 @@ project(Display_Base_RateGen_stub): ciao_client_dnc { after += Display_Base_stub sharedname = RateGen_stub - idlflags += -St \ - -Wb,stub_export_macro=RATEGEN_STUB_Export \ - -Wb,stub_export_include=RateGen_stub_export.h \ - -Wb,skel_export_macro=RATEGEN_SVNT_Export \ - -Wb,skel_export_include=RateGen_svnt_export.h + idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h dynamicflags = RATEGEN_STUB_BUILD_DLL libs += Display_Base_stub @@ -19,20 +15,14 @@ project(Display_Base_RateGen_stub): ciao_client_dnc { Source_Files { RateGenC.cpp } - - Header_Files { - RateGen_stub_export.h - } } project(Display_Base_RateGen_svnt) : ciao_servant_dnc { - after += Display_Base_skel Display_Base_RateGen_stub + after += Display_Base_svnt Display_Base_RateGen_stub sharedname = RateGen_svnt - libs += RateGen_stub Display_Base_stub Display_Base_skel - - idlflags += -SS -St \ - -Wb,export_macro=RATEGEN_SVNT_Export \ - -Wb,export_include=RateGen_svnt_export.h + libs += RateGen_stub Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h dynamicflags = RATEGEN_SVNT_BUILD_DLL CIDL_Files { @@ -48,33 +38,25 @@ project(Display_Base_RateGen_svnt) : ciao_servant_dnc { RateGenS.cpp RateGen_svnt.cpp } - - Header_Files { - RateGen_svnt_export.h - } } project(Display_Base_RateGen_exec) : ciao_component_dnc { after += Display_Base_RateGen_svnt sharedname = RateGen_exec - libs += RateGen_stub \ - RateGen_svnt \ - Display_Base_stub \ - Display_Base_skel - - dynamicflags = RATEGEN_EXEC_BUILD_DLL + libs += RateGen_stub RateGen_svnt Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h + dynamicflags = RATEGEN_EXEC_BUILD_DLL IDL_Files { + } Source_Files { + RateGen_exec.cpp } - - Header_Files { - RateGen_exec_export.h - } } diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl index 6bdb1c85e03..da93ff1c72d 100755 --- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl +++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib "../../../../../../bin"; use PerlACE::Run_Test; $status = 0; diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl index 008c87f6e35..d03a0f47cc4 100755 --- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl +++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib "../../../../../bin"; use PerlACE::Run_Test; $status = 0; diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc index 468afcc1b8b..4bfcf5bcd20 100644 --- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -4,7 +4,8 @@ project(Hello_Base_DnC_stub): ciao_client_dnc { sharedname = Hello_Base_DnC_stub - idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ -Wb,stub_export_include=Hello_Base_stub_export.h \ -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \ -Wb,skel_export_include=Hello_Base_svnt_export.h @@ -32,7 +33,8 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc { sharedname = Hello_Base_DnC_svnt libs += Hello_Base_DnC_stub - idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ -Wb,stub_export_include=Hello_Base_stub_export.h \ -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \ -Wb,skel_export_include=Hello_Base_svnt_export.h diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc index 2ccb0fd930c..df794278191 100644 --- a/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -5,7 +5,8 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { avoids += ace_for_tao after += Hello_Base_DnC_stub sharedname = Receiver_DnC_stub - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + idlflags += -Sc \ + -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 @@ -19,11 +20,11 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - + Header_Files { ReceiverC.h } - + Inline_Files { ReceiverC.inl } @@ -37,8 +38,9 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc { libs += Receiver_DnC_stub \ Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - - idlflags += -Wb,export_macro=RECEIVER_SVNT_Export \ + + idlflags += -Sc \ + -Wb,export_macro=RECEIVER_SVNT_Export \ -Wb,export_include=Receiver_svnt_export.h dynamicflags = RECEIVER_SVNT_BUILD_DLL @@ -77,8 +79,9 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { Receiver_DnC_svnt \ Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - - idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ + + idlflags += -Sc \ + -Wb,export_macro=RECEIVER_EXEC_Export \ -Wb,export_include=Receiver_exec_export.h dynamicflags = RECEIVER_EXEC_BUILD_DLL @@ -88,10 +91,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { Source_Files { Receiver_exec.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc index defe03b11a6..0b4473033c8 100644 --- a/CIAO/examples/Hello/Sender/Sender.mpc +++ b/CIAO/examples/Hello/Sender/Sender.mpc @@ -5,7 +5,8 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { avoids += ace_for_tao after += Hello_Base_DnC_stub sharedname = Sender_DnC_stub - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + idlflags += -Sc \ + -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 @@ -19,11 +20,11 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - + Header_Files { SenderC.h } - + Inline_Files { SenderC.inl } @@ -38,7 +39,8 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - idlflags += -Wb,export_macro=SENDER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=SENDER_SVNT_Export \ -Wb,export_include=Sender_svnt_export.h dynamicflags = SENDER_SVNT_BUILD_DLL @@ -55,13 +57,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { SenderS.cpp Sender_svnt.cpp } - + Header_Files { SenderEC.h SenderS.h Sender_svnt.h } - + Inline_Files { SenderEC.inl SenderS.inl @@ -77,7 +79,8 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - idlflags += -Wb,export_macro=SENDER_EXEC_Export \ + idlflags += -Sc \ + -Wb,export_macro=SENDER_EXEC_Export \ -Wb,export_include=Sender_exec_export.h dynamicflags = SENDER_EXEC_BUILD_DLL @@ -87,7 +90,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { Source_Files { Sender_exec.cpp } - + Header_Files { Sender_exec.h } @@ -105,10 +108,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype { Source_Files { starter.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp index 0edc7faf471..7c647ef01dd 100644 --- a/CIAO/examples/Hello/Sender/starter.cpp +++ b/CIAO/examples/Hello/Sender/starter.cpp @@ -3,16 +3,17 @@ #include "SenderC.h" #include "ace/Get_Opt.h" -// IOR file of the Sender +//IOR file of the Sender const char * ior = 0; const char * message = 0; + int parse_args (int argc, char *argv[]) { ACE_Get_Opt get_opts (argc, argv, "k:m:"); int c = 0; - + while ((c = get_opts ()) != -1) { switch (c) @@ -41,7 +42,7 @@ parse_args (int argc, char *argv[]) { ior = "file://Sender.ior"; } - + return 0; } @@ -72,7 +73,7 @@ main (int argc, char *argv[]) if (CORBA::is_nil (sender.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire Sender's objref\n"), -1); } diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl index a790fef1be0..a790fef1be0 100755..100644 --- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl +++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp new file mode 100644 index 00000000000..7b382ef4720 --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp @@ -0,0 +1,322 @@ +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <label>Hello-DeploymentPlan</label> + <UUID>Hello_Plan_UUID_0001</UUID> + <!-- Could be ZERO --> + <realizes> + <label>BasicSP-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType><!-- @@ What does here? --></specificType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:Hello/ReadMessage:1.0</specificType> + <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="Hello-Sender-mdd"> + <name>Hello-Sender-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Sender_exec</artifact> + <artifact>Hello-Sender_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + <implementation id="Hello-Receiver-mdd"> + <name>Hello-Receiver-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Receiver_exec</artifact> + <artifact>Hello-Receiver_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + + <instance id="Hello-Sender-idd"> + <name>Hello-Sender-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a test message passed in through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Sender-idd-02"> + <name>Hello-Sender-idd-02</name> + <node>ReceiverNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_02.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a another message through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Receiver-idd"> + <name>Hello-Receiver-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Receiver-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + + + + + <connection> + <name>hello_event_ec_publisher_connection</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + + + <connection> + <name>hello_event_ec_publisher_connection_02</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd-02</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + <connection> + <name>hello_event_ec_consumer_connection</name> + + <!-- The position of the below "deployRequirement" element matters --> + <deployRequirement> + <resourceType>EventFilter</resourceType> + <name>my_filter_02</name> + <property> + <name>EventFilter</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>my_filter_02</string> + </value> + </value> + </property> + </deployRequirement> + + <internalEndpoint> + <portName>click_in</portName> + <kind>EventConsumer</kind> + <instance>Hello-Receiver-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + <!-- @@ Runtime library name must match exactly in "location" tag --> + <artifact id="Hello-Sender_exec"> + <name>Sender_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Sender_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createSenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Sender_svnt"> + <name>Sender_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Sender_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_exec"> + <name>Receiver_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Receiver_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_svnt"> + <name>Receiver_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Receiver_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOEvents</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ciao-events-example-with-filters.ced</string> + </value> + </value> + </infoProperty> +</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp new file mode 100644 index 00000000000..beb8af87f0d --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp @@ -0,0 +1,322 @@ +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <label>Hello-DeploymentPlan</label> + <UUID>Hello_Plan_UUID_0001</UUID> + <!-- Could be ZERO --> + <realizes> + <label>BasicSP-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType><!-- @@ What does here? --></specificType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:Hello/ReadMessage:1.0</specificType> + <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="Hello-Sender-mdd"> + <name>Hello-Sender-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Sender_exec</artifact> + <artifact>Hello-Sender_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + <implementation id="Hello-Receiver-mdd"> + <name>Hello-Receiver-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Receiver_exec</artifact> + <artifact>Hello-Receiver_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + + <instance id="Hello-Sender-idd"> + <name>Hello-Sender-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a test message passed in through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Sender-idd-02"> + <name>Hello-Sender-idd-02</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_02.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a another message through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Receiver-idd"> + <name>Hello-Receiver-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Receiver-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + + + + + <connection> + <name>hello_event_ec_publisher_connection</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + + + <connection> + <name>hello_event_ec_publisher_connection_02</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd-02</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + <connection> + <name>hello_event_ec_consumer_connection</name> + + <!-- The position of the below "deployRequirement" element matters --> + <deployRequirement> + <resourceType>EventFilter</resourceType> + <name>my_filter_03</name> + <property> + <name>EventFilter</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>my_filter_03</string> + </value> + </value> + </property> + </deployRequirement> + + <internalEndpoint> + <portName>click_in</portName> + <kind>EventConsumer</kind> + <instance>Hello-Receiver-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + <!-- @@ Runtime library name must match exactly in "location" tag --> + <artifact id="Hello-Sender_exec"> + <name>Sender_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Sender_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createSenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Sender_svnt"> + <name>Sender_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Sender_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_exec"> + <name>Receiver_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Receiver_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_svnt"> + <name>Receiver_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Receiver_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOEvents</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ciao-events-example-with-filters.ced</string> + </value> + </value> + </infoProperty> +</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp new file mode 100644 index 00000000000..f01b77dcaac --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp @@ -0,0 +1,322 @@ +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <label>Hello-DeploymentPlan</label> + <UUID>Hello_Plan_UUID_0001</UUID> + <!-- Could be ZERO --> + <realizes> + <label>BasicSP-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType><!-- @@ What does here? --></specificType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:Hello/ReadMessage:1.0</specificType> + <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="Hello-Sender-mdd"> + <name>Hello-Sender-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Sender_exec</artifact> + <artifact>Hello-Sender_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + <implementation id="Hello-Receiver-mdd"> + <name>Hello-Receiver-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Receiver_exec</artifact> + <artifact>Hello-Receiver_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + + <instance id="Hello-Sender-idd"> + <name>Hello-Sender-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a test message passed in through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Sender-idd-02"> + <name>Hello-Sender-idd-02</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_02.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a another message through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Receiver-idd"> + <name>Hello-Receiver-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Receiver-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + + + + + <connection> + <name>hello_event_ec_publisher_connection</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + + + <connection> + <name>hello_event_ec_publisher_connection_02</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd-02</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + <connection> + <name>hello_event_ec_consumer_connection</name> + + <!-- The position of the below "deployRequirement" element matters --> + <deployRequirement> + <resourceType>EventFilter</resourceType> + <name>my_filter_04</name> + <property> + <name>EventFilter</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>my_filter_04</string> + </value> + </value> + </property> + </deployRequirement> + + <internalEndpoint> + <portName>click_in</portName> + <kind>EventConsumer</kind> + <instance>Hello-Receiver-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + <!-- @@ Runtime library name must match exactly in "location" tag --> + <artifact id="Hello-Sender_exec"> + <name>Sender_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Sender_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createSenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Sender_svnt"> + <name>Sender_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Sender_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_exec"> + <name>Receiver_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Receiver_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_svnt"> + <name>Receiver_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Receiver_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOEvents</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ciao-events-example-with-filters.ced</string> + </value> + </value> + </infoProperty> +</Deployment:deploymentPlan> diff --git a/CIAO/examples/Null_Component/Null_Component.idl b/CIAO/examples/Null_Component/Null_Component.idl index 26df429a13b..086e3ac23d4 100644 --- a/CIAO/examples/Null_Component/Null_Component.idl +++ b/CIAO/examples/Null_Component/Null_Component.idl @@ -2,8 +2,6 @@ * @file Null_Component.idl * * @author Abdul Sowayan <abdullah.sowayan@lmco.com> - * - * $Id$ */ #ifndef NULL_COMPONENT_IDL diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc index b639ceb0828..087c7275063 100644 --- a/CIAO/examples/Null_Component/Null_Component.mpc +++ b/CIAO/examples/Null_Component/Null_Component.mpc @@ -5,10 +5,7 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc { after += Null_Interface_stub sharedname = Null_Component_stub libs += Null_Interface_stub - idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \ - -Wb,stub_export_include=Null_Component_stub_export.h \ - -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Null_Component_svnt_export.h + idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export -Wb,stub_export_include=Null_Component_stub_export.h -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export -Wb,skel_export_include=Null_Component_svnt_export.h dynamicflags = NULL_COMPONENT_STUB_BUILD_DLL IDL_Files { @@ -21,14 +18,11 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc { } project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc { - after += Null_Interface_skel Null_Interface_Null_Component_stub + after += Null_Interface_svnt Null_Interface_Null_Component_stub sharedname = Null_Component_svnt - libs += Null_Component_stub \ - Null_Interface_stub \ - Null_Interface_skel + libs += Null_Component_stub Null_Interface_stub Null_Interface_svnt - idlflags += -Wb,export_macro=NULL_COMPONENT_SVNT_Export \ - -Wb,export_include=Null_Component_svnt_export.h + idlflags += -Wb,export_macro=NULL_COMPONENT_SVNT_Export -Wb,export_include=Null_Component_svnt_export.h dynamicflags = NULL_COMPONENT_SVNT_BUILD_DLL CIDL_Files { @@ -50,13 +44,9 @@ project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc { project(Null_Interface_Null_Component_exec) : ciao_component_dnc { after += Null_Interface_Null_Component_svnt sharedname = Null_Component_exec - libs += Null_Component_stub \ - Null_Component_svnt \ - Null_Interface_stub \ - Null_Interface_skel + libs += Null_Component_stub Null_Component_svnt Null_Interface_stub Null_Interface_svnt - idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export \ - -Wb,export_include=Null_Component_exec_export.h + idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export -Wb,export_include=Null_Component_exec_export.h dynamicflags = NULL_COMPONENT_EXEC_BUILD_DLL IDL_Files { diff --git a/CIAO/examples/Null_Component/Null_Interface.idl b/CIAO/examples/Null_Component/Null_Interface.idl index ed841b2a921..98f539d6034 100644 --- a/CIAO/examples/Null_Component/Null_Interface.idl +++ b/CIAO/examples/Null_Component/Null_Interface.idl @@ -2,8 +2,6 @@ * @file Null_Interface.idl * * @author Abdul Sowayan <abdullah.sowayan@lmco.com> - * - * $Id$ */ #ifndef NULL_INTERFACE_IDL @@ -11,8 +9,8 @@ /** * @interface Null_Interface - * - * @brief + * + * @brief */ interface Null_Interface { diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc index 9e66ae6ea65..e5eb5b31a1f 100644 --- a/CIAO/examples/Null_Component/Null_Interface.mpc +++ b/CIAO/examples/Null_Component/Null_Interface.mpc @@ -1,14 +1,10 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Null_Interface" -project(Null_Interface_stub): taolib_with_idl { - +project(Null_Interface_stub): ciao_client_dnc { + sharedname = Null_Interface_stub - idlflags += -St \ - -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \ - -Wb,stub_export_include=Null_Interface_stub_export.h \ - -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \ - -Wb,skel_export_include=Null_Interface_skel_export.h + idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export -Wb,stub_export_include=Null_Interface_stub_export.h -Wb,skel_export_macro=NULL_INTERFACE_SVNT_Export -Wb,skel_export_include=Null_Interface_svnt_export.h dynamicflags = NULL_INTERFACE_STUB_BUILD_DLL IDL_Files { @@ -20,17 +16,13 @@ project(Null_Interface_stub): taolib_with_idl { } } -project(Null_Interface_skel) : portableserver { +project(Null_Interface_svnt) : ciao_servant_dnc { after += Null_Interface_stub - sharedname = Null_Interface_skel - libs += Null_Interface_stub - - idlflags += -St \ - -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \ - -Wb,stub_export_include=Null_Interface_stub_export.h \ - -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \ - -Wb,skel_export_include=Null_Interface_skel_export.h - dynamicflags = NULL_INTERFACE_SKEL_BUILD_DLL + sharedname = Null_Interface_svnt + libs += Null_Interface_stub + + idlflags += -Wb,export_macro=NULL_INTERFACE_SVNT_Export -Wb,export_include=Null_Interface_svnt_export.h + dynamicflags = NULL_INTERFACE_SVNT_BUILD_DLL IDL_Files { Null_Interface.idl diff --git a/CIAO/examples/Null_Component/Null_Interface_skel_export.h b/CIAO/examples/Null_Component/Null_Interface_skel_export.h deleted file mode 100644 index 239c5cf3f6a..00000000000 --- a/CIAO/examples/Null_Component/Null_Interface_skel_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT -// ------------------------------ -#ifndef NULL_INTERFACE_SKEL_EXPORT_H -#define NULL_INTERFACE_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SKEL_HAS_DLL) -# define NULL_INTERFACE_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SKEL_HAS_DLL */ - -#if !defined (NULL_INTERFACE_SKEL_HAS_DLL) -# define NULL_INTERFACE_SKEL_HAS_DLL 1 -#endif /* ! NULL_INTERFACE_SKEL_HAS_DLL */ - -#if defined (NULL_INTERFACE_SKEL_HAS_DLL) && (NULL_INTERFACE_SKEL_HAS_DLL == 1) -# if defined (NULL_INTERFACE_SKEL_BUILD_DLL) -# define NULL_INTERFACE_SKEL_Export ACE_Proper_Export_Flag -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NULL_INTERFACE_SKEL_BUILD_DLL */ -# define NULL_INTERFACE_SKEL_Export ACE_Proper_Import_Flag -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NULL_INTERFACE_SKEL_BUILD_DLL */ -#else /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */ -# define NULL_INTERFACE_SKEL_Export -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */ - -// Set NULL_INTERFACE_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NULL_INTERFACE_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define NULL_INTERFACE_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NULL_INTERFACE_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NULL_INTERFACE_SKEL_NTRACE */ - -#if (NULL_INTERFACE_SKEL_NTRACE == 1) -# define NULL_INTERFACE_SKEL_TRACE(X) -#else /* (NULL_INTERFACE_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NULL_INTERFACE_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NULL_INTERFACE_SKEL_NTRACE == 1) */ - -#endif /* NULL_INTERFACE_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/examples/Null_Component/Null_Interface_svnt_export.h b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h new file mode 100644 index 00000000000..9d4455adcec --- /dev/null +++ b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT +// ------------------------------ +#ifndef NULL_INTERFACE_SVNT_EXPORT_H +#define NULL_INTERFACE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SVNT_HAS_DLL) +# define NULL_INTERFACE_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SVNT_HAS_DLL */ + +#if !defined (NULL_INTERFACE_SVNT_HAS_DLL) +# define NULL_INTERFACE_SVNT_HAS_DLL 1 +#endif /* ! NULL_INTERFACE_SVNT_HAS_DLL */ + +#if defined (NULL_INTERFACE_SVNT_HAS_DLL) && (NULL_INTERFACE_SVNT_HAS_DLL == 1) +# if defined (NULL_INTERFACE_SVNT_BUILD_DLL) +# define NULL_INTERFACE_SVNT_Export ACE_Proper_Export_Flag +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* NULL_INTERFACE_SVNT_BUILD_DLL */ +# define NULL_INTERFACE_SVNT_Export ACE_Proper_Import_Flag +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* NULL_INTERFACE_SVNT_BUILD_DLL */ +#else /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */ +# define NULL_INTERFACE_SVNT_Export +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */ + +// Set NULL_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (NULL_INTERFACE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define NULL_INTERFACE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define NULL_INTERFACE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !NULL_INTERFACE_SVNT_NTRACE */ + +#if (NULL_INTERFACE_SVNT_NTRACE == 1) +# define NULL_INTERFACE_SVNT_TRACE(X) +#else /* (NULL_INTERFACE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define NULL_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (NULL_INTERFACE_SVNT_NTRACE == 1) */ + +#endif /* NULL_INTERFACE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc index 90d141854e4..be737fa37de 100644 --- a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc +++ b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc @@ -6,7 +6,7 @@ project(StaticDAnCEApp *): ciao_static_dnc_app, iortable { exename = StaticDAnCEApp libs += Null_Interface_stub - libs += Null_Interface_skel + libs += Null_Interface_svnt libs += Null_Component_stub libs += Null_Component_svnt libs += Null_Component_exec diff --git a/CIAO/examples/Null_Component/descriptors/Deployment.xsd b/CIAO/examples/Null_Component/descriptors/Deployment.xsd deleted file mode 100644 index fd4ffe5bc7d..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Deployment.xsd +++ /dev/null @@ -1,29 +0,0 @@ -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd" - xmlns:Deployment="http://www.omg.org/Deployment" - targetNamespace="http://www.omg.org/Deployment"> - - <xsd:include schemaLocation="Basic_Deployment_Data.xsd"/> - <xsd:include schemaLocation="cpd.xsd"/> - <xsd:include schemaLocation="ccd.xsd"/> - <xsd:include schemaLocation="cdd.xsd"/> - <xsd:include schemaLocation="cdp.xsd"/> - <xsd:include schemaLocation="cid.xsd"/> - <xsd:include schemaLocation="iad.xsd"/> - <xsd:include schemaLocation="pcd.xsd"/> - <xsd:include schemaLocation="toplevel.xsd"/> - - -<!-- Top-level elements. --> - - <xsd:element name="domain" type="Deployment:Domain"/> - <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/> - <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" /> - <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/> - <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/> - <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/> - -</xsd:schema> diff --git a/CIAO/examples/Null_Component/descriptors/Domain.cdd b/CIAO/examples/Null_Component/descriptors/Domain.cdd deleted file mode 100644 index a7fd42463fe..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Domain.cdd +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:Domain xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_Null_Component_Targets_Domain</UUID> - - <node> - <name>NodeA</name> - </node> - -</Deployment:Domain> diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/CIAO/examples/Null_Component/descriptors/NodeMap.dat deleted file mode 100644 index 556433b464e..00000000000 --- a/CIAO/examples/Null_Component/descriptors/NodeMap.dat +++ /dev/null @@ -1,3 +0,0 @@ -NodeA corbaloc:iiop:localhost:10000/NodeManager - - diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid b/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid deleted file mode 100644 index 6d19c2a050c..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_84CDF595-E42C-43D5-B3FD-C6C6524E068C</UUID> - - <assemblyImpl> - <instance xmi:id="_B4BF176E-0386-49EE-B84F-3F2781F3C7BE"> - <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component</name> - <package href="Null_Component_Package.cpd"/> - </instance> - </assemblyImpl> - -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd deleted file mode 100644 index 0e4b281531a..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_AAC92636-57DD-4503-A616-CF75AD417E99</UUID> - - <implementation> - <name>Null_Assembly</name> - <referencedImplementation href="Null_Assembly.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd b/CIAO/examples/Null_Component/descriptors/Null_Component.ccd deleted file mode 100644 index 1553f012e70..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_FF1F1E30-2916-4A65-96C3-EF29124400A5</UUID> - - <port> - <name>null_facet</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid b/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid deleted file mode 100644 index 93393fca1c7..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_7B0A12C6-0490-4449-A8B3-9BF3CCDF58FA</UUID> - - <implements href="Null_Component.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>Null_Component_stub</name> - <referencedArtifact href="Null_Component_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Null_Component_svnt</name> - <referencedArtifact href="Null_Component_svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Null_Component_exec</name> - <referencedArtifact href="Null_Component_exec.iad"/> - </primaryArtifact> - </monolithicImpl> - - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Null_Component.ior</string> - </value> - </value> - </configProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd deleted file mode 100644 index d9f06a4367f..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_ABA51225-4A40-4B07-B4EB-467AEEA5BFEE</UUID> - - <realizes href="Null_Component.ccd"/> - - <implementation> - <name>Null_ComponentMonolithicImpl</name> - <referencedImplementation href="Null_ComponentMonolithicImpl.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad deleted file mode 100644 index 9a456b15b60..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_6BECFE2C-84AB-4B4A-B14C-DB8048563368</UUID> - - <location>Null_Component_exec</location> - - <dependsOn> - <name>Null_Component_svnt</name> - <referencedArtifact href="Null_Component_svnt.iad"/> - </dependsOn> - - <dependsOn> - <name>Null_Component_stub</name> - <referencedArtifact href="Null_Component_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad deleted file mode 100644 index d74f84940fb..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_5249354B-25F0-459E-BC02-5EED8A0122A7</UUID> - - <location>Null_Component_stub</location> - -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad deleted file mode 100644 index c6283a3a52c..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <UUID>_EBFD46AF-1AF1-4646-891C-5FDE9657AD83</UUID> - - <location>Null_Component_svnt</location> - - <dependsOn> - <name>Null_Component_stub</name> - <referencedArtifact href="Null_Component_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd b/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd deleted file mode 100644 index 0b09dd0c51e..00000000000 --- a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:PackageConfiguration xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <basePackage href="Null_Assembly_Package.cpd"/> - -</Deployment:PackageConfiguration> diff --git a/CIAO/examples/Null_Component/descriptors/Plan.cdp b/CIAO/examples/Null_Component/descriptors/Plan.cdp deleted file mode 100644 index 903fd30bc44..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Plan.cdp +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:deploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <implementation id="Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl"> - <name>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</name> - <source/> - <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</artifact> - <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</artifact> - <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</artifact> - </implementation> - - <instance id="Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component"> - <name>Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component</name> - <node>NodeA</node> - <source/> - <implementation>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Null_Component.ior</string> - </value> - </value> - </configProperty> - </instance> - - <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub"> - <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</name> - <source/> - <node/> - <location>Null_Component_stub</location> - </artifact> - - <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt"> - <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</name> - <source/> - <node/> - <location>Null_Component_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec"> - <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</name> - <source/> - <node/> - <location>Null_Component_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Impl</string> - </value> - </value> - </execParameter> - </artifact> - -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Null_Component/descriptors/XMI.xsd b/CIAO/examples/Null_Component/descriptors/XMI.xsd deleted file mode 100644 index f4adac91934..00000000000 --- a/CIAO/examples/Null_Component/descriptors/XMI.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'> - <xsd:attribute name="id" type="xsd:ID" /> - <xsd:attributeGroup name="IdentityAttribs"> - <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="LinkAttribs"> - <xsd:attribute name="href" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="ObjectAttribs"> - <xsd:attributeGroup ref="xmi:IdentityAttribs" /> - <xsd:attributeGroup ref="xmi:LinkAttribs" /> - <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> - </xsd:attributeGroup> - <xsd:complexType name="Extension"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="lax" /> - </xsd:choice> - <xsd:attribute ref="xmi:id" /> - <xsd:attributeGroup ref="xmi:ObjectAttribs" /> - <xsd:attribute name="extender" type="xsd:string" use="optional" /> - <xsd:attribute name="extenderID" type="xsd:string" use="optional" /> - </xsd:complexType> - <xsd:element name="Extension" type="xmi:Extension" /> - <xsd:complexType name="Any"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="skip" /> - </xsd:choice> - <xsd:anyAttribute processContents="skip" /> - </xsd:complexType> -</xsd:schema> diff --git a/CIAO/examples/Null_Component/descriptors/package.tpd b/CIAO/examples/Null_Component/descriptors/package.tpd deleted file mode 100644 index b57255f3618..00000000000 --- a/CIAO/examples/Null_Component/descriptors/package.tpd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:TopLevelPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <package href="PackageConfiguration.pcd"/> - -</Deployment:TopLevelPackageDescription> diff --git a/CIAO/examples/Null_Component/model/Null_Component.mga b/CIAO/examples/Null_Component/model/Null_Component.mga Binary files differdeleted file mode 100644 index 6fde9b4175a..00000000000 --- a/CIAO/examples/Null_Component/model/Null_Component.mga +++ /dev/null diff --git a/CIAO/examples/Null_Component/model/Null_Component.xme b/CIAO/examples/Null_Component/model/Null_Component.xme deleted file mode 100644 index 3893827cb76..00000000000 --- a/CIAO/examples/Null_Component/model/Null_Component.xme +++ /dev/null @@ -1,843 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project SYSTEM "mga.dtd"> - -<project guid="{CAA6F237-1527-4481-ADB7-764DB01170E8}" cdate="Tue Oct 10 12:57:50 2006" mdate="Tue Oct 10 12:57:50 2006" version="" metaguid="{1B0D2E44-51AC-4A14-BF57-FADB2F5F9C86}" metaversion="" metaname="PICML"> - <name>Null_Component</name> - <comment></comment> - <author></author> - <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x2" kind="RootFolder"> - <name>Null_Component</name> - <folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x2" kind="InterfaceDefinitions"> - <name>InterfaceDefinitions</name> - <model id="id-0065-00000001" kind="File" relid="0x1" childrelidcntr="0x1"> - <name>Null_Interface</name> - <attribute kind="PrefixTag" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000002" kind="Object" role="Object" relid="0x1" childrelidcntr="0x1"> - <name>Null_Interface</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="PrefixTag" status="meta"> - <value></value> - </attribute> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="abstract" status="meta"> - <value>false</value> - </attribute> - <attribute kind="local" status="meta"> - <value>false</value> - </attribute> - <model id="id-0065-00000003" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x0"> - <name>null_operation</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - </model> - </model> - </model> - <model id="id-0065-00000004" kind="File" relid="0x2" childrelidcntr="0x4"> - <name>Null_Component</name> - <attribute kind="PrefixTag" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000005" kind="Component" role="Component" relid="0x2" childrelidcntr="0x1"> - <name>Null_Component</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <reference id="id-0067-00000002" kind="ProvidedRequestPort" role="ProvidedRequestPort" relid="0x1" referred="id-0065-00000002"> - <name>null_facet</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="exclusiveProvider" status="meta"> - <value>false</value> - </attribute> - <attribute kind="exclusiveUser" status="meta"> - <value>false</value> - </attribute> - <attribute kind="optional" status="meta"> - <value>false</value> - </attribute> - </reference> - </model> - <model id="id-0065-00000006" kind="ComponentFactory" role="ComponentFactory" relid="0x3" childrelidcntr="0x0"> - <name>Null_Component_Home</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>793,493</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - </model> - <reference id="id-0067-00000001" kind="FileRef" role="FileRef" relid="0x1" referred="id-0065-00000001"> - <name>FileRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>243,143</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000001" kind="ManagesComponent" role="ManagesComponent" relid="0x4"> - <name>ManagesComponent</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ws</value> - </regnode> - <connpoint role="dst" target="id-0065-00000005"/> - <connpoint role="src" target="id-0065-00000006"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000003" relid="0x1" childrelidcntr="0xb" kind="PredefinedTypes"> - <name>PredefinedTypes</name> - <atom id="id-0066-00000001" kind="TypeKind" relid="0xb"> - <name>TypeKind</name> - </atom> - <atom id="id-0066-00000002" kind="TypeEncoding" relid="0xa"> - <name>TypeEncoding</name> - </atom> - <atom id="id-0066-00000003" kind="String" relid="0x9"> - <name>String</name> - </atom> - <atom id="id-0066-00000004" kind="Boolean" relid="0x8"> - <name>Boolean</name> - </atom> - <atom id="id-0066-00000005" kind="ShortInteger" relid="0x7"> - <name>ShortInteger</name> - </atom> - <atom id="id-0066-00000006" kind="RealNumber" relid="0x6"> - <name>RealNumber</name> - </atom> - <atom id="id-0066-00000007" kind="LongInteger" relid="0x5"> - <name>LongInteger</name> - </atom> - <atom id="id-0066-00000008" kind="GenericValueObject" relid="0x4"> - <name>GenericValueObject</name> - </atom> - <atom id="id-0066-00000009" kind="GenericValue" relid="0x3"> - <name>GenericValue</name> - </atom> - <atom id="id-0066-0000000a" kind="GenericObject" relid="0x2"> - <name>GenericObject</name> - </atom> - <atom id="id-0066-0000000b" kind="Byte" relid="0x1"> - <name>Byte</name> - </atom> - </folder> - <folder id="id-006a-00000004" relid="0x3" childrelidcntr="0x3" kind="ComponentImplementations"> - <name>ComponentImplementations</name> - <model id="id-0065-00000007" kind="ComponentImplementationContainer" relid="0x1" childrelidcntr="0xb"> - <name>Null_ComponentImplementation</name> - <model id="id-0065-00000008" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2"> - <name>ComponentIOR</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>282,168</value> - </regnode> - </regnode> - </regnode> - <attribute kind="DataValue"> - <value>Null_Component.ior</value> - </attribute> - <reference id="id-0067-00000003" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003"> - <name>String</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - <atom id="id-0066-0000000c" kind="MonolithicImplementation" role="MonolithicImplementation" relid="0x1"> - <name>Null_ComponentMonolithicImpl</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>125,68</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-00000004" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000005"> - <name>Null_ComponentRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>910,568</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-00000008" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x3" referred="id-0066-0000000d"> - <name>Null_Component_stubRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>439,268</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-00000009" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x4" referred="id-0066-0000000e"> - <name>Null_Component_svntRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>596,368</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-0000000a" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x5" referred="id-0066-0000000f"> - <name>Null_Component_execRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>753,468</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000002" kind="ConfigProperty" role="ConfigProperty" relid="0xa"> - <name>ConfigProperty</name> - <connpoint role="dst" target="id-0065-00000008"/> - <connpoint role="src" target="id-0066-0000000c"/> - </connection> - <connection id="id-0068-00000003" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x6"> - <name>MonolithprimaryArtifact</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-00000008"/> - </connection> - <connection id="id-0068-00000004" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x7"> - <name>MonolithprimaryArtifact</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-00000009"/> - </connection> - <connection id="id-0068-00000005" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x8"> - <name>MonolithprimaryArtifact</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-0000000a"/> - </connection> - <connection id="id-0068-00000006" kind="Implements" role="Implements" relid="0xb"> - <name>Implements</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-00000004"/> - </connection> - </model> - <model id="id-0065-00000015" kind="ComponentImplementationContainer" relid="0x3" childrelidcntr="0x3"> - <name>Null_Assembly_Container</name> - <model id="id-0065-00000018" kind="ComponentAssembly" role="ComponentAssembly" relid="0x3" childrelidcntr="0x1"> - <name>Null_Assembly</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>212,114</value> - </regnode> - </regnode> - <regnode name="QoSModelAspect" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>212,114</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000019" kind="Component" role="Component" derivedfrom="id-0065-00000005" isinstance="yes" isprimary="yes" relid="0x1" childrelidcntr="0x0"> - <name>Null_Component</name> - <regnode name="PartRegs"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>342,130</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <reference id="id-0067-00000019" kind="ProvidedRequestPort" role="ProvidedRequestPort" derivedfrom="id-0067-00000002" isinstance="yes" isprimary="no" referred="id-0065-00000002" isbound="yes"> - <name>null_facet</name> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="exclusiveProvider" status="meta"> - <value>false</value> - </attribute> - <attribute kind="exclusiveUser" status="meta"> - <value>false</value> - </attribute> - <attribute kind="optional" status="meta"> - <value>false</value> - </attribute> - </reference> - </model> - </model> - </model> - </folder> - <folder id="id-006a-00000005" relid="0x4" childrelidcntr="0x0" kind="ImplementationArtifacts"> - <name>ImplementationArtifacts</name> - <model id="id-0065-00000009" kind="ArtifactContainer" relid="0x1" childrelidcntr="0xa"> - <name>Null_ComponentArtifacts</name> - <model id="id-0065-0000000a" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2"> - <name>entryPoint</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>334,200</value> - </regnode> - </regnode> - </regnode> - <attribute kind="DataValue"> - <value>createNull_ComponentHome_Servant</value> - </attribute> - <reference id="id-0067-00000005" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003"> - <name>String</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - <model id="id-0065-0000000b" kind="Property" role="Property" relid="0x4" childrelidcntr="0x2"> - <name>entryPoint</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>700,432</value> - </regnode> - </regnode> - </regnode> - <attribute kind="DataValue"> - <value>createNull_ComponentHome_Impl</value> - </attribute> - <reference id="id-0067-00000006" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003"> - <name>String</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - <atom id="id-0066-0000000d" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x1"> - <name>Null_Component_stub</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>151,84</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="configuration" status="meta"> - <value></value> - </attribute> - <attribute kind="label"> - <value></value> - </attribute> - <attribute kind="location"> - <value>Null_Component_stub</value> - </attribute> - </atom> - <atom id="id-0066-0000000e" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x3"> - <name>Null_Component_svnt</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>517,316</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="configuration" status="meta"> - <value></value> - </attribute> - <attribute kind="label"> - <value></value> - </attribute> - <attribute kind="location"> - <value>Null_Component_svnt</value> - </attribute> - </atom> - <atom id="id-0066-0000000f" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x5"> - <name>Null_Component_exec</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>883,548</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="configuration" status="meta"> - <value></value> - </attribute> - <attribute kind="label"> - <value></value> - </attribute> - <attribute kind="location"> - <value>Null_Component_exec</value> - </attribute> - </atom> - <connection id="id-0068-00000007" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x7"> - <name>ArtifactExecParameter</name> - <connpoint role="dst" target="id-0065-0000000a"/> - <connpoint role="src" target="id-0066-0000000e"/> - </connection> - <connection id="id-0068-00000008" kind="ArtifactDependency" role="ArtifactDependency" relid="0x8"> - <name>ArtifactDependency</name> - <connpoint role="dst" target="id-0066-0000000d"/> - <connpoint role="src" target="id-0066-0000000e"/> - </connection> - <connection id="id-0068-00000009" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x8"> - <name>ArtifactExecParameter</name> - <connpoint role="dst" target="id-0065-0000000b"/> - <connpoint role="src" target="id-0066-0000000f"/> - </connection> - <connection id="id-0068-0000000a" kind="ArtifactDependency" role="ArtifactDependency" relid="0x9"> - <name>ArtifactDependency</name> - <connpoint role="dst" target="id-0066-0000000e"/> - <connpoint role="src" target="id-0066-0000000f"/> - </connection> - <connection id="id-0068-0000000b" kind="ArtifactDependency" role="ArtifactDependency" relid="0xa"> - <name>ArtifactDependency</name> - <connpoint role="dst" target="id-0066-0000000d"/> - <connpoint role="src" target="id-0066-0000000f"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x0" kind="ComponentTypes"> - <name>ComponentTypes</name> - <model id="id-0065-0000000c" kind="ComponentContainer" relid="0x1" childrelidcntr="0x1"> - <name>Null_ComponentContainer</name> - <reference id="id-0067-00000007" kind="ComponentRef" role="ComponentRef" relid="0x1" referred="id-0065-00000005"> - <name>Null_ComponentRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - </folder> - <folder id="id-006a-00000007" relid="0x6" childrelidcntr="0x1" kind="PackageConfigurations"> - <name>PackageConfigurations</name> - <model id="id-0065-00000010" kind="PackageConfigurationContainer" relid="0x1" childrelidcntr="0x6"> - <name>Default</name> - <atom id="id-0066-00000012" kind="PackageConfiguration" role="PackageConfiguration" relid="0x2"> - <name>PackageConfiguration</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>373,149</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-0000001c" kind="ComponentPackageReference" role="ComponentPackageReference" relid="0x5" referred="id-0066-00000014"> - <name>Null_Assembly_Package</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>573,146</value> - </regnode> - </regnode> - </regnode> - <attribute kind="requiredName" status="meta"> - <value></value> - </attribute> - <attribute kind="requiredType" status="meta"> - <value></value> - </attribute> - <attribute kind="requiredUUID" status="meta"> - <value></value> - </attribute> - </reference> - <connection id="id-0068-00000016" kind="PackageConfReference" role="PackageConfReference" relid="0x6"> - <name>PackageConfReference</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ew</value> - </regnode> - <connpoint role="src" target="id-0066-00000012"/> - <connpoint role="dst" target="id-0067-0000001c"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000008" relid="0x7" childrelidcntr="0x2" kind="ComponentPackages"> - <name>ComponentPackages</name> - <model id="id-0065-0000000d" kind="PackageContainer" relid="0x1" childrelidcntr="0xa"> - <name>Null_Component_Package</name> - <atom id="id-0066-00000010" kind="ComponentPackage" role="ComponentPackage" relid="0x1"> - <name>Null_Component_Package</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>366,163</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-00000010" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x5" referred="id-0066-0000000c"> - <name>Null_ComponentMonolithicImpl</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>130,158</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-0000001a" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000019"> - <name>Null_Component</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>545,137</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-0000000e" kind="Implementation" role="Implementation" relid="0x6"> - <name>Implementation</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>We</value> - </regnode> - <connpoint role="src" target="id-0066-00000010"/> - <connpoint role="dst" target="id-0067-00000010"/> - </connection> - <connection id="id-0068-00000014" kind="PackageInterface" role="PackageInterface" relid="0xa"> - <name>PackageInterface</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ew</value> - </regnode> - <connpoint role="src" target="id-0066-00000010"/> - <connpoint role="dst" target="id-0067-0000001a"/> - </connection> - </model> - <model id="id-0065-0000001a" kind="PackageContainer" relid="0x2" childrelidcntr="0x3"> - <name>Null_Assembly_Package</name> - <atom id="id-0066-00000014" kind="ComponentPackage" role="ComponentPackage" relid="0x1"> - <name>Null_Assembly_Package</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>282,135</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-0000001b" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x2" referred="id-0065-00000018"> - <name>Null_Assembly</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>502,110</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000015" kind="Implementation" role="Implementation" relid="0x3"> - <name>Implementation</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ew</value> - </regnode> - <connpoint role="src" target="id-0066-00000014"/> - <connpoint role="dst" target="id-0067-0000001b"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000009" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans"> - <name>DeploymentPlans</name> - <model id="id-0065-00000014" kind="DeploymentPlan" relid="0x1" childrelidcntr="0x7"> - <name>Plan</name> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <reference id="id-0067-00000013" kind="NodeReference" role="NodeReference" relid="0x2" referred="id-0065-00000013"> - <name>NodeA</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="NodeMapping" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>305,123</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-0000001d" kind="ComponentRef" role="ComponentRef" relid="0x7" referred="id-0065-00000019"> - <name>Null_Component</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="NodeMapping" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>475,102</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000013" kind="InstanceMapping" role="InstanceMapping" relid="0x4"> - <name>InstanceMapping</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>w</value> - </regnode> - <connpoint role="dst" target="id-0067-00000013"/> - <connpoint role="src" target="id-0069-00000001"/> - </connection> - <set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" relid="0x1" members="id-0067-0000001d"> - <name>CollocationGroup</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="NodeMapping" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>114,128</value> - </regnode> - </regnode> - </regnode> - </set> - </model> - </folder> - <folder id="id-006a-0000000a" relid="0x9" childrelidcntr="0x1" kind="Targets"> - <name>Targets</name> - <model id="id-0065-00000012" kind="Domain" relid="0x1" childrelidcntr="0x1"> - <name>Domain</name> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000013" kind="Node" role="Node" relid="0x1" childrelidcntr="0x0"> - <name>NodeA</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Target" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>198,170</value> - </regnode> - </regnode> - </regnode> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </model> - </model> - </folder> - <folder id="id-006a-0000000b" relid="0xa" childrelidcntr="0x1" kind="TopLevelPackages"> - <name>TopLevelPackages</name> - <model id="id-0065-00000011" kind="TopLevelPackageContainer" relid="0x1" childrelidcntr="0x3"> - <name>Default</name> - <atom id="id-0066-00000013" kind="TopLevelPackage" role="TopLevelPackage" relid="0x1"> - <name>TopLevelPackage</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>240,184</value> - </regnode> - </regnode> - </regnode> - </atom> - <reference id="id-0067-00000012" kind="PackageConfigurationReference" role="PackageConfigurationReference" relid="0x2" referred="id-0066-00000012"> - <name>PackageConfiguration</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>517,181</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000012" kind="package" role="package" relid="0x3"> - <name>package</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>w</value> - </regnode> - <connpoint role="src" target="id-0066-00000013"/> - <connpoint role="dst" target="id-0067-00000012"/> - </connection> - </model> - </folder> - <folder id="id-006a-0000000c" relid="0xb" childrelidcntr="0x0" kind="ComponentBuild"> - <name>ComponentBuild</name> - </folder> - </folder> -</project> diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h index df6a6eee581..e05ff6a138f 100644 --- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h +++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h @@ -10,7 +10,7 @@ #ifndef RECEIVER_EXEC_H #define RECEIVER_EXEC_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "ReceiverEC.h" #include "Receiver_exec_export.h" #include "tao/LocalObject.h" @@ -117,7 +117,7 @@ namespace CIDL_Receiver_Impl ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr createReceiverHome_Impl (void); } diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h index 75530bd25fc..f1cfaeba5e9 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec.h @@ -10,12 +10,12 @@ #ifndef SENDER_EXEC_H #define SENDER_EXEC_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "SenderEC.h" #include "Sender_exec_export.h" #include "tao/LocalObject.h" #include "ace/DLL.h" -#include "ciao/CCM_EventsC.h" +#include "ciao/CCM_EventC.h" namespace CIDL_Sender_Impl { diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h index 00b6db2e4b0..1d85384db1a 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h @@ -10,7 +10,7 @@ #ifndef SENDER_EXEC_1_H #define SENDER_EXEC_1_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "SenderEC.h" #include "Sender_exec_1_export.h" #include "tao/LocalObject.h" diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h index d12bd4594ee..97f49c9a96f 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h @@ -10,7 +10,7 @@ #ifndef SENDER_EXEC_2_H #define SENDER_EXEC_2_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "SenderEC.h" #include "Sender_exec_2_export.h" #include "tao/LocalObject.h" diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc index 40927889016..f090b1e8cf6 100644 --- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc +++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc @@ -1,12 +1,11 @@ // $Id$ -project (Multi_Threaded_client) : ciao_client_dnc, valuetype , strategies { +project (Multi_Threaded_client) : ciao_client_dnc, valuetype , strategies{ exename = client after += RoundTripClient_stub libs += RoundTripClient_stub Benchmark_stub libpaths += .. includes += ../RoundTripClient - avoids += ace_for_tao IDL_Files { } diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/CIAO/performance-tests/Protocols/Controller/Controller.mpc index b857bb7481b..ce70851188d 100644 --- a/CIAO/performance-tests/Protocols/Controller/Controller.mpc +++ b/CIAO/performance-tests/Protocols/Controller/Controller.mpc @@ -1,6 +1,6 @@ // $Id$ -project (perf*) : ciao_client_dnc, rtcorba { +project (perf*) : ciao_client_dnc, rtcorba, exceptions { avoids += ace_for_tao after += Protocols_Sender_stub Protocols_Receiver_stub includes += ../Sender diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl index ca2ed444513..b00e844cbe2 100644 --- a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl +++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl @@ -1,6 +1,5 @@ // $Id$ -#include <Components.idl> #include "../common/Protocols.idl" module Protocols diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc index a87f99d602f..1cbf85b801a 100644 --- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc +++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc @@ -1,17 +1,12 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p Protocols Receiver" -project(Protocols_Receiver_stub): ciao_client_dnc { +project(Protocols_Receiver_stub): ciao_client_dnc, exceptions { avoids += ace_for_tao libs += Protocols_stub after += Protocols_stub sharedname = Protocols_Receiver_stub - idlflags -= -GT - idlflags += -St \ - -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 + 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 { @@ -21,21 +16,14 @@ project(Protocols_Receiver_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - - Header_Files { - Receiver_stub_export.h - } } -project(Protocols_Receiver_svnt) : ciao_servant_dnc { +project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions { avoids += ace_for_tao - after += Protocols_skel Protocols_Receiver_stub + after += Protocols_svnt Protocols_Receiver_stub sharedname = Protocols_Receiver_svnt - libs += Protocols_Receiver_stub Protocols_stub Protocols_skel - idlflags -= -GT - idlflags += -SS -St \ - -Wb,export_macro=RECEIVER_SVNT_Export \ - -Wb,export_include=Receiver_svnt_export.h + libs += Protocols_Receiver_stub Protocols_stub Protocols_svnt + idlflags += -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h dynamicflags = RECEIVER_SVNT_BUILD_DLL CIDL_Files { @@ -51,18 +39,15 @@ project(Protocols_Receiver_svnt) : ciao_servant_dnc { ReceiverS.cpp Receiver_svnt.cpp } - - Header_Files { - Receiver_svnt_export.h - } } -project(Protocols_Receiver_exec) : ciao_component_dnc { +project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions { avoids += ace_for_tao after += Protocols_Receiver_svnt sharedname = Protocols_Receiver_exec - libs += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_skel + libs += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt + idlflags += -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h dynamicflags = RECEIVER_EXEC_BUILD_DLL IDL_Files { @@ -71,10 +56,6 @@ project(Protocols_Receiver_exec) : ciao_component_dnc { Source_Files { Receiver_exec.cpp } - - Header_Files { - Receiver_exec_export.h - } } diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.idl b/CIAO/performance-tests/Protocols/Sender/Sender.idl index 200eaa0350a..e76f0922215 100644 --- a/CIAO/performance-tests/Protocols/Sender/Sender.idl +++ b/CIAO/performance-tests/Protocols/Sender/Sender.idl @@ -1,6 +1,5 @@ // $Id$ -#include <Components.idl> #include "../common/Protocols.idl" module Protocols @@ -13,8 +12,8 @@ module Protocols THROUGHPUT, LATENCY }; - - void start (in unsigned long iterations, + + void start (in unsigned long iterations, in unsigned long invocation_rate, in boolean count_missed_end_deadlines, in boolean do_dump_history, diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc index 2f65f552b5b..9382dd63289 100644 --- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc +++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc @@ -1,17 +1,12 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p Protocols Sender" -project(Protocols_Sender_stub): ciao_client_dnc { +project(Protocols_Sender_stub): ciao_client_dnc, exceptions { avoids += ace_for_tao libs += Protocols_stub after += Protocols_stub sharedname = Protocols_Sender_stub - idlflags -= -GT - idlflags += -St \ - -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 + 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 { @@ -21,21 +16,14 @@ project(Protocols_Sender_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - - Header_Files { - Sender_stub_export.h - } } -project(Protocols_Sender_svnt) : ciao_servant_dnc { +project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions { avoids += ace_for_tao - after += Protocols_skel Protocols_Sender_stub + after += Protocols_svnt Protocols_Sender_stub sharedname = Protocols_Sender_svnt - libs += Protocols_Sender_stub Protocols_stub Protocols_skel - idlflags -= -GT - idlflags += -SS -St \ - -Wb,export_macro=SENDER_SVNT_Export \ - -Wb,export_include=Sender_svnt_export.h + libs += Protocols_Sender_stub Protocols_stub Protocols_svnt + idlflags += -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h dynamicflags = SENDER_SVNT_BUILD_DLL CIDL_Files { @@ -51,19 +39,16 @@ project(Protocols_Sender_svnt) : ciao_servant_dnc { SenderS.cpp Sender_svnt.cpp } - - Header_Files { - Sender_svnt_export.h - } } -project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba { +project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions { avoids += ace_for_tao after += Protocols_Sender_svnt sharedname = Protocols_Sender_exec - libs += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_skel - includes += $(TAO_ROOT)/tests/RTCORBA/Diffserv + libs += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt + includes += ../../../../tests/RTCORBA/Diffserv + idlflags += -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h dynamicflags = SENDER_EXEC_BUILD_DLL IDL_Files { @@ -72,10 +57,6 @@ project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba { Source_Files { Sender_exec.cpp } - - Header_Files { - Sender_exec_export.h - } } diff --git a/CIAO/performance-tests/Protocols/common/Protocols.idl b/CIAO/performance-tests/Protocols/common/Protocols.idl index f7f584e9fff..580167f57b3 100644 --- a/CIAO/performance-tests/Protocols/common/Protocols.idl +++ b/CIAO/performance-tests/Protocols/common/Protocols.idl @@ -1,5 +1,7 @@ // $Id$ +#include <Components.idl> + module Protocols { interface test @@ -15,15 +17,15 @@ module Protocols oneway void oneway_sync (); void twoway_sync (); - + typedef sequence<octet> octets; oneway void oneway_method (in long session_id, in unsigned long iteration, in octets payload); - + void twoway_method (inout long session_id, inout unsigned long iteration, - inout octets payload); + inout octets payload); }; }; diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc index e7dc5609bc2..1b3b8957da1 100644 --- a/CIAO/performance-tests/Protocols/common/Protocols.mpc +++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc @@ -1,14 +1,10 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Protocols" -project(Protocols_stub): taolib_with_idl { +project(Protocols_stub): ciao_client_dnc { sharedname = Protocols_stub - idlflags += -St \ - -Wb,stub_export_macro=PROTOCOLS_STUB_Export \ - -Wb,stub_export_include=Protocols_stub_export.h \ - -Wb,skel_export_macro=PROTOCOLS_SKEL_Export \ - -Wb,skel_export_include=Protocols_skel_export.h + idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export -Wb,stub_export_include=Protocols_stub_export.h -Wb,skel_export_macro=PROTOCOLS_SVNT_Export -Wb,skel_export_include=Protocols_svnt_export.h dynamicflags = PROTOCOLS_STUB_BUILD_DLL IDL_Files { @@ -18,23 +14,15 @@ project(Protocols_stub): taolib_with_idl { Source_Files { ProtocolsC.cpp } - - Header_Files { - Protocols_stub_export.h - } } -project(Protocols_skel) : portableserver { +project(Protocols_svnt) : ciao_servant_dnc { after += Protocols_stub - sharedname = Protocols_skel + sharedname = Protocols_svnt libs += Protocols_stub - idlflags += -St \ - -Wb,stub_export_macro=PROTOCOLS_STUB_Export \ - -Wb,stub_export_include=Protocols_stub_export.h \ - -Wb,skel_export_macro=PROTOCOLS_SKEL_Export \ - -Wb,skel_export_include=Protocols_skel_export.h - dynamicflags = PROTOCOLS_SKEL_BUILD_DLL + idlflags += -Wb,export_macro=PROTOCOLS_SVNT_Export -Wb,export_include=Protocols_svnt_export.h + dynamicflags = PROTOCOLS_SVNT_BUILD_DLL IDL_Files { Protocols.idl @@ -43,10 +31,6 @@ project(Protocols_skel) : portableserver { Source_Files { ProtocolsS.cpp } - - Header_Files { - Protocols_skel_export.h - } } diff --git a/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h b/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h deleted file mode 100644 index 38692d63f09..00000000000 --- a/CIAO/performance-tests/Protocols/common/Protocols_skel_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 PROTOCOLS_SVNT -// ------------------------------ -#ifndef PROTOCOLS_SKEL_EXPORT_H -#define PROTOCOLS_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (PROTOCOLS_SKEL_HAS_DLL) -# define PROTOCOLS_SKEL_HAS_DLL 1 -#endif /* ! PROTOCOLS_SKEL_HAS_DLL */ - -#if defined (PROTOCOLS_SKEL_HAS_DLL) && (PROTOCOLS_SKEL_HAS_DLL == 1) -# if defined (PROTOCOLS_SKEL_BUILD_DLL) -# define PROTOCOLS_SKEL_Export ACE_Proper_Export_Flag -# define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* PROTOCOLS_SKEL_BUILD_DLL */ -# define PROTOCOLS_SKEL_Export ACE_Proper_Import_Flag -# define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* PROTOCOLS_SKEL_BUILD_DLL */ -#else /* PROTOCOLS_SKEL_HAS_DLL == 1 */ -# define PROTOCOLS_SKEL_Export -# define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) -# define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* PROTOCOLS_SKEL_HAS_DLL == 1 */ - -// Set PROTOCOLS_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PROTOCOLS_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define PROTOCOLS_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PROTOCOLS_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PROTOCOLS_SKEL_NTRACE */ - -#if (PROTOCOLS_SKEL_NTRACE == 1) -# define PROTOCOLS_SKEL_TRACE(X) -#else /* (PROTOCOLS_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PROTOCOLS_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PROTOCOLS_SKEL_NTRACE == 1) */ - -#endif /* PROTOCOLS_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h b/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h new file mode 100644 index 00000000000..4e64a47f821 --- /dev/null +++ b/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl PROTOCOLS_SVNT +// ------------------------------ +#ifndef PROTOCOLS_SVNT_EXPORT_H +#define PROTOCOLS_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (PROTOCOLS_SVNT_HAS_DLL) +# define PROTOCOLS_SVNT_HAS_DLL 1 +#endif /* ! PROTOCOLS_SVNT_HAS_DLL */ + +#if defined (PROTOCOLS_SVNT_HAS_DLL) && (PROTOCOLS_SVNT_HAS_DLL == 1) +# if defined (PROTOCOLS_SVNT_BUILD_DLL) +# define PROTOCOLS_SVNT_Export ACE_Proper_Export_Flag +# define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* PROTOCOLS_SVNT_BUILD_DLL */ +# define PROTOCOLS_SVNT_Export ACE_Proper_Import_Flag +# define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* PROTOCOLS_SVNT_BUILD_DLL */ +#else /* PROTOCOLS_SVNT_HAS_DLL == 1 */ +# define PROTOCOLS_SVNT_Export +# define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) +# define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* PROTOCOLS_SVNT_HAS_DLL == 1 */ + +// Set PROTOCOLS_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (PROTOCOLS_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define PROTOCOLS_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define PROTOCOLS_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !PROTOCOLS_SVNT_NTRACE */ + +#if (PROTOCOLS_SVNT_NTRACE == 1) +# define PROTOCOLS_SVNT_TRACE(X) +#else /* (PROTOCOLS_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define PROTOCOLS_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (PROTOCOLS_SVNT_NTRACE == 1) */ + +#endif /* PROTOCOLS_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index 1cd931b2d71..41501f86b1e 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -6,12 +6,7 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event { libpaths += ../interfaces libs += ENW_stub sharedname = TSEC_CheckPoint_stub - idlflags -= -GT - idlflags += -St \ - -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \ - -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h \ - -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \ - -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h + idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h dynamicflags = TSEC_CHECKPOINT_STUB_BUILD_DLL IDL_Files { @@ -26,16 +21,13 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event { project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event { avoids += ace_for_tao after += TSEC_CheckPoint_stub - after += ENW_skel ENW_stub + after += ENW_svnt ENW_stub sharedname = TSEC_CheckPoint_svnt libpaths += ../interfaces libs += TSEC_CheckPoint_stub - libs += ENW_stub ENW_skel + libs += ENW_stub ENW_svnt - idlflags -= -GT - idlflags += -SS -St \ - -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export \ - -Wb,export_include=TSEC_CheckPoint_svnt_export.h + idlflags += -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,export_include=TSEC_CheckPoint_svnt_export.h dynamicflags = TSEC_CHECKPOINT_SVNT_BUILD_DLL CIDL_Files { @@ -57,19 +49,16 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event { project(TSEC_CheckPoint_exec) : ciao_component_dnc, event { avoids += ace_for_tao after += TSEC_CheckPoint_svnt - after += ENW_skel ENW_stub + after += ENW_svnt ENW_stub includes += ../interfaces sharedname = TSEC_CheckPoint_exec libpaths += ../interfaces libs += TSEC_CheckPoint_stub TSEC_CheckPoint_svnt - libs += ENW_stub ENW_skel CIAO_DnC_Server TAO_CosNaming + libs += ENW_stub ENW_svnt CIAO_DnC_Server TAO_CosNaming - idlflags -= -GT - idlflags += -SS -St \ - -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export \ - -Wb,export_include=TSEC_CheckPoint_exec_export.h + idlflags += -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export -Wb,export_include=TSEC_CheckPoint_exec_export.h dynamicflags = TSEC_CHECKPOINT_EXEC_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc index 22227109f39..606ec1a67c9 100644 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc +++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc @@ -3,11 +3,7 @@ project(ENW_stub): ciao_client_dnc, event { sharedname = ENW_stub - idlflags -= -GT - idlflags += -Wb,stub_export_macro=ENW_STUB_Export \ - -Wb,stub_export_include=ENW_stub_export.h \ - -Wb,skel_export_macro=ENW_SKEL_Export \ - -Wb,skel_export_include=ENW_skel_export.h + idlflags += -Wb,stub_export_macro=ENW_STUB_Export -Wb,stub_export_include=ENW_stub_export.h -Wb,skel_export_macro=ENW_SVNT_Export -Wb,skel_export_include=ENW_svnt_export.h dynamicflags = ENW_STUB_BUILD_DLL IDL_Files { @@ -19,21 +15,12 @@ project(ENW_stub): ciao_client_dnc, event { } } -project(ENW_skel) : ciao_servant_dnc, event { +project(ENW_svnt) : ciao_servant_dnc, event { after += ENW_stub - sharedname = ENW_skel + sharedname = ENW_svnt libs += ENW_stub - idlflags -= -GT - idlflags += -Wb,stub_export_macro=ENW_STUB_Export \ - -Wb,stub_export_include=ENW_stub_export.h \ - -Wb,skel_export_macro=ENW_SKEL_Export \ - -Wb,skel_export_include=ENW_skel_export.h - dynamicflags = ENW_SKEL_BUILD_DLL - - IDL_Files { - ENW.idl - } + dynamicflags = ENW_SVNT_BUILD_DLL Source_Files { ENWS.cpp diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h deleted file mode 100644 index 05e87fade4b..00000000000 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h +++ /dev/null @@ -1,50 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ENW_SVNT -// ------------------------------ -#ifndef ENW_SKEL_EXPORT_H -#define ENW_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ENW_SKEL_HAS_DLL) -# define ENW_SKEL_HAS_DLL 1 -#endif /* ! ENW_SKEL_HAS_DLL */ - -#if defined (ENW_SKEL_HAS_DLL) && (ENW_SKEL_HAS_DLL == 1) -# if defined (ENW_SKEL_BUILD_DLL) -# define ENW_SKEL_Export ACE_Proper_Export_Flag -# define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ENW_SKEL_BUILD_DLL */ -# define ENW_SKEL_Export ACE_Proper_Import_Flag -# define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ENW_SKEL_BUILD_DLL */ -#else /* ENW_SKEL_HAS_DLL == 1 */ -# define ENW_SKEL_Export -# define ENW_SKEL_SINGLETON_DECLARATION(T) -# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ENW_SKEL_HAS_DLL == 1 */ - -// Set ENW_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ENW_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define ENW_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ENW_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ENW_SKEL_NTRACE */ - -#if (ENW_SKEL_NTRACE == 1) -# define ENW_SKEL_TRACE(X) -#else /* (ENW_SKEL_NTRACE == 1) */ -# define ENW_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -#endif /* (ENW_SKEL_NTRACE == 1) */ - -#endif /* ENW_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h new file mode 100644 index 00000000000..2e4b7580702 --- /dev/null +++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h @@ -0,0 +1,50 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ENW_SVNT +// ------------------------------ +#ifndef ENW_SVNT_EXPORT_H +#define ENW_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ENW_SVNT_HAS_DLL) +# define ENW_SVNT_HAS_DLL 1 +#endif /* ! ENW_SVNT_HAS_DLL */ + +#if defined (ENW_SVNT_HAS_DLL) && (ENW_SVNT_HAS_DLL == 1) +# if defined (ENW_SVNT_BUILD_DLL) +# define ENW_SVNT_Export ACE_Proper_Export_Flag +# define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ENW_SVNT_BUILD_DLL */ +# define ENW_SVNT_Export ACE_Proper_Import_Flag +# define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ENW_SVNT_BUILD_DLL */ +#else /* ENW_SVNT_HAS_DLL == 1 */ +# define ENW_SVNT_Export +# define ENW_SVNT_SINGLETON_DECLARATION(T) +# define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ENW_SVNT_HAS_DLL == 1 */ + +// Set ENW_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ENW_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define ENW_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ENW_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ENW_SVNT_NTRACE */ + +#if (ENW_SVNT_NTRACE == 1) +# define ENW_SVNT_TRACE(X) +#else /* (ENW_SVNT_NTRACE == 1) */ +# define ENW_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (ENW_SVNT_NTRACE == 1) */ + +#endif /* ENW_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/tests/IDL3/Events/Any/Any.mpc b/CIAO/tests/IDL3/Events/Any/Any.mpc deleted file mode 100644 index d0b72182ca1..00000000000 --- a/CIAO/tests/IDL3/Events/Any/Any.mpc +++ /dev/null @@ -1,26 +0,0 @@ -// $Id$ - -project(EventAny_local): ciao_client_dnc { - exename = EventAny - idlflags += -SS - - IDL_Files { - EventAny.idl - } - - Source_Files { - EventAnyC.cpp - main.cpp - } - - Header_Files { - EventAnyC.h - } - - Inline_Files { - EventAnyC.inl - } - - Template_Files { - } -} diff --git a/CIAO/tests/IDL3/Events/Any/EventAny.idl b/CIAO/tests/IDL3/Events/Any/EventAny.idl deleted file mode 100644 index d53ddf55c08..00000000000 --- a/CIAO/tests/IDL3/Events/Any/EventAny.idl +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ -/** - * @file EventAny.idl - * @author Jeff Parsons <j.parsons@vanderbilt.edu> - * - * Tests Any insertion/extraction of event types, - * and (de)marshaling of such Anys. - */ - -#include <Components.idl> - -eventtype StringMsg -{ - public string str_msg; -}; - diff --git a/CIAO/tests/IDL3/Events/Any/README b/CIAO/tests/IDL3/Events/Any/README deleted file mode 100644 index 7bf91be5776..00000000000 --- a/CIAO/tests/IDL3/Events/Any/README +++ /dev/null @@ -1,35 +0,0 @@ - -Event Any Test -======================= - -This test defines, instantiates, and initializes an IDL -eventtype with a public string member, inserts it into -an Any, marshals the Any, demarshals the Any, extracts -the eventtype, and compares the resulting member string -with the original. The purpose of the test is to ensure -that (1) the demarshaling of the Any and (2) the -extraction of the eventtype, are successful, since both -these actions are done interpretively by traversing the -eventtype's type code. The motivation for the test was -the failure of these actions due to missing cases in -the interpretive demarshaling code corresponding to -the kind of the eventtype's type code (CORBA::tk_event). - -There are several places the test can fail: - -- marshaling of the Any -- demarshaling of the Any -- extraction from the Any -- string compare of the sent and received eventtype members - -Note that the test code registers a valuetype factory -with the orb, a necessary step in extracting the -eventtype from the Any. In a real-world use case (such -as an event channel) such a factory would have to -be registered with the orb anywhere the eventtype is -to be demarshaled from a CDR stream or extracted from -an Any that was itself demarshaled. - -Jeff Parsons - - diff --git a/CIAO/tests/IDL3/Events/Any/main.cpp b/CIAO/tests/IDL3/Events/Any/main.cpp deleted file mode 100644 index d59f9fec0d4..00000000000 --- a/CIAO/tests/IDL3/Events/Any/main.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// $Id$ - -#include "EventAnyC.h" -#include "ace/Get_Opt.h" - -void -insert_into_any (CORBA::Any& any, Components::EventBase* vb) -{ - any <<= vb; -} - -void -debug_msg (const char *msg) -{ - ACE_ERROR ((LM_ERROR, "Error: %s\n", msg)); -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY - { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - StringMsg_init *StringMsg_factory = new StringMsg_init; - - orb->register_value_factory (StringMsg_factory->tao_repository_id (), - StringMsg_factory); - StringMsg_factory->_remove_ref (); // release ownership - - const char *test_str = "a message"; - - StringMsg_var ev = new OBV_StringMsg; - ev->str_msg (test_str); - - CORBA::Any in_any; - insert_into_any (in_any, ev.in ()); - - TAO_OutputCDR out; - CORBA::Boolean good = out << in_any; - - if (!good) - { - debug_msg ("Any marshaling failed"); - return -1; - } - - TAO_InputCDR in (out); - CORBA::Any out_any; - good = in >> out_any; - - if (!good) - { - debug_msg ("Any demarshaling failed"); - return -1; - } - - StringMsg *ev_out = 0; - good = out_any >>= ev_out; - - if (!good) - { - debug_msg ("Any extraction failed"); - return -1; - } - - const char *result_str = ev_out->str_msg (); - - if (result_str == 0 || ACE_OS::strcmp (result_str, test_str) != 0) - { - debug_msg ("Extracted member string null or incorrect"); - return -1; - } - - orb->destroy (); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "caught exception:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} - diff --git a/CIAO/tests/IDL3/Events/Any/run_test.pl b/CIAO/tests/IDL3/Events/Any/run_test.pl deleted file mode 100755 index f13f9726b5b..00000000000 --- a/CIAO/tests/IDL3/Events/Any/run_test.pl +++ /dev/null @@ -1,31 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -# The first three lines above let this script run without specifying the -# full path to perl, as long as it is in the user's PATH. -# Taken from perlrun man page. - -# Do not use environment variables here since not all platforms use ACE_ROOT -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; -use English; - -$status = 0; -$exflags = ""; - -# Run the test - -$EX = new PerlACE::Process ("EventAny"); -$EX->Arguments ($exflags); -$test = $EX->SpawnWaitKill (10); - -if ($test != 0) { - print STDERR "ERROR: test error status $test\n"; - $status = 1; -} - -exit $status; diff --git a/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/CIAO/tests/IDL3/Events/Regular/Regular.mpc index 1ff6519f0ca..b654e690bae 100644 --- a/CIAO/tests/IDL3/Events/Regular/Regular.mpc +++ b/CIAO/tests/IDL3/Events/Regular/Regular.mpc @@ -4,10 +4,7 @@ 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 + 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 dynamicflags = REGULAR_STUB_BUILD_DLL IDL_Files { diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc index ca32b465573..e91274525a4 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc +++ b/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc @@ -2,20 +2,20 @@ // $Id$ project(ConvertIDL3) : taoidl3toidl2defaults, ciao_component_dnc { - idlflags += -Sm - + idlflags += -Sc -Sm + IDL3TOIDL2_Files { convert.idl include.idl pass_through.idl } - + IDL_Files { convert_IDL2.idl include_IDL2.idl pass_through_IDL2.idl << include_IDL2.idl } - + Source_Files { convert_IDL2C.cpp convert_IDL2S.cpp diff --git a/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/CIAO/tests/IDL3/Lookup/lookup_test.mpc index 1449c788ea1..9cec290e5a1 100644 --- a/CIAO/tests/IDL3/Lookup/lookup_test.mpc +++ b/CIAO/tests/IDL3/Lookup/lookup_test.mpc @@ -3,6 +3,7 @@ project(LookupTest_stub): ciao_client_dnc { sharedname = LookupTest_stub + idlflags += -Sc IDL_Files { lookup_test.idl diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc index 3862be24788..2262a8485bd 100644 --- a/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc +++ b/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc @@ -4,7 +4,8 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc { sharedname = Minimum_Base_DnC_stub - idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ -Wb,stub_export_include=Minimum_Base_stub_export.h \ -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \ -Wb,skel_export_include=Minimum_Base_svnt_export.h @@ -32,7 +33,8 @@ project(Minimum_Base_DnC_svnt) : ciao_servant_dnc { sharedname = Minimum_Base_DnC_svnt libs += Minimum_Base_DnC_stub - idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ -Wb,stub_export_include=Minimum_Base_stub_export.h \ -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \ -Wb,skel_export_include=Minimum_Base_svnt_export.h diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc index 268e8cca925..0fc995db8e8 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver.mpc +++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc @@ -5,7 +5,8 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc { avoids += ace_for_tao after += Minimum_Base_DnC_stub sharedname = Minimum_Receiver_DnC_stub - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + idlflags += -Sc \ + -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 @@ -19,11 +20,11 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - + Header_Files { ReceiverC.h } - + Inline_Files { ReceiverC.inl } @@ -37,8 +38,9 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc { libs += Minimum_Receiver_DnC_stub \ Minimum_Base_DnC_stub \ Minimum_Base_DnC_svnt - - idlflags += -Wb,export_macro=RECEIVER_SVNT_Export \ + + idlflags += -Sc \ + -Wb,export_macro=RECEIVER_SVNT_Export \ -Wb,export_include=Receiver_svnt_export.h dynamicflags = RECEIVER_SVNT_BUILD_DLL @@ -77,8 +79,9 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc { Minimum_Receiver_DnC_svnt \ Minimum_Base_DnC_stub \ Minimum_Base_DnC_svnt - - idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ + + idlflags += -Sc \ + -Wb,export_macro=RECEIVER_EXEC_Export \ -Wb,export_include=Receiver_exec_export.h dynamicflags = RECEIVER_EXEC_BUILD_DLL @@ -88,10 +91,10 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc { Source_Files { Receiver_exec.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/CIAO/tests/Minimum/Sender/Sender.mpc b/CIAO/tests/Minimum/Sender/Sender.mpc index a0acee45fbc..583a980b793 100644 --- a/CIAO/tests/Minimum/Sender/Sender.mpc +++ b/CIAO/tests/Minimum/Sender/Sender.mpc @@ -5,7 +5,8 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc { avoids += ace_for_tao after += Minimum_Base_DnC_stub sharedname = Minimum_Sender_DnC_stub - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + idlflags += -Sc \ + -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 @@ -19,11 +20,11 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - + Header_Files { SenderC.h } - + Inline_Files { SenderC.inl } @@ -38,7 +39,8 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc { Minimum_Base_DnC_stub \ Minimum_Base_DnC_svnt - idlflags += -Wb,export_macro=SENDER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=SENDER_SVNT_Export \ -Wb,export_include=Sender_svnt_export.h dynamicflags = SENDER_SVNT_BUILD_DLL @@ -55,13 +57,13 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc { SenderS.cpp Sender_svnt.cpp } - + Header_Files { SenderEC.h SenderS.h Sender_svnt.h } - + Inline_Files { SenderEC.inl SenderS.inl @@ -77,7 +79,8 @@ project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc { Minimum_Base_DnC_stub \ Minimum_Base_DnC_svnt - idlflags += -Wb,export_macro=SENDER_EXEC_Export \ + idlflags += -Sc \ + -Wb,export_macro=SENDER_EXEC_Export \ -Wb,export_include=Sender_exec_export.h dynamicflags = SENDER_EXEC_BUILD_DLL @@ -87,7 +90,7 @@ project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc { Source_Files { Sender_exec.cpp } - + Header_Files { Sender_exec.h } diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp index 692b6b940d0..590ec9e7420 100644 --- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp +++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp @@ -57,7 +57,7 @@ namespace CIAO enum Value { - EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l + EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l, }; @@ -268,7 +268,7 @@ namespace CIAO enum Value { - CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l + CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l, }; diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/tools/Config_Handlers/Config_Handlers.mpc index be3a4f289aa..de34a519bf2 100644 --- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc +++ b/CIAO/tools/Config_Handlers/Config_Handlers.mpc @@ -1,6 +1,6 @@ //$Id$ -project (XSC_XML_Handlers) : acelib, xerces { +project (XSC_XML_Handlers) : acelib, xerces, exceptions { sharedname += XSC_XML_Handlers dynamicflags = XSC_XML_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS diff --git a/CIAO/tools/Config_Handlers/DD_Handler.cpp b/CIAO/tools/Config_Handlers/DD_Handler.cpp index d6de22ee29e..e3e6b4e7626 100644 --- a/CIAO/tools/Config_Handlers/DD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/DD_Handler.cpp @@ -5,7 +5,7 @@ #include "DD_Handler.h" #include "Any_Handler.h" #include "Deployment.hpp" -#include "ciao/Deployment_TargetDataC.h" +#include "ciao/Deployment_BaseC.h" #include "CIAO_common.h" using namespace std; diff --git a/CIAO/tools/Config_Handlers/DD_Handler.h b/CIAO/tools/Config_Handlers/DD_Handler.h index 7c77d0f6b54..89aef35182d 100644 --- a/CIAO/tools/Config_Handlers/DD_Handler.h +++ b/CIAO/tools/Config_Handlers/DD_Handler.h @@ -46,25 +46,35 @@ public: class NoDomain {}; /** -* @param file The file to be read +* @operation constructor +* +* @param The file to be read */ DD_Handler (const ACE_TCHAR *file); /** +* @operation constructor +* * @param dmn The Domain structure */ DD_Handler(Domain *dmn); /** +* @operation constructor +* * @param dmn The Deployment::Domain structure */ DD_Handler(::Deployment::Domain *dmn); /** +* @operation destructor +* */ ~DD_Handler (void); /** +* @operation domain_idl +* * @brief Returns the const IDL domain * @return Domain* the IDL domain pointer */ @@ -72,6 +82,8 @@ DD_Handler(::Deployment::Domain *dmn); throw (NoDomain); /** +* @operation domain_idl +* * @brief Returns the IDL domain * @return Domain* the IDL domain pointer */ @@ -79,6 +91,8 @@ throw (NoDomain); throw (NoDomain); /** +* @operation domain_xsc +* * @brief Returns the const XSC domain * @return Domain* the XSC domain pointer */ @@ -86,6 +100,8 @@ Domain const *domain_xsc (void) const throw (NoDomain); /** +* @operation domain_xsc +* * @brief Returns the XSC domain * @return Domain* the XSC domain pointer */ @@ -94,11 +110,15 @@ throw (NoDomain); private: /** +* @operation build_domain +* * @brief builds the domain structure */ bool build_domain (); /** +* @operation build_xsc +* * @brief builds the XSC data structure */ bool build_xsc (); diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp index 4b3476e15f6..050f0307344 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp +++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp @@ -736,6 +736,16 @@ namespace Deployment dump_sequence ("configProperty", pc.configProperty); } + // Requirement Satisfier + void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs) + { + Dump_Obj dump_obj("RequirementSatisfier"); + + dump ("name", rs.name); + dump ("resourceType", rs.resourceType); + dump_sequence ("property", rs.property); + } + // Property void DnC_Dump::dump (const Deployment::Property& property) { diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.h b/CIAO/tools/Config_Handlers/DnC_Dump.h index ae8b587ff62..d80d4a4af15 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump.h +++ b/CIAO/tools/Config_Handlers/DnC_Dump.h @@ -13,7 +13,6 @@ #include /**/ "ace/pre.h" #include "ciao/DeploymentC.h" -#include "ciao/Deployment_TargetDataC.h" #include "Config_Handlers_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -141,6 +140,8 @@ static void dump(const ResourceDeploymentDescription &rdd); static void dump (const ::Deployment::ComponentAssemblyDescription& cad); +static void dump (const Deployment::RequirementSatisfier& rs); + private: static void dump (const ::CORBA::Any &any); // Helper function to print an Any diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc index 7cc9a0de2b5..60095581130 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc +++ b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc @@ -1,18 +1,19 @@ // $Id$ -project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, ciao_client_dnc { - after += XSC_XML_Handlers - libs += XSC_XML_Handlers - dynamicflags += DYNANY_HANDLER_BUILD_DLL - macros += XML_USE_PTHREADS - includes += $(CIAO_ROOT)/tools/Config_Handlers +project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory, ciao_client_dnc { +after += XSC_XML_Handlers +libs += XSC_XML_Handlers +dynamicflags += DYNANY_HANDLER_BUILD_DLL +macros += XML_USE_PTHREADS +requires += exceptions +includes += $(CIAO_ROOT)/tools/Config_Handlers - Source_Files { - DynAny_Handler/DynAny_Handler.cpp - DynAny_Handler/DynEnum_Handler.cpp - } +Source_Files { +DynAny_Handler/DynAny_Handler.cpp +DynAny_Handler/DynEnum_Handler.cpp +} - Header_Files { - DynAny_Handler_Export.h - } +Header_Files { +DynAny_Handler_Export.h +} } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp index a45c92e8465..dbc0f212348 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -4,7 +4,7 @@ #include "Package_Handlers/CID_Handler.h" #include "Package_Handlers/Comp_Intf_Descr_Handler.h" #include "Basic_Deployment_Data.hpp" -#include "ciao/Deployment_Packaging_DataC.h" +#include "ciao/Packaging_DataC.h" #include "Deployment.hpp" #include "Utils/Exceptions.h" #include "Property_Handler.h" diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp index 61c85827472..c0010429df6 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp @@ -2,6 +2,7 @@ #include "Package_Handlers/IAD_Handler.h" #include "Package_Handlers/NIA_Handler.h" #include "Basic_Deployment_Data.hpp" +#include "ciao/Packaging_DataC.h" #include "Property_Handler.h" #include "Req_Handler.h" #include "Utils/Functors.h" diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h index 2c4db4eddf2..edc5fe7fa6c 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h +++ b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h @@ -10,7 +10,7 @@ #include /**/ "ace/pre.h" #include "Package_Handlers/Packaging_Handlers_Export.h" #include "Utils/Functors.h" -#include "ciao/Deployment_Packaging_DataC.h" +#include "ciao/Packaging_DataC.h" #include "iad.hpp" namespace Deployment diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp index 6f0faebd255..e0258b22140 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -1,7 +1,7 @@ // $Id$ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "ciao/CIAO_common.h" -#include "ciao/Deployment_Packaging_DataC.h" +#include "ciao/Packaging_DataC.h" #include "Utils/XML_Helper.h" #include "Utils/XercesString.h" #include "Utils/Exceptions.h" @@ -41,10 +41,10 @@ namespace CIAO TopLevelPackageDescription tpd (foo); tpd = topLevelPackageDescription (dom); - + PCD_Handler::package_config (tpd.package (), toconfig); - + } else if (root == XStr ("Deployment:packageConfiguration")) { diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc index 7f4b68c5247..05687340c45 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc +++ b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc @@ -19,7 +19,7 @@ project (Package_Config_Handlers) : acelib, ciao_deployment_stub, ciao_config_ha XSC_DynAny_Handler \ XSC_XML_Handlers \ CIAO_XML_Utils \ - CIAO_Events_Handlers RT_CCM_Config_Handlers + CIAO_Events_Handlers Source_files { CAD_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp index 7ab76020dd9..cf8f9ae7aaa 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp @@ -4,7 +4,7 @@ #include "Deployment.hpp" #include "PCD_Handler.h" -#include "ciao/Deployment_Packaging_DataC.h" +#include "ciao/Packaging_DataC.h" #include "SID_Handler.h" #include "ace/Get_Opt.h" #include "Utils/XML_Helper.h" @@ -57,7 +57,7 @@ int main (int argc, char *argv[]) // Initialize an ORB so Any will work CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, ""); ACE_UNUSED_ARG (orb); - + if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (input_file)) { diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp index 85a06851d78..16d6697c509 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp +++ b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp @@ -1,6 +1,7 @@ // $Id$ #include "CB_Handler.h" +#include "ciao/ServerResourcesC.h" #include "CIAOServerResources.hpp" #include "ace/Basic_Types.h" diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h index 7272b830fb7..e72bbe18ee8 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "IDREF_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp index d5053a6dea6..8edf1ef9980 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp +++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp @@ -2,6 +2,7 @@ #include "CLA_Handler.h" #include "CIAOServerResources.hpp" +#include "ServerResourcesC.h" namespace CIAO { diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h index 1c3469e617e..ae917f885e5 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp index 41c45ee7c96..5a8fc9114f2 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp +++ b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp @@ -3,6 +3,7 @@ #include "OC_Handler.h" #include "OR_Handler.h" #include "PS_Handler.h" +#include "ciao/ServerResourcesC.h" #include "CIAOServerResources.hpp" namespace CIAO diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h index 8aa7db84e77..8360825226e 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp index c4719fd5621..5fd8a1b32ff 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp +++ b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp @@ -5,6 +5,7 @@ #include "TPL_Handler.h" #include "CB_Handler.h" #include "CIAOServerResources.hpp" +#include "ciao/ServerResourcesC.h" namespace CIAO { diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h index 2790e149320..707547adf61 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "RT_CCM_Handlers_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h index 6c35612536c..aa0705fcac2 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h @@ -12,7 +12,7 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h index 5bd9b9237c2..5f8673d94ef 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h @@ -12,7 +12,7 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc index a280f95f60b..9bff5006b60 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc +++ b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc @@ -1,10 +1,13 @@ //$Id$ -project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_xml_utils { +project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces { sharedname = RT_CCM_Config_Handlers dynamicflags = RT_CCM_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS + requires += exceptions includes += $(CIAO_ROOT)/tools/Config_Handlers + after += CIAO_XML_Utils + libs += CIAO_XML_Utils includes += $(CIAO_ROOT)/ciao Source_Files { @@ -24,12 +27,14 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_xml_utils } } + //project (RT-CCM_Config_Handlers_Tests) : ciao_component_dnc, xerces { // requires += dummy_label // exename = rt-ccm-test // after += RT-CCM-Handlers // dynamicflags = CONFIG_HANDLERS_BUILD_DLL // macros += XML_USE_PTHREADS +// requires += exceptions // includes += $(CIAO_ROOT)/tools/Config_Handlers // libs += CIAO_DnC_Server TAO_IFR_Client RT_CCM_Config_Handlers CIAO_XML_Utils diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp index 000768090f5..fc7e4b88a56 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp @@ -4,6 +4,7 @@ #include "CIAOServerResources.hpp" #include "CLA_Handler.h" #include "OC_Handler.h" +#include "ciao/ServerResourcesC.h" namespace CIAO { diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h index 3a5ad3128ed..c97d951ec90 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h @@ -14,8 +14,9 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "ace/Auto_Ptr.h" +// #include "Utils/XML_Helper.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h index 9a129302c05..e11fbc28dc2 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "RT_CCM_Handlers_Export.h" diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp index 9d29bec5c40..7a9bc607b32 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp +++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp @@ -1,6 +1,7 @@ // $Id$Exp lseibert #include "TP_Handler.h" +#include "ciao/ServerResourcesC.h" #include "CIAOServerResources.hpp" namespace CIAO diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h index f0e27e2cef5..b0403ab0342 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h +++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" #include "RT_CCM_Handlers_Export.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/CIAO/tools/Config_Handlers/Utils/Utils.mpc index 704c856d752..6fc4f4697a1 100644 --- a/CIAO/tools/Config_Handlers/Utils/Utils.mpc +++ b/CIAO/tools/Config_Handlers/Utils/Utils.mpc @@ -1,6 +1,6 @@ // $Id$ -project (CIAO_XML_Utils) : acelib, xerces { +project (CIAO_XML_Utils) : acelib, xerces, exceptions { includes += $(CIAO_ROOT)/tools/Config_Handlers sharedname += CIAO_XML_Utils dynamicflags = CIAO_XML_UTILS_BUILD_DLL diff --git a/CIAO/tools/Config_Handlers/test.cpp b/CIAO/tools/Config_Handlers/test.cpp index 549700fb79d..8c968d1c63f 100644 --- a/CIAO/tools/Config_Handlers/test.cpp +++ b/CIAO/tools/Config_Handlers/test.cpp @@ -5,7 +5,7 @@ #include "Deployment.hpp" #include "DP_Handler.h" #include "ciao/Deployment_DataC.h" -#include "ciao/CIAO_ServerResourcesC.h" +#include "ciao/ServerResourcesC.h" #include "ace/Get_Opt.h" #include "Utils/XML_Helper.h" #include "DnC_Dump.h" @@ -54,7 +54,7 @@ int main (int argc, char *argv[]) // Initialize an ORB so Any will work CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, ""); ACE_UNUSED_ARG (orb); - + //Create an XML_Helper for all the file work XML_Helper the_helper; diff --git a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc index b2cd31ba41e..59eed9acea6 100644 --- a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc +++ b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(TAO_IDL3_TO_IDL2_BE) : acelib, install, tao_output, crosscompile { +project(TAO_IDL3_TO_IDL2_BE) : acelib, core, tao_output, crosscompile { after += TAO_IDL_FE sharedname = TAO_IDL3_TO_IDL2_BE libs += TAO_IDL_FE @@ -31,7 +31,7 @@ project(TAO_IDL3_TO_IDL2_BE) : acelib, install, tao_output, crosscompile { } -project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, tao_output, crosscompile { +project(TAO_IDL3_TO_IDL2_EXE) : aceexe, core, tao_output, crosscompile { after += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE exename = tao_idl3_to_idl2 libs += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE diff --git a/CIAO/tools/tools.mwc b/CIAO/tools/tools.mwc index ae28cfcba54..b841dc37dd0 100644 --- a/CIAO/tools/tools.mwc +++ b/CIAO/tools/tools.mwc @@ -3,5 +3,4 @@ workspace { Config_Handlers - IDL3_to_IDL2 }
\ No newline at end of file |
