diff options
Diffstat (limited to 'TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp')
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index baedfa7d7ea..5618e775bc7 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -92,10 +92,6 @@ namespace CIAO for (j = 0; j < infoProperty_length; ++j) { - if (ACE_OS::strcmp (this->plan_.infoProperty[j].name.in (), - "CIAOServerResources") != 0) - continue; - CIAO::DAnCE::ServerResource *server_resource_def = 0; this->plan_.infoProperty[j].value >>= server_resource_def; @@ -166,12 +162,12 @@ namespace CIAO const Deployment::InstanceDeploymentDescription & instance = this->plan_.instance[i]; - // If this component instance happens to be in the "shared components + // If this component instance happens to be in the "shared components // list", then we ignore it, otherwise we shall install it. ACE_CString name (instance.name.in ()); if (this->is_shared_component (name)) continue; - + if (! this->insert_instance_into_map (instance)) return false; } @@ -245,10 +241,6 @@ namespace CIAO // the modeling tool should make sure of // uniqueness, i.e., one component implementation // should have only 1 _svnt and 1 _exec libs. - if ((pos = tmp.find ("_stub")) != ACE_CString::npos || - (pos = tmp.find ("_Stub")) != ACE_CString::npos) - continue; // We ignore _stub artifact since it's not used. - if (!svnt_found && ((pos = tmp.find ("_svnt")) != ACE_CString::npos || (pos = tmp.find ("_Svnt")) != ACE_CString::npos)) @@ -266,7 +258,7 @@ namespace CIAO CORBA::string_dup (arti.location[0].in ()); // Get the entry point. - const CORBA::ULong prop_length = arti.execParameter.length (); + const CORBA::ULong prop_length = arti.execParameter.length (); for (CORBA::ULong prop_num = 0; prop_num < prop_length; @@ -302,7 +294,7 @@ namespace CIAO } exec_found = true; - // Copy the servant dll/so name. + // Cpoy the servant dll/so name. // @@ Note: I ignore all the other locations except the first one. exec_found = true; impl_infos[i].executor_dll = |