diff options
-rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp | 18 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h | 6 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/ChangeLog | 10 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc | 2 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp | 12 |
5 files changed, 32 insertions, 16 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp index 7eacaf1913c..a40632c6ebd 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp @@ -5,6 +5,7 @@ #include "Property_Handler.h" #include "Req_Handler.h" #include "RDD_Handler.h" +#include "Singleton_IDREF_Map.h" ACE_RCSID (DAnCE, ADD_Handler, @@ -17,7 +18,8 @@ namespace CIAO void ADD_Handler::artifact_deployment_descr ( const ArtifactDeploymentDescription &src, - Deployment::ArtifactDeploymentDescription &dest) + Deployment::ArtifactDeploymentDescription &dest, + CORBA::ULong pos) { dest.name = CORBA::string_dup (src.name ().c_str ()); @@ -75,13 +77,21 @@ namespace CIAO dest.execParameter[len]); } -#if 0 - // @@ MAJO: Don't know how to handle this. + if (src.id_p ()) { - + ACE_CString cstr (src.id ().c_str ()); + + bool retval = + Singleton_IDREF_Map::instance ()->bind_ref (cstr, + pos); + if (!retval) + { + // @@ MAJO: Don't know how to handle this. Throw an exception? + } } +#if 0 // @@ MAJO: Don't know how to handle this. if (src.deployRequirement_p ()) { diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h index 0467f86cc93..c3aa08d67ee 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h @@ -12,7 +12,8 @@ #define CIAO_CONFIG_HANDLERS_ADD_Handler_H #include /**/ "ace/pre.h" -#include "Config_Handlers_Export.h" +#include "Config_Handlers/Config_Handlers_Export.h" +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -48,7 +49,8 @@ namespace CIAO public: static void artifact_deployment_descr ( const ArtifactDeploymentDescription& desc, - ::Deployment::ArtifactDeploymentDescription &dest); + ::Deployment::ArtifactDeploymentDescription &dest, + CORBA::ULong l = 0); }; } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog index 123917c0605..dd0b0232800 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog +++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog @@ -1,3 +1,13 @@ +Tue Sep 28 16:08:56 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * DAnCE/Config_Handlers/ADD_Handler.cpp: + * DAnCE/Config_Handlers/ADD_Handler.h: + * DAnCE/Config_Handlers/Config_Handlers.mpc: + * DAnCE/Config_Handlers/MDD_Handler.cpp: + + Made some changes to MDD and ADD handlers to register the + IDREF's and find the IDREF's. + Tue Sep 28 15:16:03 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/Config_Handlers/XSCRT/Elements.hpp: diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc index 406bf86b33e..ebdfbe39270 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc +++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc @@ -51,7 +51,7 @@ project (XSC_Config_Handlers) : ciao_deployment_stub { } project (XSC_Config_Handlers_Tests) : ciao_deployment_stub { - + requires += dummy exename = test dynamicflags = CONFIG_HANDLER_BUILD_DLL macros += XML_USE_PTHREADS diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp index 2efe1535abe..e2d3c269c0d 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp @@ -46,21 +46,15 @@ namespace CIAO { CORBA::ULong tmp = 0; -#if 0 - ACE_CString cstr = *ab; - - // @@ MAJO: What should be do bool r = - Singleton_IDREF_Map::instance ()->find_ref (cstr, - tmp); + Singleton_IDREF_Map::instance ()->find_ref ( + ab->id ().c_str (), + tmp); if (!r) // @@MAJO: What should we do if find_ref fails? continue; -#endif /*if 0*/ - - CORBA::ULong len = toconfig.artifactRef.length (); |