diff options
Diffstat (limited to 'TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp')
| -rw-r--r-- | TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp | 293 |
1 files changed, 148 insertions, 145 deletions
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp index 09d53d2afd5..c038bd9d4b7 100644 --- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp @@ -9,160 +9,163 @@ ACE_RCSID (DAnCE, ADD_Handler, "$Id$") - -namespace CIAO -{ - namespace Config_Handlers + + namespace CIAO { - IDREF_Base<CORBA::ULong> ADD_Handler::IDREF; - - void - ADD_Handler::artifact_deployment_descrs ( - const DeploymentPlan &src, - ::Deployment::ArtifactDeploymentDescriptions &dest) + namespace Config_Handlers { - DeploymentPlan::artifact_const_iterator aci_e = - src.end_artifact (); - dest.length (src.count_artifact ()); - CORBA::ULong pos = 0; - for (DeploymentPlan::artifact_const_iterator aci_b = - src.begin_artifact (); - aci_e != aci_b; - ++aci_b) - { - ADD_Handler::artifact_deployment_descr ((*aci_b), - dest[pos], - pos); - pos++; - } - } + IDREF_Base<CORBA::ULong> ADD_Handler::IDREF; - void - ADD_Handler::artifact_deployment_descr ( - const ArtifactDeploymentDescription &src, - Deployment::ArtifactDeploymentDescription &dest, - CORBA::ULong pos) - { - dest.name = src.name ().c_str (); - - dest.node = src.node ().c_str (); - - ArtifactDeploymentDescription::location_const_iterator end = - src.end_location (); - - dest.location.length (src.count_location ()); - CORBA::ULong len = 0; - for (ArtifactDeploymentDescription::location_const_iterator - start = src.begin_location (); - start != end; - ++start) - { - dest.location[len++] = start->c_str (); - } - - ArtifactDeploymentDescription::source_const_iterator sce = - src.end_source (); - len = 0; - dest.source.length (src.count_source ()); - for (ArtifactDeploymentDescription::source_const_iterator - scb = src.begin_source (); - scb != sce; - ++scb) - { - dest.source[len++] = scb->c_str (); - } - - // @@TODO: See this loop is repeated - ArtifactDeploymentDescription::execParameter_const_iterator adce = - src.end_execParameter (); - len = 0; - dest.execParameter.length (src.count_execParameter ()); - for (ArtifactDeploymentDescription::execParameter_const_iterator adcb = - src.begin_execParameter (); - adcb != adce; - ++adcb) - { - Property_Handler::get_property ((*adcb), - dest.execParameter[len++]); - } - - if (src.id_p ()) - { - ACE_CString cstr (src.id ().c_str ()); - - ADD_Handler::IDREF.bind_ref (cstr,pos); - } - else - { - ACE_DEBUG ((LM_ERROR, - "(%P|%t) Warning: ADD %s has no idref.\n", - src.name ().c_str ())); - } + void + ADD_Handler::artifact_deployment_descrs ( + const DeploymentPlan &src, + ::Deployment::ArtifactDeploymentDescriptions &dest) + { + CIAO_TRACE("ADD_Handler::atrifact_deployment_descrs"); + DeploymentPlan::artifact_const_iterator aci_e = + src.end_artifact (); + dest.length (src.count_artifact ()); + CORBA::ULong pos = 0; + for (DeploymentPlan::artifact_const_iterator aci_b = + src.begin_artifact (); + aci_e != aci_b; + ++aci_b) + { + ADD_Handler::artifact_deployment_descr ((*aci_b), + dest[pos], + pos); + pos++; + } + } + + void + ADD_Handler::artifact_deployment_descr ( + const ArtifactDeploymentDescription &src, + Deployment::ArtifactDeploymentDescription &dest, + CORBA::ULong pos) + { + CIAO_TRACE("ADD_Handler::atrifact_deployment_descr"); + dest.name = src.name ().c_str (); + + dest.node = src.node ().c_str (); + + ArtifactDeploymentDescription::location_const_iterator end = + src.end_location (); + + dest.location.length (src.count_location ()); + CORBA::ULong len = 0; + for (ArtifactDeploymentDescription::location_const_iterator + start = src.begin_location (); + start != end; + ++start) + { + dest.location[len++] = start->c_str (); + } + + ArtifactDeploymentDescription::source_const_iterator sce = + src.end_source (); + len = 0; + dest.source.length (src.count_source ()); + for (ArtifactDeploymentDescription::source_const_iterator + scb = src.begin_source (); + scb != sce; + ++scb) + { + dest.source[len++] = scb->c_str (); + } + + // @@TODO: See this loop is repeated + ArtifactDeploymentDescription::execParameter_const_iterator adce = + src.end_execParameter (); + len = 0; + dest.execParameter.length (src.count_execParameter ()); + for (ArtifactDeploymentDescription::execParameter_const_iterator adcb = + src.begin_execParameter (); + adcb != adce; + ++adcb) + { + Property_Handler::get_property ((*adcb), + dest.execParameter[len++]); + } + + if (src.id_p ()) + { + ACE_CString cstr (src.id ().c_str ()); + + ADD_Handler::IDREF.bind_ref (cstr,pos); + } + else + { + ACE_DEBUG ((LM_ERROR, + "(%P|%t) Warning: ADD %s has no idref.\n", + src.name ().c_str ())); + } #if 0 - // @@ MAJO: Don't know how to handle this. - if (src.deployRequirement_p ()) - { - Req_Handler handler; - add.deployRequirement.length ( - add.deployRequirement.length () + 1); - handler.get_Requirement ( - add.deployRequirement[add.deployRequirement.length () - 1], - src.deployRequirement ()); - } - - if (src.deployedResource_p ()) - { - RDD_Handler handler; - add.deployedResource.length ( - add.deployedResource.length () + 1); - handler.get_ResourceDeploymentDescription ( - add.deployedResource[add.deployedResource.length () - 1], - src.deployedResource ()); - } + // @@ MAJO: Don't know how to handle this. + if (src.deployRequirement_p ()) + { + Req_Handler handler; + add.deployRequirement.length ( + add.deployRequirement.length () + 1); + handler.get_Requirement ( + add.deployRequirement[add.deployRequirement.length () - 1], + src.deployRequirement ()); + } + + if (src.deployedResource_p ()) + { + RDD_Handler handler; + add.deployedResource.length ( + add.deployedResource.length () + 1); + handler.get_ResourceDeploymentDescription ( + add.deployedResource[add.deployedResource.length () - 1], + src.deployedResource ()); + } #endif /* 0 */ - } - + } + ArtifactDeploymentDescription ADD_Handler::artifact_deployment_descr ( - const Deployment::ArtifactDeploymentDescription &src) + const Deployment::ArtifactDeploymentDescription &src) { - //Get the name and node and store them in the add - XMLSchema::string< char > name ((src.name)); - XMLSchema::string< char > node ((src.node)); - - ArtifactDeploymentDescription add (name,node); - - //Get the location(s) and store it/them in the add - size_t total = src.location.length (); - for (size_t i = 0; i < total; ++i) - { - XMLSchema::string< char > curr ((src.location[i])); - add.add_location (curr); - } - - //As above, for the source(s) - total = src.source.length (); - for (size_t j = 0; j < total; ++j) - { - XMLSchema::string< char > curr ((src.source[j])); - add.add_source (curr); - } - - //As above for the execParameter(s) - total = src.execParameter.length (); - for (size_t k = 0; k < total; ++k) - { - add.add_execParameter ( - Property_Handler::get_property ( - src.execParameter[k])); - } - - return add; - } + CIAO_TRACE("ADD_Handler::atrifact_deployment_descr - reverse"); + //Get the name and node and store them in the add + XMLSchema::string< char > name ((src.name)); + XMLSchema::string< char > node ((src.node)); + + ArtifactDeploymentDescription add (name,node); + + //Get the location(s) and store it/them in the add + size_t total = src.location.length (); + for (size_t i = 0; i < total; ++i) + { + XMLSchema::string< char > curr ((src.location[i])); + add.add_location (curr); + } + + //As above, for the source(s) + total = src.source.length (); + for (size_t j = 0; j < total; ++j) + { + XMLSchema::string< char > curr ((src.source[j])); + add.add_source (curr); + } + + //As above for the execParameter(s) + total = src.execParameter.length (); + for (size_t k = 0; k < total; ++k) + { + add.add_execParameter ( + Property_Handler::get_property ( + src.execParameter[k])); + } + + return add; + } - - } -} + } + + } |