diff options
author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-12 14:49:02 +0000 |
---|---|---|
committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-12 14:49:02 +0000 |
commit | cbe8aa5d5be1d4679ae0c4e30baaea24fbae416c (patch) | |
tree | b9f7b9d73fe1ba0675ac5233476b66a61b8f8521 /TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp | |
parent | a2dd5f907273d7561f3ccac51d7fffc8bb4b6893 (diff) | |
download | ATCD-cbe8aa5d5be1d4679ae0c4e30baaea24fbae416c.tar.gz |
This commit was manufactured by cvs2svn to create branch
'escher_x_4_9_integration_point'.
Diffstat (limited to 'TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp')
-rw-r--r-- | TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp | 58 |
1 files changed, 23 insertions, 35 deletions
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp index d43ebc689b1..9dcf33fc81e 100644 --- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp @@ -14,13 +14,11 @@ namespace CIAO const PlanConnectionDescription &src, ::Deployment::PlanSubcomponentPortEndpoints &dest) { - CIAO_TRACE("PSPE_Handler::sub_component_port_endpoints"); - PlanConnectionDescription::internalEndpoint_const_iterator iei_e = src.end_internalEndpoint (); CORBA::ULong pos = 0; dest.length (src.count_internalEndpoint ()); - + for (PlanConnectionDescription::internalEndpoint_const_iterator iei_b = src.begin_internalEndpoint (); iei_b != iei_e; @@ -36,7 +34,6 @@ namespace CIAO const PlanSubcomponentPortEndpoint &src, ::Deployment::PlanSubcomponentPortEndpoint &dest) { - CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint"); dest.portName = src.portName ().c_str (); @@ -50,9 +47,9 @@ namespace CIAO } CORBA::ULong tmp = 0; - IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()), - tmp); - + IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()), + tmp); + dest.instanceRef = tmp; switch (src.kind ().integral ()) @@ -60,38 +57,30 @@ namespace CIAO case CCMComponentPortKind::Facet_l: dest.kind = Deployment::Facet; break; - + case CCMComponentPortKind::SimplexReceptacle_l: dest.kind = Deployment::SimplexReceptacle; break; - + case CCMComponentPortKind::MultiplexReceptacle_l: dest.kind = Deployment::MultiplexReceptacle; break; - + case CCMComponentPortKind::EventEmitter_l: dest.kind = Deployment::EventEmitter; break; - + case CCMComponentPortKind::EventPublisher_l: dest.kind = Deployment::EventPublisher; break; - + case CCMComponentPortKind::EventConsumer_l: dest.kind = Deployment::EventConsumer; break; - - case CCMComponentPortKind::rtecEventPublisher_l: - dest.kind = Deployment::rtecEventPublisher; - break; - - case CCMComponentPortKind::rtecEventConsumer_l: - dest.kind = Deployment::rtecEventConsumer; - break; - + default: ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n")); - + } } @@ -99,44 +88,43 @@ namespace CIAO PSPE_Handler::sub_component_port_endpoint ( const Deployment::PlanSubcomponentPortEndpoint &src) { // @@MAJO - CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse"); XMLSchema::string< char > pname ((src.portName)); XMLSchema::string< char > tval ("true"); XMLSchema::string< char > prov (""); ACE_CString id; IDD_Handler::IDREF.find_ref(src.instanceRef, id); - XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str()); - + XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str()); + if (src.provider) prov = tval; PlanSubcomponentPortEndpoint pspe (pname, - CCMComponentPortKind::Facet, - idref); + CCMComponentPortKind::Facet, + idref); pspe.provider (prov); - + switch (src.kind) - { + { case ::Deployment::Facet: pspe.kind (CCMComponentPortKind::Facet); break; - + case ::Deployment::SimplexReceptacle: pspe.kind (CCMComponentPortKind::SimplexReceptacle); break; - + case ::Deployment::MultiplexReceptacle: pspe.kind (CCMComponentPortKind::MultiplexReceptacle); break; - + case ::Deployment::EventEmitter: pspe.kind (CCMComponentPortKind::EventEmitter); break; - + case ::Deployment::EventPublisher: pspe.kind (CCMComponentPortKind::EventPublisher); break; - + case ::Deployment::EventConsumer: pspe.kind (CCMComponentPortKind::EventConsumer); break; @@ -154,7 +142,7 @@ namespace CIAO break; } - + return pspe; } |