diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-12 21:05:09 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-12 21:05:09 +0000 |
| commit | fdb410a649019981bc004ee2203bbd9b6ca77e07 (patch) | |
| tree | 33991b6d86ab3dfaceef3b7dab1f15678575c01e | |
| parent | 03ecbca04c0c35c93873ded8c540c37415b51a2f (diff) | |
| download | ATCD-fdb410a649019981bc004ee2203bbd9b6ca77e07.tar.gz | |
Tus Apr 12 16:04:21 2005 Gan Deng <dengg@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 5ccdfb439ba..872cf6c6fc7 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Tus Apr 12 16:04:21 2005 Gan Deng <dengg@dre.vanderbilt.edu> + + * DAnCE/Old_Config_Handlers/IAD_Handler.cpp + + Modified to ignore the <dependsOn> tag, since this might + cause a problem where multiple _svnt or multiple _exec + libraries to be specified as implArtifacts of a component + type. + Tue Apr 12 14:35:58 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu> * CIAO-INSTALL.html diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp index 9e4ff47cf28..e75292e2fcb 100644 --- a/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp @@ -10,6 +10,7 @@ #include "Utils.h" #include "Process_Element.h" #include <iostream> +#include <string> BEGIN_DEPLOYMENT_NAMESPACE @@ -49,12 +50,16 @@ void IAD_Handler::process_ImplementationArtifactDescription node_name, "deployRequirement", iad.deployRequirement, &Requirement_Handler::process_Requirement, this->id_map_)); + else if (iad.dependsOn.length () == 0) + ; + /* else if (process_sequence_remote<Deployment::NamedImplementationArtifact, NIA_Handler> (this->doc_, this->iter_, node, node_name, "dependsOn", iad.dependsOn, &NIA_Handler::process_NamedImplementationArtifact, this->id_map_)); + */ else if (process_sequence_common<Deployment::Property> (this->doc_, this->iter_, node, |