diff options
author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-01 21:32:05 +0000 |
---|---|---|
committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-01 21:32:05 +0000 |
commit | 277818ea5ecc63722a0acb2b79dcdea8f3f79862 (patch) | |
tree | 5307fcb47dd8134d4aefe5f4553ac2864fda6827 | |
parent | 961288ffb29074b4382e046c14a8540eea3e7cf9 (diff) | |
download | ATCD-277818ea5ecc63722a0acb2b79dcdea8f3f79862.tar.gz |
Tue Jun 1 21:29:09 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/Config_Handlers/ADD_Handler.cpp:
* DAnCE/Config_Handlers/CPD_Handler.cpp:
* DAnCE/Config_Handlers/DP_Handler.cpp:
* DAnCE/Config_Handlers/DataType_Handler.cpp:
* DAnCE/Config_Handlers/DnC_Dump.cpp:
* DAnCE/Config_Handlers/DnC_Dump_T.cpp:
* DAnCE/Config_Handlers/Dump_Obj.cpp:
* DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp:
* DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp:
* DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp:
* DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp:
* DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp:
* DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp:
* DAnCE/Config_Handlers/IDD_Handler.cpp:
* DAnCE/Config_Handlers/MDD_Handler.cpp:
* DAnCE/Config_Handlers/PSPE_Handler.cpp:
* DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp:
* DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp:
* DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp:
* DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp:
* DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp:
Converted to using DANCE_{ERROR,DEBUG} in lieu of ACE_ constructs.
* DAnCE/Config_Handlers/XML_File_Intf.cpp:
Pass Config_Error exceptions through.
* DAnCE/Plan_Launcher/Plan_Launcher.cpp:
* DAnCE/tools/Convert_Plan/Convert_Plan.cpp:
* DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp:
Proper exception handling to pass useful diagnostic to user in case of
parse error.
26 files changed, 253 insertions, 189 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 02b8cb726d6..6fc32e89350 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,11 +1,48 @@ +Tue Jun 1 21:29:09 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/Config_Handlers/ADD_Handler.cpp: + * DAnCE/Config_Handlers/CPD_Handler.cpp: + * DAnCE/Config_Handlers/DP_Handler.cpp: + * DAnCE/Config_Handlers/DataType_Handler.cpp: + * DAnCE/Config_Handlers/DnC_Dump.cpp: + * DAnCE/Config_Handlers/DnC_Dump_T.cpp: + * DAnCE/Config_Handlers/Dump_Obj.cpp: + * DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp: + * DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: + * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: + * DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: + * DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: + * DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp: + * DAnCE/Config_Handlers/IDD_Handler.cpp: + * DAnCE/Config_Handlers/MDD_Handler.cpp: + * DAnCE/Config_Handlers/PSPE_Handler.cpp: + * DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp: + * DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp: + * DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp: + * DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp: + * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp: + + Converted to using DANCE_{ERROR,DEBUG} in lieu of ACE_ constructs. + + * DAnCE/Config_Handlers/XML_File_Intf.cpp: + + Pass Config_Error exceptions through. + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp: + * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: + * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: + + Proper exception handling to pass useful diagnostic to user in case of + parse error. + Tue Jun 1 19:45:51 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * tools/IDL3_to_IDL2/identifier_helper.cpp(orig_sn): - + Added generation of a leading '::' to all scoped names. - + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - + Added a template and a non-template attribute declaration in a porttype, to test support of that language feature. diff --git a/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp index 614a20190c0..6b7989f9d09 100644 --- a/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp @@ -95,7 +95,7 @@ namespace CIAO } else { - ACE_ERROR ((LM_ERROR, + DANCE_DEBUG (1, (LM_ERROR, "(%P|%t) Warning: ADD %s has no idref.\n", ACE_TEXT_ALWAYS_CHAR ( src.name ().c_str ()))); } diff --git a/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp index 70fbd104390..22714c6c3a0 100644 --- a/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp @@ -55,7 +55,7 @@ namespace CIAO break; default: - ACE_ERROR ((LM_ERROR, "Invalid port type in connection %s\n", + DANCE_DEBUG (1, (LM_ERROR, "Invalid port type in connection %s\n", desc.name ().c_str ())); throw 1; } @@ -136,7 +136,7 @@ namespace CIAO break; default: - ACE_ERROR ((LM_ERROR, ACE_TEXT("Invalid port kind in connection %C\n"), + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT("Invalid port kind in connection %C\n"), name.c_str ())); } diff --git a/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp index c045e15c17c..6ccda30d409 100644 --- a/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp @@ -213,7 +213,7 @@ ACE_RCSID (Config_Handlers, if (ACE_OS::strcmp (plan.infoProperty[q].name.in (), "CIAOServerResources") == 0) { - ACE_ERROR ((LM_ERROR, + DANCE_DEBUG (1, (LM_ERROR, "(%P|%t) DP_Handler: Dumping of ServerResources not currently supported.")); continue; } @@ -229,7 +229,7 @@ ACE_RCSID (Config_Handlers, this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes)); if (!this->xsc_dp_->realizes_p()) { - ACE_ERROR ((LM_ERROR, + DANCE_DEBUG (1, (LM_ERROR, "(%P|%t) DP_Handler: " "Error parsing Component Interface Descriptor.")); return false; diff --git a/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp index 57318d35a4a..c29382a9d3b 100644 --- a/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp @@ -100,7 +100,7 @@ namespace CIAO break; default: - ACE_ERROR ((LM_ERROR, "DataType_Handler::data_type, Invalid typecode in any\n")); + DANCE_DEBUG (1, (LM_ERROR, "DataType_Handler::data_type, Invalid typecode in any\n")); throw 1; } @@ -170,7 +170,7 @@ namespace CIAO case CORBA::tk_TypeCode: return DataType (TCKind::tk_TypeCode); default: - ACE_ERROR ((LM_ERROR, "DataType_Handler::data_type, Invalid typecode\n")); + DANCE_DEBUG (1, (LM_ERROR, "DataType_Handler::data_type, Invalid typecode\n")); throw 1; } throw 1; diff --git a/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp b/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp index 3bee947afd3..1a5c4d8b57e 100644 --- a/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp +++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp @@ -21,9 +21,9 @@ namespace Deployment for (CORBA::ULong i = 0; i < size; ++i) { - ACE_DEBUG ((LM_DEBUG, "%s%s %d:\n", + DANCE_DEBUG (1, (LM_DEBUG, "%s%s %d:\n", Dump_Obj::indent(), caption, i)); - ACE_DEBUG ((LM_DEBUG, "%s %s:\n", + DANCE_DEBUG (1, (LM_DEBUG, "%s %s:\n", Dump_Obj::indent(), str_seq[i].in ())); } } @@ -32,14 +32,14 @@ namespace Deployment // Dumps a string void DnC_Dump::dump (const char* caption, const TAO::String_Manager& str) { - ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), + DANCE_DEBUG (1, (LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), caption, str.in())); } // Dumps a boolean void DnC_Dump::dump (const char* caption, const CORBA::Boolean& val) { - ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), + DANCE_DEBUG (1, (LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), caption, val ? "true" : "false")); } @@ -53,17 +53,17 @@ namespace Deployment Dump_Obj dump_obj("SatisfierProperty"); dump ("name", sp.name); - ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%skind: ", Dump_Obj::indent())); switch (sp.kind) { - case Quantity: ACE_DEBUG ((LM_DEBUG, "Quantity\n")); break; - case Capacity: ACE_DEBUG ((LM_DEBUG, "Capacity\n")); break; - case Minimum: ACE_DEBUG ((LM_DEBUG, "Minimum\n")); break; - case Maximum: ACE_DEBUG ((LM_DEBUG, "Maximum\n")); break; - case Attribute: ACE_DEBUG ((LM_DEBUG, "Attribute\n")); break; - case Selection: ACE_DEBUG ((LM_DEBUG, "Selection\n")); break; + case Quantity: DANCE_DEBUG (1, (LM_DEBUG, "Quantity\n")); break; + case Capacity: DANCE_DEBUG (1, (LM_DEBUG, "Capacity\n")); break; + case Minimum: DANCE_DEBUG (1, (LM_DEBUG, "Minimum\n")); break; + case Maximum: DANCE_DEBUG (1, (LM_DEBUG, "Maximum\n")); break; + case Attribute: DANCE_DEBUG (1, (LM_DEBUG, "Attribute\n")); break; + case Selection: DANCE_DEBUG (1, (LM_DEBUG, "Selection\n")); break; } - ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%svalue:\n", Dump_Obj::indent())); dump (sp.value); } @@ -206,15 +206,15 @@ namespace Deployment dump ("exclusiveUser", compportdesc.exclusiveUser); dump ("optional", compportdesc.optional); - ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%skind: ", Dump_Obj::indent())); switch (compportdesc.kind) { - case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break; - case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break; - case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break; - case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break; - case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break; - case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break; - default: ACE_DEBUG ((LM_DEBUG, "Unknown port kind\n")); break; + case Facet: DANCE_DEBUG (1, (LM_DEBUG, "Facet\n")); break; + case SimplexReceptacle: DANCE_DEBUG (1, (LM_DEBUG, "SimplexReceptacle\n")); break; + case MultiplexReceptacle: DANCE_DEBUG (1, (LM_DEBUG, "MultiplexReceptacle\n")); break; + case EventEmitter: DANCE_DEBUG (1, (LM_DEBUG, "EventEmitter\n")); break; + case EventPublisher: DANCE_DEBUG (1, (LM_DEBUG, "EventPublisher\n")); break; + case EventConsumer: DANCE_DEBUG (1, (LM_DEBUG, "EventConsumer\n")); break; + default: DANCE_DEBUG (1, (LM_DEBUG, "Unknown port kind\n")); break; } } @@ -226,45 +226,45 @@ namespace Deployment dump ("name", comppropdesc.name); - ACE_DEBUG ((LM_DEBUG, "%stype: ", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%stype: ", Dump_Obj::indent())); switch (comppropdesc.type.in()->kind()) { - case ::CORBA::tk_null: ACE_DEBUG ((LM_DEBUG, "tk_null\n")); break; - case ::CORBA::tk_void: ACE_DEBUG ((LM_DEBUG, "tk_void\n")); break; - case ::CORBA::tk_short: ACE_DEBUG ((LM_DEBUG, "tk_short\n")); break; - case ::CORBA::tk_long: ACE_DEBUG ((LM_DEBUG, "tk_long\n")); break; - case ::CORBA::tk_ushort: ACE_DEBUG ((LM_DEBUG, "tk_ushort\n")); break; - case ::CORBA::tk_ulong: ACE_DEBUG ((LM_DEBUG, "tk_ulong\n")); break; - case ::CORBA::tk_float: ACE_DEBUG ((LM_DEBUG, "tk_float\n")); break; - case ::CORBA::tk_double: ACE_DEBUG ((LM_DEBUG, "tk_double\n")); break; - case ::CORBA::tk_boolean: ACE_DEBUG ((LM_DEBUG, "tk_boolean\n")); break; - case ::CORBA::tk_char: ACE_DEBUG ((LM_DEBUG, "tk_char\n")); break; - case ::CORBA::tk_octet: ACE_DEBUG ((LM_DEBUG, "tk_octet\n")); break; - case ::CORBA::tk_any: ACE_DEBUG ((LM_DEBUG, "tk_any\n")); break; - case ::CORBA::tk_TypeCode: ACE_DEBUG ((LM_DEBUG, "tk_TypeCode\n")); break; - case ::CORBA::tk_Principal: ACE_DEBUG ((LM_DEBUG, "tk_Principal\n")); break; - case ::CORBA::tk_objref: ACE_DEBUG ((LM_DEBUG, "tk_objref\n")); break; - case ::CORBA::tk_struct: ACE_DEBUG ((LM_DEBUG, "tk_struct\n")); break; - case ::CORBA::tk_union: ACE_DEBUG ((LM_DEBUG, "tk_union\n")); break; - case ::CORBA::tk_enum: ACE_DEBUG ((LM_DEBUG, "tk_enum\n")); break; - case ::CORBA::tk_string: ACE_DEBUG ((LM_DEBUG, "tk_string\n")); break; - case ::CORBA::tk_sequence: ACE_DEBUG ((LM_DEBUG, "tk_sequence\n")); break; - case ::CORBA::tk_array: ACE_DEBUG ((LM_DEBUG, "tk_array\n")); break; - case ::CORBA::tk_alias: ACE_DEBUG ((LM_DEBUG, "tk_alias\n")); break; - case ::CORBA::tk_except: ACE_DEBUG ((LM_DEBUG, "tk_except\n")); break; - case ::CORBA::tk_longlong: ACE_DEBUG ((LM_DEBUG, "tk_longlong\n")); break; - case ::CORBA::tk_ulonglong: ACE_DEBUG ((LM_DEBUG, "tk_ulonglong\n")); break; - case ::CORBA::tk_longdouble: ACE_DEBUG ((LM_DEBUG, "tk_longdouble\n")); break; - case ::CORBA::tk_wchar: ACE_DEBUG ((LM_DEBUG, "tk_wchar\n")); break; - case ::CORBA::tk_wstring: ACE_DEBUG ((LM_DEBUG, "tk_wstring\n")); break; - case ::CORBA::tk_fixed: ACE_DEBUG ((LM_DEBUG, "tk_fixed\n")); break; - case ::CORBA::tk_value: ACE_DEBUG ((LM_DEBUG, "tk_value\n")); break; - case ::CORBA::tk_value_box: ACE_DEBUG ((LM_DEBUG, "tk_value_box\n")); break; - case ::CORBA::tk_native: ACE_DEBUG ((LM_DEBUG, "tk_native\n")); break; - case ::CORBA::tk_abstract_interface: ACE_DEBUG ((LM_DEBUG, "tk_abstract_interface\n")); break; - case ::CORBA::tk_local_interface: ACE_DEBUG ((LM_DEBUG, "tk_local_interface\n")); break; - case ::CORBA::tk_component: ACE_DEBUG ((LM_DEBUG, "tk_component\n")); break; - case ::CORBA::tk_home: ACE_DEBUG ((LM_DEBUG, "tk_home\n")); break; - case ::CORBA::tk_event: ACE_DEBUG ((LM_DEBUG, "tk_event\n")); break; + case ::CORBA::tk_null: DANCE_DEBUG (1, (LM_DEBUG, "tk_null\n")); break; + case ::CORBA::tk_void: DANCE_DEBUG (1, (LM_DEBUG, "tk_void\n")); break; + case ::CORBA::tk_short: DANCE_DEBUG (1, (LM_DEBUG, "tk_short\n")); break; + case ::CORBA::tk_long: DANCE_DEBUG (1, (LM_DEBUG, "tk_long\n")); break; + case ::CORBA::tk_ushort: DANCE_DEBUG (1, (LM_DEBUG, "tk_ushort\n")); break; + case ::CORBA::tk_ulong: DANCE_DEBUG (1, (LM_DEBUG, "tk_ulong\n")); break; + case ::CORBA::tk_float: DANCE_DEBUG (1, (LM_DEBUG, "tk_float\n")); break; + case ::CORBA::tk_double: DANCE_DEBUG (1, (LM_DEBUG, "tk_double\n")); break; + case ::CORBA::tk_boolean: DANCE_DEBUG (1, (LM_DEBUG, "tk_boolean\n")); break; + case ::CORBA::tk_char: DANCE_DEBUG (1, (LM_DEBUG, "tk_char\n")); break; + case ::CORBA::tk_octet: DANCE_DEBUG (1, (LM_DEBUG, "tk_octet\n")); break; + case ::CORBA::tk_any: DANCE_DEBUG (1, (LM_DEBUG, "tk_any\n")); break; + case ::CORBA::tk_TypeCode: DANCE_DEBUG (1, (LM_DEBUG, "tk_TypeCode\n")); break; + case ::CORBA::tk_Principal: DANCE_DEBUG (1, (LM_DEBUG, "tk_Principal\n")); break; + case ::CORBA::tk_objref: DANCE_DEBUG (1, (LM_DEBUG, "tk_objref\n")); break; + case ::CORBA::tk_struct: DANCE_DEBUG (1, (LM_DEBUG, "tk_struct\n")); break; + case ::CORBA::tk_union: DANCE_DEBUG (1, (LM_DEBUG, "tk_union\n")); break; + case ::CORBA::tk_enum: DANCE_DEBUG (1, (LM_DEBUG, "tk_enum\n")); break; + case ::CORBA::tk_string: DANCE_DEBUG (1, (LM_DEBUG, "tk_string\n")); break; + case ::CORBA::tk_sequence: DANCE_DEBUG (1, (LM_DEBUG, "tk_sequence\n")); break; + case ::CORBA::tk_array: DANCE_DEBUG (1, (LM_DEBUG, "tk_array\n")); break; + case ::CORBA::tk_alias: DANCE_DEBUG (1, (LM_DEBUG, "tk_alias\n")); break; + case ::CORBA::tk_except: DANCE_DEBUG (1, (LM_DEBUG, "tk_except\n")); break; + case ::CORBA::tk_longlong: DANCE_DEBUG (1, (LM_DEBUG, "tk_longlong\n")); break; + case ::CORBA::tk_ulonglong: DANCE_DEBUG (1, (LM_DEBUG, "tk_ulonglong\n")); break; + case ::CORBA::tk_longdouble: DANCE_DEBUG (1, (LM_DEBUG, "tk_longdouble\n")); break; + case ::CORBA::tk_wchar: DANCE_DEBUG (1, (LM_DEBUG, "tk_wchar\n")); break; + case ::CORBA::tk_wstring: DANCE_DEBUG (1, (LM_DEBUG, "tk_wstring\n")); break; + case ::CORBA::tk_fixed: DANCE_DEBUG (1, (LM_DEBUG, "tk_fixed\n")); break; + case ::CORBA::tk_value: DANCE_DEBUG (1, (LM_DEBUG, "tk_value\n")); break; + case ::CORBA::tk_value_box: DANCE_DEBUG (1, (LM_DEBUG, "tk_value_box\n")); break; + case ::CORBA::tk_native: DANCE_DEBUG (1, (LM_DEBUG, "tk_native\n")); break; + case ::CORBA::tk_abstract_interface: DANCE_DEBUG (1, (LM_DEBUG, "tk_abstract_interface\n")); break; + case ::CORBA::tk_local_interface: DANCE_DEBUG (1, (LM_DEBUG, "tk_local_interface\n")); break; + case ::CORBA::tk_component: DANCE_DEBUG (1, (LM_DEBUG, "tk_component\n")); break; + case ::CORBA::tk_home: DANCE_DEBUG (1, (LM_DEBUG, "tk_home\n")); break; + case ::CORBA::tk_event: DANCE_DEBUG (1, (LM_DEBUG, "tk_event\n")); break; default: break; }; @@ -319,13 +319,13 @@ namespace Deployment void DnC_Dump::dump(const Deployment::ResourceUsageKind &ruk) { - ACE_DEBUG ((LM_DEBUG, "%sresourceUsage: ", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%sresourceUsage: ", Dump_Obj::indent())); switch (ruk) { - case None: ACE_DEBUG ((LM_DEBUG, "None\n")); break; - case InstanceUsesResource: ACE_DEBUG ((LM_DEBUG, "InstanceUsesResource\n")); break; - case ResourceUsesInstance: ACE_DEBUG ((LM_DEBUG, "ResourceUsesInstance\n")); break; - case PortUsesResource: ACE_DEBUG ((LM_DEBUG, "PortUsesResource\n")); break; - case ResourceUsesPort: ACE_DEBUG ((LM_DEBUG, "ResourceUsesPort\n")); break; + case None: DANCE_DEBUG (1, (LM_DEBUG, "None\n")); break; + case InstanceUsesResource: DANCE_DEBUG (1, (LM_DEBUG, "InstanceUsesResource\n")); break; + case ResourceUsesInstance: DANCE_DEBUG (1, (LM_DEBUG, "ResourceUsesInstance\n")); break; + case PortUsesResource: DANCE_DEBUG (1, (LM_DEBUG, "PortUsesResource\n")); break; + case ResourceUsesPort: DANCE_DEBUG (1, (LM_DEBUG, "ResourceUsesPort\n")); break; } } @@ -338,7 +338,7 @@ namespace Deployment dump (irdd.resourceUsage); dump ("requirementName", irdd.requirementName); dump ("resourceName", irdd.resourceName); - ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); dump_sequence ("property", irdd.property); } @@ -380,15 +380,15 @@ namespace Deployment dump ("portName", pspe.portName); dump ("provider", pspe.provider); - ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%skind: ", Dump_Obj::indent())); switch (pspe.kind) { - case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break; - case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break; - case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break; - case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break; - case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break; - case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break; - default: ACE_DEBUG ((LM_DEBUG, "Unknown port kind\n")); break; + case Facet: DANCE_DEBUG (1, (LM_DEBUG, "Facet\n")); break; + case SimplexReceptacle: DANCE_DEBUG (1, (LM_DEBUG, "SimplexReceptacle\n")); break; + case MultiplexReceptacle: DANCE_DEBUG (1, (LM_DEBUG, "MultiplexReceptacle\n")); break; + case EventEmitter: DANCE_DEBUG (1, (LM_DEBUG, "EventEmitter\n")); break; + case EventPublisher: DANCE_DEBUG (1, (LM_DEBUG, "EventPublisher\n")); break; + case EventConsumer: DANCE_DEBUG (1, (LM_DEBUG, "EventConsumer\n")); break; + default: DANCE_DEBUG (1, (LM_DEBUG, "Unknown port kind\n")); break; } #if (_MSC_VER) dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef, @@ -415,7 +415,7 @@ namespace Deployment dump ("targetName", crdd.targetName); dump ("requirementName", crdd.requirementName); dump ("resourceName", crdd.resourceName); - ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); dump_sequence ("properties", crdd.property); } @@ -478,7 +478,7 @@ namespace Deployment dump ("requirementName", rdd.requirementName); dump ("resourceName", rdd.resourceName); - ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent())); dump_sequence ("properties", rdd.property); } @@ -555,7 +555,7 @@ namespace Deployment a >>= v; - ACE_DEBUG ((LM_DEBUG, "%sinstance: %s\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sinstance: %s\n", Dump_Obj::indent (), v->instance[value].name.in ())); } @@ -588,7 +588,7 @@ namespace Deployment a >>= v; - ACE_DEBUG ((LM_DEBUG, "%sinstance: %s\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sinstance: %s\n", Dump_Obj::indent (), v->instance[value].name.in ())); } @@ -688,7 +688,7 @@ namespace Deployment dump ("label", cid.label); dump ("UUID", cid.UUID); - ACE_DEBUG ((LM_DEBUG, "%sImplements:\n", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%sImplements:\n", Dump_Obj::indent())); dump (cid.implements); dump_sequence ("assemblyImpl", cid.assemblyImpl); dump_sequence ("monolithicImpl", cid.monolithicImpl); @@ -705,7 +705,7 @@ namespace Deployment Dump_Obj dump_obj("PackagedComponentImplementation"); dump ("Name", pci.name); - ACE_DEBUG ((LM_DEBUG, + DANCE_DEBUG (1, (LM_DEBUG, "%sreferencedImplementation:\n", Dump_Obj::indent())); DnC_Dump::dump (pci.referencedImplementation); } @@ -719,7 +719,7 @@ namespace Deployment dump ("label", comppkgdesc.label); dump ("UUID", comppkgdesc.UUID); - ACE_DEBUG ((LM_DEBUG, "%srealizes:\n", Dump_Obj::indent ())); + DANCE_DEBUG (1, (LM_DEBUG, "%srealizes:\n", Dump_Obj::indent ())); DnC_Dump::dump (comppkgdesc.realizes); // ComponentInterfaceDescription dump_sequence ("configProperty", comppkgdesc.configProperty); dump_sequence ("implementation", comppkgdesc.implementation); @@ -746,7 +746,7 @@ namespace Deployment { Dump_Obj dump_obj("Property"); dump ("name", property.name); - ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent())); + DANCE_DEBUG (1, (LM_DEBUG, "%svalue:\n", Dump_Obj::indent())); dump (property.value); } @@ -762,33 +762,33 @@ namespace Deployment CORBA::Short temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\ encoded different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), temp)); } break; case CORBA::tk_null: - ACE_DEBUG ((LM_DEBUG, "%sAny value: null value encoded\n", + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: null value encoded\n", Dump_Obj::indent ())); break; case CORBA::tk_void: - ACE_DEBUG ((LM_DEBUG, "Any value: void type encoded\n")); + DANCE_DEBUG (1, (LM_DEBUG, "Any value: void type encoded\n")); break; case CORBA::tk_long: { CORBA::Long temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected long\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), temp)); } break; @@ -798,11 +798,11 @@ encoded with different type")); CORBA::UShort temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %u\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %u\n", Dump_Obj::indent (), temp)); } break; @@ -812,11 +812,11 @@ encoded with different type")); CORBA::ULong temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %u\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %u\n", Dump_Obj::indent (), temp)); } break; @@ -826,11 +826,11 @@ encoded with different type")); CORBA::Float temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected float\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %f\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %f\n", Dump_Obj::indent (), temp)); } break; @@ -839,11 +839,11 @@ encoded with different type")); CORBA::Double temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected double\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %f\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %f\n", Dump_Obj::indent (), temp)); } break; @@ -852,15 +852,15 @@ encoded with different type")); CORBA::Boolean temp; if (! (any >>= CORBA::Any::to_boolean (temp))) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\ encoded with different type")); throw CORBA::INTERNAL (); } if (temp) - ACE_DEBUG ((LM_DEBUG, "Any value: True\n")); + DANCE_DEBUG (1, (LM_DEBUG, "Any value: True\n")); else - ACE_DEBUG ((LM_DEBUG, "Any value: False\n")); + DANCE_DEBUG (1, (LM_DEBUG, "Any value: False\n")); } break; @@ -869,11 +869,11 @@ encoded with different type")); CORBA::Char temp; if (! (any >>= CORBA::Any::to_char (temp))) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected char\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %c\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %c\n", Dump_Obj::indent (), temp)); } break; @@ -883,11 +883,11 @@ encoded with different type")); CORBA::Octet temp; if (! (any >>= CORBA::Any::to_octet (temp))) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), temp)); } break; @@ -897,11 +897,11 @@ encoded with different type")); const char * temp = 0; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected string\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %s\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %s\n", Dump_Obj::indent (), temp)); } break; @@ -910,11 +910,11 @@ encoded with different type")); CORBA::LongLong temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %l\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %l\n", Dump_Obj::indent (), temp)); } break; @@ -924,11 +924,11 @@ encoded with different type")); CORBA::LongDouble temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (), temp)); } @@ -938,11 +938,11 @@ encoded with different type")); CORBA::WChar temp; if (! (any >>= CORBA::Any::to_wchar (temp))) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %c\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %c\n", Dump_Obj::indent (), temp)); } break; @@ -952,11 +952,11 @@ encoded with different type")); const CORBA::WChar * temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\ encoded with different type")); throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, "%sAny value: %s\n", Dump_Obj::indent (), + DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: %s\n", Dump_Obj::indent (), temp)); } break; @@ -966,16 +966,16 @@ encoded with different type")); /* CORBA::Enum temp; if (! (any >>= temp)) { - ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected enum \ + DANCE_DEBUG (1, (LM_DEBUG, "DnC::dump (CORBA::Any) expected enum \ encoded with different type")); throw CORBA::INTERNAL (); } -*/ ACE_DEBUG ((LM_DEBUG, "%sAny value: some enum\n", Dump_Obj::indent ())); +*/ DANCE_DEBUG (1, (LM_DEBUG, "%sAny value: some enum\n", Dump_Obj::indent ())); } break; default: - ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n")); + DANCE_DEBUG (1, (LM_DEBUG, "Unknown type encoded in Any\n")); throw CORBA::INTERNAL (); } } diff --git a/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp index 0f95945fb0f..3aa858c39e2 100644 --- a/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp +++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp @@ -4,7 +4,7 @@ #include "DnC_Dump.h" #include "DnC_Dump_T.h" #include "Dump_Obj.h" - +#include "Logger/Log_Macros.h" ACE_RCSID (Config_Handlers, DnC_Dump_T, "$Id$") @@ -19,7 +19,7 @@ ACE_RCSID (Config_Handlers, dump_ref (const char* caption, REFERENCE& ref, const char* root, DATA_TYPE CLASS::*data) { - ACE_DEBUG ((LM_DEBUG, "%s%s:\n", + DANCE_DEBUG (1, (LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption)); const CORBA::Any &val = Dump_Obj::desc (root); @@ -31,7 +31,7 @@ ACE_RCSID (Config_Handlers, const ROOT &root_obj = *t; int value = ref; - ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n", + DANCE_DEBUG (1, (LM_DEBUG, "%s%s.name: %s\n", Dump_Obj::indent(), caption, (root_obj.*data)[value].name.in())); } @@ -43,7 +43,7 @@ ACE_RCSID (Config_Handlers, dump_ref_seq (const char* caption, SEQUENCE& seq, const char* root, DATA_TYPE CLASS::*data) { - ACE_DEBUG ((LM_DEBUG, + DANCE_DEBUG (1, (LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption)); @@ -60,7 +60,7 @@ ACE_RCSID (Config_Handlers, const ROOT &root_obj = *t; int value = seq[i]; - ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n", + DANCE_DEBUG (1, (LM_DEBUG, "%s%s[%d].name: %s\n", Dump_Obj::indent(), caption, i, (root_obj.*data)[value].name.in())); } @@ -79,7 +79,7 @@ ACE_RCSID (Config_Handlers, for (CORBA::ULong i = 0; i < size; ++i) { - ACE_DEBUG ((LM_DEBUG, "%s%s %d:\n", Dump_Obj::indent(), + DANCE_DEBUG (1, (LM_DEBUG, "%s%s %d:\n", Dump_Obj::indent(), caption, i)); DnC_Dump::dump (seq[i]); } diff --git a/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp b/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp index b2cc34fd089..0c411db8e74 100644 --- a/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp +++ b/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Dump_Obj.h" #include "ace/Log_Msg.h" +#include "Logger/Log_Macros.h" ACE_RCSID (Config_Handlers, Dump_Obj, @@ -15,7 +16,7 @@ ACE_RCSID (Config_Handlers, Dump_Obj::Dump_Obj(const char* caption) : desc_() { - ACE_DEBUG ((LM_DEBUG, "%C%C:\n", indent_.c_str(), caption)); + DANCE_DEBUG (1, (LM_DEBUG, "%C%C:\n", indent_.c_str(), caption)); indent_.append(" "); } @@ -24,7 +25,7 @@ ACE_RCSID (Config_Handlers, CORBA::Any &val) : desc_(caption) { - ACE_DEBUG ((LM_DEBUG, "%C%C:\n", + DANCE_DEBUG (1, (LM_DEBUG, "%C%C:\n", indent_.c_str(), caption)); @@ -32,7 +33,7 @@ ACE_RCSID (Config_Handlers, if (desc_map_.find (std::string (caption)) != desc_map_.end()) { - ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \ + DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \ The item with name %C is already in \ the node map.\n", caption)); throw Node_Exist(); @@ -54,7 +55,7 @@ the node map.\n", caption)); } else { - ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \ + DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \ The item with name %C is not in the node map.\n", desc_.c_str())); throw Node_Not_Exist(); diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp index 0e2bfe0e411..85b3689fba4 100644 --- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp @@ -97,7 +97,7 @@ namespace CIAO{ default: - ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n")); + DANCE_DEBUG (1, (LM_ERROR, "Invalid typecode in any\n")); throw Config_Error ("", "Invalid typecode"); } @@ -169,7 +169,7 @@ namespace CIAO{ case CORBA::tk_TypeCode: type.kind (TCKind::tk_TypeCode); default: - ACE_ERROR ((LM_ERROR, "Invalid typecode\n")); + DANCE_DEBUG (1, (LM_ERROR, "Invalid typecode\n")); throw Config_Error ("", "Invalid typecode"); } diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp index a16e5c882c1..edbb7b6435c 100644 --- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp @@ -2,7 +2,7 @@ #include "DynAlias_Handler.h" #include "DynAny_Handler.h" - +#include "Logger/Log_Macros.h" #include "Basic_Deployment_Data.hpp" #include "Common.h" @@ -43,7 +43,7 @@ namespace CIAO // ========== BASIC TYPES case TCKind::tk_null_l: case TCKind::tk_void_l: - ACE_ERROR ((LM_WARNING, "I don't know how to handle null or void types\n")); + DANCE_DEBUG (1, (LM_WARNING, "I don't know how to handle null or void types\n")); case TCKind::tk_short_l: retval->insert_short (CORBA::Short (static_cast < ::XMLSchema::short_ const & > (*value.begin_short ()))); @@ -127,7 +127,7 @@ namespace CIAO case TCKind::tk_component_l: case TCKind::tk_home_l: case TCKind::tk_event_l: - ACE_ERROR ((LM_ERROR, "Type not supported\n")); + DANCE_DEBUG (1, (LM_ERROR, "Type not supported\n")); throw Config_Error ("", "Type not supported"); } */ @@ -137,7 +137,7 @@ namespace CIAO } catch (DynamicAny::DynAny::InvalidValue) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ") + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ") ACE_TEXT ("initialize an instance of enumerated type %s\n"), type.alias ().typeId ().c_str ())); throw Config_Error (type.alias ().typeId (), @@ -145,7 +145,7 @@ namespace CIAO } catch (Config_Error &ex) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("DynAlias_Handler caught Config_Error\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("DynAlias_Handler caught Config_Error\n"))); if (type.alias_p ()) ex.add_name (type.alias ().typeId ()); @@ -153,7 +153,7 @@ namespace CIAO } catch (...) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("DynAlias_Handler caught unknown exception\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("DynAlias_Handler caught unknown exception\n"))); throw Config_Error (type.alias ().typeId (), ACE_TEXT ("Unknown exception")); } @@ -163,7 +163,7 @@ namespace CIAO DynAlias_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn) { ACE_UNUSED_ARG (dyn); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Extracting Enums not yet supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Extracting Enums not yet supported\n"))); } CORBA::TypeCode_ptr @@ -171,7 +171,7 @@ namespace CIAO { if (!type.alias_p ()) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Alias type description required"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("ERROR: Alias type description required"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Did not find expected alias type description, tk_kind may be wrong.")); } diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp index 53c056f57ef..ccf79680fed 100644 --- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp @@ -2,6 +2,7 @@ #include /**/ "ace/pre.h" +#include "Logger/Log_Macros.h" #include "DynAny_Handler.h" #include "DynEnum_Handler.h" #include "DynSequence_Handler.h" @@ -28,7 +29,7 @@ namespace CIAO if (CORBA::is_nil (daf_.in ())) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to narrow Dynamic Any factory\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Unable to narrow Dynamic Any factory\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Unable to narrow DynAny factory")); } } @@ -64,7 +65,7 @@ namespace CIAO // ========== BASIC TYPES case TCKind::tk_null_l: case TCKind::tk_void_l: - ACE_ERROR ((LM_WARNING, ACE_TEXT ("I don't know how to handle null or void types\n"))); + DANCE_DEBUG (1, (LM_WARNING, ACE_TEXT ("I don't know how to handle null or void types\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Null or void types not supported")); break; @@ -176,7 +177,7 @@ namespace CIAO case TCKind::tk_component_l: case TCKind::tk_home_l: case TCKind::tk_event_l: - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Type not supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Type not supported\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported")); } @@ -255,7 +256,7 @@ namespace CIAO case CORBA::tk_TypeCode: case ::CORBA::tk_null: default: - ACE_ERROR ((LM_ERROR, ACE_TEXT ("DynAny_Handler: I have no idea how to perform a referse mapping.\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("DynAny_Handler: I have no idea how to perform a referse mapping.\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("reverse mapping for this type not supported")); } #endif @@ -272,7 +273,7 @@ namespace CIAO // ========== BASIC TYPES case TCKind::tk_null_l: case TCKind::tk_void_l: - ACE_ERROR ((LM_WARNING, ACE_TEXT ("I don't know how to handle null or void types\n"))); + DANCE_DEBUG (1, (LM_WARNING, ACE_TEXT ("I don't know how to handle null or void types\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Null or void types not supported")); break; @@ -362,7 +363,7 @@ namespace CIAO case TCKind::tk_component_l: case TCKind::tk_home_l: case TCKind::tk_event_l: - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Type not supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Type not supported\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported")); } diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp index 2b01a870ba6..0a4f8c41922 100644 --- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp @@ -2,7 +2,7 @@ #include "DynEnum_Handler.h" #include "DynAny_Handler.h" - +#include "Logger/Log_Macros.h" #include "Basic_Deployment_Data.hpp" #include "Common.h" @@ -41,7 +41,7 @@ namespace CIAO } catch (DynamicAny::DynAny::InvalidValue) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ") + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ") ACE_TEXT ("initialize an instance of enumerated type %s\n"), type.enum_ ().typeId ().c_str ())); throw Config_Error (type.enum_ ().typeId (), @@ -49,7 +49,7 @@ namespace CIAO } catch (Config_Error &ex) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("DynEnum_Handler caught Config_Error\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("DynEnum_Handler caught Config_Error\n"))); if (type.enum_p ()) ex.add_name (type.enum_ ().typeId ()); @@ -57,7 +57,7 @@ namespace CIAO } catch (...) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("DynEnum_Handler caught unknown exception\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("DynEnum_Handler caught unknown exception\n"))); throw Config_Error (type.enum_ ().typeId (), ACE_TEXT ("Unknown exception")); } @@ -67,7 +67,7 @@ namespace CIAO DynEnum_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn) { ACE_UNUSED_ARG (dyn); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Extracting Enums not yet supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Extracting Enums not yet supported\n"))); } CORBA::TypeCode_ptr @@ -75,7 +75,7 @@ namespace CIAO { if (!type.enum_p ()) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Enum type descriptioin required"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("ERROR: Enum type descriptioin required"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Did not find expected enum type description, tk_kind may be wrong.")); } diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp index 6da77d30e75..1de53034937 100644 --- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp @@ -2,7 +2,7 @@ #include "DynSequence_Handler.h" #include "DynAny_Handler.h" - +#include "Logger/Log_Macros.h" #include "Basic_Deployment_Data.hpp" #include "Common.h" @@ -47,7 +47,7 @@ namespace CIAO case TCKind::tk_component_l: case TCKind::tk_home_l: - ACE_ERROR ((LM_WARNING, "I don't know how to handle null or void types\n")); + DANCE_DEBUG (1, (LM_WARNING, "I don't know how to handle null or void types\n")); throw 1; case TCKind::tk_short_l: @@ -85,7 +85,7 @@ namespace CIAO } catch (DynamicAny::DynAny::InvalidValue) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ") + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ") ACE_TEXT ("populate %ith element of a sequence\n"), pos)); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Invalid value whilst populating the sequence.")); @@ -114,7 +114,7 @@ namespace CIAO case TCKind::tk_event_l: // Special case where element association in datavalue contains another datavalue. - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Type not supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Type not supported\n"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported")); } @@ -125,7 +125,7 @@ namespace CIAO DynSequence_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn) { ACE_UNUSED_ARG (dyn); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Extracting Sequences not yet supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Extracting Sequences not yet supported\n"))); } CORBA::TypeCode_ptr @@ -133,7 +133,7 @@ namespace CIAO { if (!type.sequence_p ()) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sequence type descriptioin required"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("ERROR: Sequence type descriptioin required"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Expected <sequence> element, incorrect tc_kind.")); } diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp index b075d418e7b..2f911cb370d 100644 --- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp @@ -2,7 +2,7 @@ #include "DynStruct_Handler.h" #include "DynAny_Handler.h" - +#include "Logger/Log_Macros.h" #include "Basic_Deployment_Data.hpp" #include "Common.h" @@ -85,7 +85,7 @@ namespace CIAO DynStruct_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn) { ACE_UNUSED_ARG (dyn); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Extracting Structs not yet supported\n"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("Extracting Structs not yet supported\n"))); } CORBA::TypeCode_ptr @@ -93,7 +93,7 @@ namespace CIAO { if (!type.struct_p ()) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Struct type descriptioin required"))); + DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("ERROR: Struct type descriptioin required"))); throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Expected struct type information, tc_kind may be incorrect\n")); } diff --git a/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp index 905b202b081..6fe888c8b0d 100644 --- a/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp @@ -56,9 +56,9 @@ namespace CIAO } else { - ACE_DEBUG((LM_ERROR, - "(%P|%t) Warning: IDD %s has no idref\n", - ACE_TEXT_ALWAYS_CHAR ( src.name ().c_str ()))); + DANCE_ERROR (2, (LM_WARNING, + "(%P|%t) Warning: IDD %s has no idref\n", + ACE_TEXT_ALWAYS_CHAR (src.name ().c_str ()))); } // We know there should be only one element @@ -96,8 +96,8 @@ namespace CIAO } catch (...) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unknown exception at IDD:%s"), - src.name ().c_str ())); + DANCE_ERROR (1, (LM_ERROR, ACE_TEXT ("Unknown exception at IDD:%s"), + src.name ().c_str ())); throw Config_Error (src.name (), ACE_TEXT ("Unknown exception")); } diff --git a/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp index 7bf2d6ea121..67f37eb3531 100644 --- a/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp @@ -103,7 +103,7 @@ namespace CIAO } else { - ACE_DEBUG((LM_ERROR, + DANCE_ERROR(2, (LM_WARNING, "(%P|%t) Warning: MDD %s has no idref\n", desc.name ().c_str ())); } diff --git a/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp b/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp index 486bf060381..5a500b5c0f4 100644 --- a/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp @@ -83,7 +83,7 @@ namespace CIAO break; default: - ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n")); + DANCE_DEBUG (1, (LM_DEBUG, "Invalid port kind in connection\n")); } } @@ -138,7 +138,7 @@ namespace CIAO break; default: - ACE_ERROR ((LM_ERROR, "Invalid port kind in PSPE\n")); + DANCE_ERROR (1, (LM_ERROR, "Invalid port kind in PSPE\n")); } diff --git a/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp index 4be49ae2bcb..b10ae39b2f6 100644 --- a/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp @@ -343,8 +343,8 @@ namespace CIAO retval.monolithicImpl (MID_Handler::get_mid (src.monolithicImpl[0])); } else - ACE_DEBUG ((LM_WARNING, "Warning: ComponentImplementationDescription lacks " - "either a required assemblyImpl or monolithicImpl, or has too many")); + DANCE_ERROR (1, (LM_WARNING, "Warning: ComponentImplementationDescription lacks " + "either a required assemblyImpl or monolithicImpl, or has too many")); #if 0 for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i) { diff --git a/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp index ba2c14309b2..8397d464a1a 100644 --- a/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -76,7 +76,7 @@ namespace CIAO cpd->end_infoProperty (), Property_Functor (toconfig.configProperty)); - // ACE_ERROR ((LM_ERROR, "***** Count of PCIs is %i\n", + // DANCE_DEBUG (1, (LM_ERROR, "***** Count of PCIs is %i\n", // cpd->count_implementation ())); // Packaged Component Implementations @@ -146,7 +146,7 @@ namespace CIAO throw Parse_Error (ACE_TEXT ("Unable to create DOM for component package description")); try { - //ACE_ERROR ((LM_ERROR, "Creating new CPD XSC Object\n")); + //DANCE_DEBUG (1, (LM_ERROR, "Creating new CPD XSC Object\n")); return new ComponentPackageDescription (reader::componentPackageDescription (dom)); } catch (...) { diff --git a/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp index 791f153d126..5e3bdfb4ac5 100644 --- a/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -127,7 +127,6 @@ namespace CIAO if (src.basePackage.length () > 0) { - ACE_DEBUG ((LM_DEBUG, "5\n")); pcd.basePackage (CPD_Handler::component_package_descr (src.basePackage[0])); } #if 0 diff --git a/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp index f19aa3ef4bb..b240e38fc77 100644 --- a/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp @@ -80,8 +80,8 @@ namespace CIAO SID_Handler::IDREF.bind_next_available (str); } else - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Warning: SID With Name %s has no ID\n"), - desc.name ().c_str ())); + DANCE_ERROR (1, (LM_WARNING, ACE_TEXT ("Warning: SID With Name %s has no ID\n"), + desc.name ().c_str ())); } diff --git a/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp b/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp index a0951505138..b0a6bf52fdb 100644 --- a/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp @@ -6,6 +6,8 @@ #include "DAnCE/Deployment/Deployment_DataC.h" #include "DAnCE/Logger/Log_Macros.h" #include "Utils/Exceptions.h" +#include "Logger/Log_Macros.h" + namespace CIAO { namespace Config_Handlers @@ -55,7 +57,7 @@ namespace CIAO break; default: - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unknown SatisfierPropertyKind\n"))); + DANCE_ERROR (1, (LM_ERROR, ACE_TEXT ("Unknown SatisfierPropertyKind\n"))); throw Config_Error (desc.name (), ACE_TEXT ("Unknown SatisfierPropertyKind")); } diff --git a/CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp b/CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp index b44f31c452a..97c353450a8 100644 --- a/CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp +++ b/CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp @@ -59,15 +59,12 @@ namespace CIAO if (this->idl_dp_.get ()) return true; } - catch (const Config_Error &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO "XML_File_Intf::error at %C: %C\n", - ex.name_.c_str (), ex.error_.c_str ())); - } catch (...) { DANCE_ERROR (1, (LM_ERROR, DLINFO "XML_File_Intf::caught - " "Unexpected exception whilst parsing XML into IDL.\n")); + throw Config_Error (this->file_, + ACE_TEXT ("Unexpected C++ exception whilst parsing XML")); } return false; diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp index 764a4e98aa4..be88d5ff474 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp @@ -613,6 +613,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) }; } + catch (const Deployment::PlanError &ex) + { + ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - ") + ACE_TEXT ("Error in plan: <%C>, <%C>\n"), + ex.name.in (), + ex.reason.in ())); + retval = -1; + } catch (const DAnCE::Deployment_Failure& e) { ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - ") diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp index 7832da6e03b..6a467cb1809 100644 --- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp +++ b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp @@ -5,6 +5,7 @@ #include "ace/Auto_Ptr.h" #include "tao/ORB.h" #include "DAnCE/Deployment/Deployment_DeploymentPlanC.h" +#include "DAnCE/Deployment/Deployment_PlanErrorC.h" #include "DAnCE/Logger/Log_Macros.h" #include "DAnCE/Logger/Logger_Service.h" #include "Convert_Plan_Impl.h" @@ -128,6 +129,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) DAnCE::Convert_Plan::write_cdr_plan (output_filename, *plan); } + catch (const ::Deployment::PlanError &ex) + { + DANCE_ERROR (1, (LM_ERROR, "Convert_Plan - Config error while parsing plan " + "<%C>, <%C>\n", + ex.name.in (), + ex.reason.in ())); + retval = -1; + } catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Convert_Plan"); diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp index c186602f922..6142a707c31 100644 --- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp +++ b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp @@ -3,7 +3,9 @@ #include "Convert_Plan_Impl.h" #include "ace/OS_NS_stdio.h" #include "tao/CDR.h" +#include "Deployment/Deployment_PlanErrorC.h" #include "Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/Common.h" #include "Logger/Log_Macros.h" namespace DAnCE @@ -22,8 +24,16 @@ namespace DAnCE xml_intf.add_search_path (ACE_TEXT("TAO_ROOT"), ACE_TEXT("/docs/schema/")); xml_intf.add_search_path (ACE_TEXT("CIAO_ROOT"), ACE_TEXT("/docs/schema/")); xml_intf.add_search_path (ACE_TEXT("DANCE_ROOT"), ACE_TEXT("/docs/schema/")); - - return xml_intf.release_plan (); + + try + { + return xml_intf.release_plan (); + } + catch (const CIAO::Config_Handlers::Config_Error &ex) + { + throw ::Deployment::PlanError (ACE_TEXT_ALWAYS_CHAR (ex.name_.c_str ()), + ACE_TEXT_ALWAYS_CHAR (ex.error_.c_str ())); + } } Deployment::DeploymentPlan * |