diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-10-29 15:45:54 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-10-29 15:45:54 +0000 |
| commit | 3cb4630ce30035f7daff765a14e95436e666d718 (patch) | |
| tree | 66c9f8818d95babb9dfa1fc1458e9d79fb7a9fcc /TAO | |
| parent | 3d84a4ba4ec3d93044237fd553aa8c485d4e75f7 (diff) | |
| download | ATCD-3cb4630ce30035f7daff765a14e95436e666d718.tar.gz | |
ChangeLogTag: Fri Oct 29 10:44:52 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp | 32 |
2 files changed, 26 insertions, 12 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index fb2dd780983..03b33a5e1eb 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 29 10:44:52 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * DAnCE/RepositoryManager/Repository_Manager.cpp; + + Cosmetic changes. + Mon Oct 25 07:31:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/RepositoryManager/Repository_Manager.cpp: diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp index d1cbdcceb9d..b6406da05e2 100644 --- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp +++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp @@ -89,19 +89,24 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { // get a reference to the parser. - auto_ptr<DOMBuilder> plan_parser (CIAO::Config_Handler::Utils:: - create_parser ()); + auto_ptr<DOMBuilder> plan_parser ( + CIAO::Config_Handler::Utils::create_parser () + ); + CIAO::Config_Handler::Config_Error_Handler handler; plan_parser->setErrorHandler(&handler); - auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils:: - create_parser ()); + auto_ptr<DOMBuilder> tpd_parser ( + CIAO::Config_Handler::Utils::create_parser () + ); + CIAO::Config_Handler::Config_Error_Handler tpd_handler; tpd_parser->setErrorHandler(&tpd_handler); // use the parser to parse the deployment plan URL and create // a DOM document. DOMDocument* plan_doc = plan_parser->parseURI (plan_url); + if (handler.getErrors()) { return 1; @@ -127,9 +132,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //auto_ptr<DOMBuilder> cleanup_parser (parser); // call the Deployment Plan handler to parse the XML descriptor. - CIAO::Config_Handler::Plan_Handler plan_handler (plan_doc, - DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT); + CIAO::Config_Handler::Plan_Handler plan_handler ( + plan_doc, + DOMNodeFilter::SHOW_ELEMENT | DOMNodeFilter::SHOW_TEXT + ); + Deployment::DeploymentPlan plan; plan_handler.process_plan (plan); @@ -159,11 +166,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Deployment Process. CORBA::Object_var obj = orb->string_to_object (exec_ior - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CIAO::ExecutionManagerDaemon_var exec_mgr = - CIAO::ExecutionManagerDaemon::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + CIAO::ExecutionManagerDaemon::_narrow (obj.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (exec_mgr.in ())) @@ -178,9 +186,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CIAO::NodeDaemon_var node_mgr; if (node_daemon_ior != 0) { - CORBA::Object_var node_mgr_obj = orb->string_to_object - (node_daemon_ior - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var node_mgr_obj = + orb->string_to_object (node_daemon_ior + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; node_mgr = |