diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-10 19:39:06 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-10 19:39:06 +0000 |
| commit | dd1597eb9737729e49af21c194fbfc053ea7b601 (patch) | |
| tree | 419e0e50cfb3b6469d5dee652e80788c51c97799 | |
| parent | 8353a0a3b0379d85e67d910ffe5fe1f25c74ce04 (diff) | |
| download | ATCD-dd1597eb9737729e49af21c194fbfc053ea7b601.tar.gz | |
Fri Jul 10 19:35:33 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
50 files changed, 1155 insertions, 1059 deletions
diff --git a/modules/CIAO/CIAO-INSTALL.html b/modules/CIAO/CIAO-INSTALL.html index b1800fafe75..28f1915c1fc 100644 --- a/modules/CIAO/CIAO-INSTALL.html +++ b/modules/CIAO/CIAO-INSTALL.html @@ -4,10 +4,13 @@ <LINK rev="made" href="mailto:schmidt@cs.wustl.edu"></head> <body text="#000000" vLink="#ff0f0f" link="#000fff" bgColor="#ffffff"> <hr> - <h3>Building and Installing CIAO - </h3> + <h3>Building and Installing CIAO</h3> <p>The first thing you should do to install CIAO is to set the environment - variable <code>CIAO_ROOT</code> to be <code>$TAO_ROOT/CIAO</code>. Please refer + variable <code>CIAO_ROOT</code> to + be <code>$TAO_ROOT/CIAO</code>, or whereever you have installed + the CIAO sources. The <code>DANCE_ROOT</code> environment + variable should also be set to <code>$CIAO_ROOT/DAnCE</code>, or + wherever you have installed the DAnCE sources. Please refer to the <A href="../../ACE-INSTALL.html">ACE installation notes</A> and <A href="../TAO-INSTALL.html"> TAO installation notes</A> for instructions on setting <code>$ACE_ROOT</code> and <code>$TAO_ROOT</code>, respectively. They are needed since CIAO sits on @@ -32,8 +35,7 @@ </li> </ol> <hr> - <h3>Supported Platforms for CIAO - </h3> + <h3>Supported Platforms for CIAO</h3> <p>CIAO should be usable on all platforms that TAO runs on. Please see <A href="../TAO-INSTALL.html"> TAO's installation</A> pages for details </p> @@ -51,8 +53,29 @@ version of ACE and TAO because CIAO tracks changes to ACE and TAO very closely. </p> <hr> - <h4>Xerces-C Environment Settings - </h4> + <h3>Obtaining and Installing Xerces-C</h3> + <p>The Xerces-C XML parsing library is a necessary component to build parts of + DAnCE that need to process XML based descriptor files, which include the <b>Plan + Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C + versions supported by the DOC group is version 2.6 or later or 3.0 or later. + Earlier versions of the Xerces-C library may work. + </p> + <h4>Building Xerces-C</h4> + <p>You may check <a href="http://www.dre.vanderbilt.edu/~wotte/xerces/">here</a> to + see if there is a prebuilt binary available for your platform. Otherwise, you + will have to obtain the source from the <a href="http://xml.apache.org/xerces-c/download.cgi"> + Xerces-C webpage</a> and build it. Building Xerces-C is fairly + straightfoward. Please see the documentation available <a href="http://xml.apache.org/xerces-c/build.html"> + here</a> for instructions particular to your platform. + </p> + <ul> + <li> + <strong>NOTE</strong>: Some of the provided projects with Xerces-C attach + inconsistant library decorators onto the end of the Xerces-C libraries. The MPC + build tool will expect these libraries to be named xerces-c for non debug + versions, and xerces-cd for debug versions. + </ul> + <h4>Xerces-C Environment Settings</h4> <p>If the Xerces includes and libraries are in your system include and library paths, respectively, then you need not set up any environment and may proceed to the next step. If not, you will need to set an environment variable named @@ -62,8 +85,7 @@ for dynamically linked libraries. </p> <hr> - <h3>Install CIAO core/tools/examples - </h3> + <h3>Install CIAO core/tools/examples</h3> <p>Most of the GNUmakefiles/project files/solution files required to build CIAO are available in the release. If you don't like the configurations used, please feel free to regenerate them using MPC. Please see <A href="../../MPC/README">this</A> diff --git a/modules/CIAO/ChangeLog-dds4ccm b/modules/CIAO/ChangeLog-dds4ccm index 9fa606b39f9..97ad67471eb 100644 --- a/modules/CIAO/ChangeLog-dds4ccm +++ b/modules/CIAO/ChangeLog-dds4ccm @@ -1,3 +1,58 @@ +Fri Jul 10 17:13:35 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_ConnectorE.idl: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: + * connectors/dds4ccm/idl/dds4ccm.mpc: + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + + Various compile fixes, link fixes, along with initial implementation of the + sender connector and the sender component. When deployed, the sender connector + will register with DDS, and the sender component will use dds4ccm defined interfaces + to send a series of messages. Currently, this can be tested by using the ndds + Hello_simple example. + + It should be noted that Hello_Sender_ConnectorE.idl IS checked in because it + is hand-modified to remove the CCM_DataWriter interface until such a time + as the support for lem force all can be worked out. + + * connectors/dds4ccm/impl/ndds/DataWriter.h: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/ListenerControl.h: + * connectors/dds4ccm/impl/ndds/ListenerControl.cpp: + * connectors/dds4ccm/impl/ndds/NDDS_Traits.h: + * connectors/dds4ccm/impl/ndds/Participant.h: + * connectors/dds4ccm/impl/ndds/Participant.cpp: + * connectors/dds4ccm/impl/ndds/ParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/ParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.h: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Topic.h: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/Utils.h: + * connectors/dds4ccm/impl/ndds/Utils.cpp: + * connectors/dds4ccm/impl/ndds/Writer.h: + * connectors/dds4ccm/impl/ndds/Writer.tpp: + * connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h: + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: + + Initial implementation of the DataWriter, and a minimum of the IDL-defined + DDS DCPS interfaces as a wrapper facade for RTI DDS as needed to implement + basic writing functionality. + + * connectors/dds4ccm/impl/ndds/ListnerControl.h: + * connectors/dds4ccm/impl/ndds/ListnerControl.cpp: + * connectors/dds4ccm/impl/ndds/Writer.cpp: + + Removed these files. + Wed Jul 8 17:30:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/idl/dds4ccm.mpc: diff --git a/modules/CIAO/DAnCE/Deployment/Module_Main.h b/modules/CIAO/DAnCE/Deployment/Module_Main.h index 5aebca565ea..fb823684aeb 100644 --- a/modules/CIAO/DAnCE/Deployment/Module_Main.h +++ b/modules/CIAO/DAnCE/Deployment/Module_Main.h @@ -48,7 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) dlf->init (argc, argv); DANCE_DEBUG ((LM_TRACE, DLINFO - "Module_main.h - initializing ORB\n")); + ACE_TEXT("Module_main.h - initializing ORB\n"))); CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); @@ -64,7 +64,8 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) } DANCE_DEBUG ((LM_TRACE, DLINFO - "Module_Main.h - initializing module instance\n")); + ACE_TEXT("Module_Main.h - initializing module instance"))); + DANCE_MODULE_MAIN_CLASS_NAME module_instance; CORBA::Object_var obj = module_instance.create_object (orb.in (), @@ -75,7 +76,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) orb->run (); DANCE_DEBUG ((LM_TRACE, DLINFO - "Module_Main.h - ORB event loop finished, exiting.\n")); + ACE_TEXT("Module_Main.h - ORB event loop finished, exiting.\n"))); orb->destroy (); #endif diff --git a/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp index b9adc2da088..0c65dfef0d3 100644 --- a/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp +++ b/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp @@ -36,14 +36,14 @@ namespace DAnCE catch (CORBA::Exception &e) { DANCE_ERROR((LM_ERROR, DLINFO - "DomainApplication_Impl::~DomainApplication_Impl - " - "caught a CORBA exception %C(%C) \"%C\"\n", + ACE_TEXT("DomainApplication_Impl::~DomainApplication_Impl - ") + ACE_TEXT("caught a CORBA exception %C(%C) \"%C\"\n"), e._name(), e._rep_id(), e._info().c_str())); } catch(...) { - DANCE_ERROR((LM_ERROR, DLINFO "DomainApplication_Impl::~DomainApplication_Impl - " - "caught an unknown exception.\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("DomainApplication_Impl::~DomainApplication_Impl - ") + ACE_TEXT("caught an unknown exception.\n"))); } } @@ -52,8 +52,8 @@ namespace DAnCE CORBA::Boolean start) { DANCE_TRACE ("DomainApplication_Impl::finishLaunch"); - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplication_impl::finishLaunch - " - "connections length is %d\n", connections.length())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplication_impl::finishLaunch - ") + ACE_TEXT("connections length is %d\n"), connections.length())); for (TApp2Mgr::iterator iter = this->node_applications_.begin(); iter != this->node_applications_.end(); ++iter) @@ -83,20 +83,20 @@ namespace DAnCE iter != this->nams_.end(); ++iter) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplication_Impl::startLaunch - " - "Invoking startLaunch on an application\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::startLaunch - ") + ACE_TEXT("Invoking startLaunch on an application\n"))); ::Deployment::Connections_var conn; Deployment::Application_ptr na = (*iter).ext_id_->startLaunch (configProperty, conn.out()); //Deployment::NodeApplication_ptr na = Deployment::NodeApplication::_narrow (a); if (CORBA::is_nil (na)) { DANCE_ERROR ((LM_ERROR, DLINFO - "DomainApplication_Impl::startLaunch -" - "Received nil object reference from startLaunch on node managers.\n")); + ACE_TEXT("DomainApplication_Impl::startLaunch -") + ACE_TEXT("Received nil object reference from startLaunch on node managers.\n"))); throw Deployment::StartError(); } - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplication_Impl::startLaunch - " - "Application startLaunch succeeded, received %u connections\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::startLaunch - ") + ACE_TEXT("Application startLaunch succeeded, received %u connections\n"), conn->length ())); this->node_applications_.bind (na, (*iter).ext_id_); @@ -109,8 +109,8 @@ namespace DAnCE } } - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplication_Impl::startLaunch - " - "Received %u connections from applications\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplication_Impl::startLaunch - ") + ACE_TEXT("Received %u connections from applications\n"), this->connections_.length ())); } diff --git a/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 6031c029cbf..cd56bd9754d 100644 --- a/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -15,35 +15,36 @@ DomainApplicationManager_Impl::DomainApplicationManager_Impl (CORBA::ORB_ptr orb , plan_ (plan) , nodes_ (nodes) { - DANCE_TRACE("DomainApplicationManager_Impl::DomainApplicationManager_Impl"); + DANCE_TRACE( "DomainApplicationManager_Impl::DomainApplicationManager_Impl"); + this->preparePlan(); - DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::DomainApplicationManager_Impl - " - "Successfully prepared plan : %C\n", this->plan_.UUID.in())); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::DomainApplicationManager_Impl - ") + ACE_TEXT("Successfully prepared plan : %C\n"), this->plan_.UUID.in())); } DomainApplicationManager_Impl::~DomainApplicationManager_Impl() { DANCE_TRACE( "DomainApplicationManager_Impl::~DomainApplicationManager_Impl()"); - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::~DomainApplicationManager_Impl - " - "Destroying %u applications\n", this->running_app_.size())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::~DomainApplicationManager_Impl - ") + ACE_TEXT("Destroying %u applications\n"), this->running_app_.size())); while (0 < this->running_app_.size()) { DomainApplication_Impl* p = this->running_app_[this->running_app_.size()-1]; Deployment::DomainApplication_var app = Deployment::DomainApplication::_narrow (this->poa_->servant_to_reference (p)); PortableServer::ObjectId_var id = this->poa_->reference_to_id (app); - DANCE_DEBUG((LM_TRACE, DLINFO "DomainApplicationManager_impl::~DomainApplicationManager_impl - " - "deactivating DomainApplication object...\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_impl::~DomainApplicationManager_impl - ") + ACE_TEXT("deactivating DomainApplication object...\n"))); this->poa_->deactivate_object (id); - DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_impl::~DomainApplicationManager_impl - " - "deleting DomainApplication.\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_impl::~DomainApplicationManager_impl - ") + ACE_TEXT("deleting DomainApplication.\n"))); this->running_app_.pop_back(); delete p; } - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::~DomainApplicationManager_Impl - " - "Destroying %u managers\n", this->sub_app_mgr_.current_size())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::~DomainApplicationManager_Impl - ") + ACE_TEXT("Destroying %u managers\n"), this->sub_app_mgr_.current_size())); for (DomainApplication_Impl::TNam2Nm::iterator iter = this->sub_app_mgr_.begin(); iter != this->sub_app_mgr_.end(); ++iter) @@ -100,11 +101,11 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a if (application->_is_equivalent (app.in())) { PortableServer::ObjectId_var id = this->poa_->reference_to_id (application); - DANCE_DEBUG((LM_TRACE, DLINFO "DomainApplicationManager_impl::destroyApplication - " - "deactivating application object\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ") + ACE_TEXT("deactivating application object\n"))); this->poa_->deactivate_object (id); - DANCE_DEBUG((LM_TRACE, DLINFO "DomainApplicationManager_impl::destroyApplication - " - "deleting application object\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ") + ACE_TEXT("deleting application object\n"))); delete p; for (size_t j = i + 1; j < this->running_app_.size(); ++j) { @@ -117,19 +118,19 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a } catch (const Deployment::StopError &e) { - ACE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_impl::destroyApplication - " - "Propagating a received StopError exception\n")); + ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ") + ACE_TEXT("Propagating a received StopError exception\n"))); throw e; } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_impl::destroyApplication - " - "Caught unknown exception.")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ") + ACE_TEXT("Caught unknown exception."))); throw Deployment::StopError(); } - ACE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_impl::destroyApplication - " - "Provided application reference unknown\n")); + ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ") + ACE_TEXT("Provided application reference unknown\n"))); throw Deployment::StopError(); } @@ -151,8 +152,8 @@ DomainApplicationManager_Impl::getApplications () Deployment::DomainApplication::_narrow (ref.in ()); } - DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_impl::getApplications - " - "Returning %u running applications\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_impl::getApplications - ") + ACE_TEXT("Returning %u running applications\n"), running_app->length ())); return running_app; } @@ -160,7 +161,7 @@ DomainApplicationManager_Impl::getApplications () ::Deployment::DeploymentPlan * DomainApplicationManager_Impl::getPlan () { - DANCE_TRACE ( DLINFO "DomainApplicationManager_Impl::getPlan ()"); + DANCE_TRACE ("DomainApplicationManager_Impl::getPlan ()"); Deployment::DeploymentPlan* plan = 0; @@ -177,7 +178,7 @@ void DomainApplicationManager_Impl:: dump_connections (const ::Deployment::Connections & /*connections*/) const { - DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_impl::dump_connections - started\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_impl::dump_connections - started\n"))); // CIAO_TRACE("CIAO::DomainApplicationManager_Impl::dump_connections"); // const CORBA::ULong conn_len = connections.length (); @@ -233,7 +234,7 @@ dump_connections (const ::Deployment::Connections & /*connections*/) const // DANCE_DEBUG((LM_DEBUG, "[%M] ---------------------\n")); // } - DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_impl::dump_connections - finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_impl::dump_connections - finished\n"))); } void @@ -242,8 +243,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl { DANCE_TRACE ( "DomainApplicationManager_Impl::split_plan"); - DANCE_DEBUG ((LM_TRACE, "DomainApplicationManager_Impl::split_plan - " - "Creating sub-plans\n")); + DANCE_DEBUG ((LM_TRACE, ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("Creating sub-plans\n"))); // Create empty sub-plans for (CORBA::ULong i = 0; i < plan.instance.length(); ++i) { @@ -274,13 +275,13 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl sub_plans.bind (node, tmp_plan); - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Created sub-plan for node %C with UUID %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("Created sub-plan for node %C with UUID %C\n"), node.c_str (), child_uuid.c_str ())); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::split_plan - " - "First phase produced %u child plans, proceeding to second\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("First phase produced %u child plans, proceeding to second\n"))); // (1) Iterate over the <instance> field of the global DeploymentPlan // structure. @@ -288,8 +289,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl // plans one by one. for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Processing instance : %C\n", plan.instance[i].name.in())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("Processing instance : %C\n"), plan.instance[i].name.in())); // @@TODO Fill in the child deployment plan in the map. // If the component instance already exists in the child plan, // then we overwrite the existing instance, since the new instance @@ -303,8 +304,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl if (0 != sub_plans.find (ACE_CString (my_instance.node.in()), child_plan)) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::split_plan - " - "ERROR: Unable to find sub-plan for instance %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("ERROR: Unable to find sub-plan for instance %C\n"), my_instance.node.in ())); } @@ -361,17 +362,17 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl // duplicate <implementation> for the optimization. child_plan.instance[index_ins-1].implementationRef = index_imp - 1; - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Processing connections.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("Processing connections.\n"))); // Copy connections for (CORBA::ULong j = 0; j < plan.connection.length(); ++j) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "For connection : %C\n", plan.connection[j].name.in())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("For connection : %C\n"), plan.connection[j].name.in())); for (CORBA::ULong k = 0; k < plan.connection[j].internalEndpoint.length(); ++k) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "For endpoint : %C(%C)\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("For endpoint : %C(%C)\n"), plan.connection[j].internalEndpoint[k].portName.in(), plan.connection[j].internalEndpoint[k].provider ? "provider" : "client")); if (i == plan.connection[j].internalEndpoint[k].instanceRef) // the instance (i) is referenced by the connection @@ -408,8 +409,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl } //Debug - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Original plan connection count : %u\n", plan.connection.length())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("Original plan connection count : %u\n"), plan.connection.length())); CORBA::ULong cnt = 0; for (TNodePlans::iterator it = sub_plans.begin(); it != sub_plans.end(); ++it) { @@ -417,8 +418,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl // DANCE_DEBUG((LM_DEBUG, "[%M] Dumping deployment plan #%C:\n", (*it).ext_id_.c_str())); // Deployment::DnC_Dump::dump((*it).int_id_); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Child plans connection count : %u\n", cnt)); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ") + ACE_TEXT("Child plans connection count : %u\n"), cnt)); } void @@ -432,7 +433,7 @@ DomainApplicationManager_Impl::preparePlan() TNodePlans sub_plans; // Splitting deployment plan on sub plans for each node DomainApplicationManager_Impl::split_plan (this->plan_, sub_plans); - DANCE_DEBUG((LM_TRACE, DLINFO "DomainApplicationManager_Impl::preparePlan - Plan successfully split\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - Plan successfully split\n"))); // Executing preparePlan on each NodeManager described in DeploymentPlan for (TNodePlans::iterator iter_plans = sub_plans.begin(); iter_plans != sub_plans.end(); @@ -443,15 +444,15 @@ DomainApplicationManager_Impl::preparePlan() // If NodeManager not found throw StartError exception if (CORBA::is_nil (nm.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Deployment::StartError exception. NodeManager %C cannot be found\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("Deployment::StartError exception. NodeManager %C cannot be found\n"), (*iter_plans).ext_id_.c_str())); throw Deployment::StartError ( (*iter_plans).ext_id_.c_str(), "NodeManager not found"); } // Calling preparePlan for node, specified in current sub plan - DANCE_DEBUG((LM_TRACE, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Calling preparePlan on node %C\n", + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("Calling preparePlan on node %C\n"), (*iter_plans).ext_id_.c_str())); Deployment::NodeApplicationManager_ptr nam @@ -460,37 +461,37 @@ DomainApplicationManager_Impl::preparePlan() if (CORBA::is_nil (nam)) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "PreparePlan failed for node %C, returning a nill " - "NodeApplicationManager poiniter.\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("PreparePlan failed for node %C, returning a nill ") + ACE_TEXT("NodeApplicationManager pointer.\n"), (*iter_plans).ext_id_.c_str())); throw ::Deployment::StartError(); } // We save NAM reference ptr in TNodes vector were it places to var variable this->sub_app_mgr_.bind (nam, nm); - DANCE_DEBUG ((LM_INFO, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Sucessfully prepared node %C for deployment\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("Sucessfully prepared node %C for deployment\n"), (*iter_plans).ext_id_.c_str())); } } catch (Deployment::StartError &e) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Propagating StartError exception caught here\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("Propagating StartError exception caught here\n"))); throw e; } catch (CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Caught a CORBA exception, propagating StartError: %s\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("Caught a CORBA exception, propagating StartError: %C\n"), ex._info ().c_str ())); throw ::Deployment::StartError (); } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Caught unknown exception. Propagating StartError\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ") + ACE_TEXT("Caught unknown exception. Propagating StartError\n"))); throw ::Deployment::StartError (); } } diff --git a/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp b/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp index 254a44b3711..0608609168d 100644 --- a/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp +++ b/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp @@ -16,7 +16,7 @@ namespace DAnCE ::Deployment::NodeManager_ptr Node_Locator::locate_node (const ACE_TCHAR *name) { - ACE_CString ior; + ACE_TString ior; if (this->nodes_.find (name, ior) == 0) { @@ -35,8 +35,8 @@ namespace DAnCE if (filename == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::process_node_map - " - "Error: Provided with nil filename\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::process_node_map - ") + ACE_TEXT("Error: Provided with nil filename\n"))); return false; } @@ -44,8 +44,8 @@ namespace DAnCE if (inf == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::process_node_map - " - "Fail to open node manager map data file: <%s>\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::process_node_map - ") + ACE_TEXT("Fail to open node manager map data file: <%s>\n"), filename)); return false; } @@ -69,8 +69,8 @@ namespace DAnCE ACE_CString ior (ior_start + 1, ACE_OS::strlen (ior_start + 1)); reader.alloc ()->free (string); - DANCE_DEBUG ((LM_INFO, DLINFO "Node_Locator::process_node_map - " - "Storing IOR %C for destination %C\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("Node_Locator::process_node_map - ") + ACE_TEXT("Storing IOR %C for destination %C\n"), ior.c_str (), destination.c_str ())); this->nodes_.bind (destination, ior); } @@ -83,17 +83,17 @@ namespace DAnCE { DANCE_TRACE ("Node_Locator::resolve_ior"); - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Locator::resolve_ior - " - "Resolving ior %s for destination %s\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Locator::resolve_ior - ") + ACE_TEXT("Resolving ior %s for destination %s\n"), ior, name)); CORBA::Object_var obj = this->orb_->string_to_object (ior); if (CORBA::is_nil (obj.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::resolve_ior - " - "Error: Unable to resolve object reference for destination " - "%s and ior %s\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::resolve_ior - ") + ACE_TEXT("Error: Unable to resolve object reference for destination ") + ACE_TEXT("%s and ior %s\n"), name, ior)); return false; } @@ -102,9 +102,9 @@ namespace DAnCE if (CORBA::is_nil (nm.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::resolve_ior - " - "Error: Unable to narrow reference for destination " - "%s and ior %s\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::resolve_ior - ") + ACE_TEXT("Error: Unable to narrow reference for destination ") + ACE_TEXT("%s and ior %s\n"), name, ior)); return false; } @@ -126,8 +126,8 @@ namespace DAnCE if (CORBA::is_nil (this->nc_.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - " - "Nameservice lookup of %s failed because there is no naming service.\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::ns_lookup - ") + ACE_TEXT("Nameservice lookup of %s failed because there is no naming service.\n"), nodename)); return ::Deployment::NodeManager::_nil (); } @@ -145,8 +145,8 @@ namespace DAnCE if (CORBA::is_nil (nm.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - " - "Unable to narrow provided reference for node %s\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::ns_lookup - ") + ACE_TEXT("Unable to narrow provided reference for node %s\n"), nodename)); return ::Deployment::NodeManager::_nil (); } @@ -155,8 +155,8 @@ namespace DAnCE } catch (const CORBA::Exception &e) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - " - "Caught CORBA exception while looking up name %s:%C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::ns_lookup - ") + ACE_TEXT("Caught CORBA exception while looking up name %s:%C\n"), nodename, e._info ().c_str ())); } catch (...) diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp index 65de4429b0f..e8e97c17577 100644 --- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp +++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp @@ -26,17 +26,17 @@ ExecutionManager_Impl::~ExecutionManager_Impl() iter != this->managers_.end(); ++iter) { - DANCE_DEBUG ((LM_TRACE, DLINFO "ExecutionManager_Impl::~ExecutionManager_Impl - " - "deactivating DAM \"%C\"\n", (*iter).ext_id_.c_str())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("ExecutionManager_Impl::~ExecutionManager_Impl - ") + ACE_TEXT("deactivating DAM \"%C\"\n"), (*iter).ext_id_.c_str())); PortableServer::ObjectId_var id = this->poa_->servant_to_id ( (*iter).int_id_); - DANCE_DEBUG ((LM_TRACE, DLINFO "ExecutionManager_Impl::~ExecutionManager_Impl - " - "before deactivate_object...\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("ExecutionManager_Impl::~ExecutionManager_Impl - ") + ACE_TEXT("before deactivate_object...\n"))); this->poa_->deactivate_object (id.in()); - DANCE_DEBUG ((LM_TRACE, DLINFO "ExecutionManager_Impl::~ExecutionManager_Impl - " - "deleting DomainApplicationManager\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("ExecutionManager_Impl::~ExecutionManager_Impl - ") + ACE_TEXT("deleting DomainApplicationManager\n"))); delete (*iter).int_id_; - DANCE_DEBUG ((LM_TRACE, DLINFO "ExecutionManager_Impl::~ExecutionManager_Impl - " - "DomainApplicationManager deleted\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("ExecutionManager_Impl::~ExecutionManager_Impl - ") + ACE_TEXT("DomainApplicationManager deleted\n"))); } } @@ -50,8 +50,8 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan, DomainApplicationManager_Impl * dam = 0; if (0 == this->managers_.find (plan.UUID.in(), dam)) { - DANCE_DEBUG((LM_NOTICE, DLINFO "ExecutionManager_Impl::preparePlan - " - "DomainApplicationManager with specified UUID already exists\n")); + DANCE_DEBUG((LM_NOTICE, DLINFO ACE_TEXT("ExecutionManager_Impl::preparePlan - ") + ACE_TEXT("DomainApplicationManager with specified UUID already exists\n"))); // Should we return on this situation reference on existed DomainApplicationManager or // we should throw PlanError exception? CORBA::Object_var ref = this->poa_->servant_to_reference (dam); @@ -66,13 +66,15 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan, this->locator_), CORBA::NO_MEMORY ()); this->managers_.rebind (plan.UUID.in(), dam_servant); - DANCE_DEBUG((LM_TRACE, DLINFO "ExecutionManager_Impl::preparePlan - " - "Domain Application Manager was successfully created.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("ExecutionManager_Impl::preparePlan - ") + ACE_TEXT("Domain Application Manager was successfully created.\n"))); PortableServer::ObjectId_var id = this->poa_->activate_object (dam_servant); - DANCE_DEBUG((LM_NOTICE, DLINFO "ExecutionManager_Impl::preparePlan - " - "Plan with UUID %C was successfully prepared.\n", plan.UUID.in())); + DANCE_DEBUG((LM_NOTICE, DLINFO ACE_TEXT("ExecutionManager_Impl::preparePlan - ") + ACE_TEXT("Plan with UUID %C was successfully prepared.\n", + plan.UUID.in ()))); + CORBA::Object_var ref = this->poa_->id_to_reference (id.in()); return Deployment::DomainApplicationManager::_narrow (ref.in ()); } @@ -105,7 +107,7 @@ ExecutionManager_Impl::getManagers () void ExecutionManager_Impl::destroyManager (::Deployment::DomainApplicationManager_ptr appManager) { - DANCE_DEBUG((LM_DEBUG, DLINFO "ExecutionManager_Impl::destroyManager - started\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - started\n"))); for (TDomainManagers::iterator iter = this->managers_.begin(); iter != this->managers_.end(); @@ -117,17 +119,17 @@ ExecutionManager_Impl::destroyManager (::Deployment::DomainApplicationManager_pt this->managers_.unbind ( (*iter).ext_id_); PortableServer::ObjectId_var id = this->poa_->reference_to_id (appManager); this->poa_->deactivate_object (id.in()); - DANCE_DEBUG((LM_INFO, DLINFO "ExecutionManager_Impl::destroyManager - deleting DomainApplicationManager\n")); + DANCE_DEBUG((LM_INFO, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - deleting DomainApplicationManager\n"))); delete (*iter).int_id_; (*iter).int_id_ = 0; - DANCE_DEBUG((LM_INFO, DLINFO "ExecutionManager_Impl::destroyManager - DomainApplicationManager deleted\n")); + DANCE_DEBUG((LM_INFO, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - DomainApplicationManager deleted\n"))); //this->managers_.unbind ( (*iter).ext_id_); - DANCE_DEBUG((LM_INFO, DLINFO "ExecutionManager_Impl::destroyManager - finished\n")); + DANCE_DEBUG((LM_INFO, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - finished\n"))); return; } } - DANCE_ERROR ((LM_ERROR, DLINFO "ExecutionManager_Impl::destroyManager - " - "corresponding DomainApplicationManager cannot be found\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - ") + ACE_TEXT("corresponding DomainApplicationManager cannot be found\n"))); throw ::Deployment::StopError(); } diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp index 9a4e1397c2b..442532cad87 100644 --- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp +++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp @@ -24,10 +24,10 @@ namespace DAnCE namespace ExecutionManager { bool - write_IOR (const char * ior_file_name, const char* ior) + write_IOR (const ACE_TCHAR * ior_file_name, const char* ior) { FILE* ior_output_file_ = - ACE_OS::fopen (ior_file_name, "w"); + ACE_OS::fopen (ior_file_name, ACE_TEXT("w")); if (ior_output_file_) { @@ -35,14 +35,14 @@ namespace DAnCE "%s", ior); ACE_OS::fclose (ior_output_file_); - DANCE_DEBUG ( (LM_TRACE, DLINFO "ExectionManager::write_IOR - EM's ior was written into file \"%C\"\n", ior_file_name)); + DANCE_DEBUG ( (LM_TRACE, DLINFO ACE_TEXT("ExectionManager::write_IOR - EM's ior was written into file \"%C\"\n"), ior_file_name)); return true; } else { DANCE_ERROR ( (LM_ERROR, - "[%M] DAnCE_ExecutionManager::write_ior-file - " - "Unable to open ExecutionManager IOR output file %C : %m\n", + ACE_TEXT("[%M] DAnCE_ExecutionManager::write_ior-file - ") + ACE_TEXT("Unable to open ExecutionManager IOR output file %C : %m\n"), ior_file_name)); return false; } @@ -62,7 +62,7 @@ DAnCE_ExecutionManager_Module::~DAnCE_ExecutionManager_Module (void) } bool -DAnCE_ExecutionManager_Module::parse_args (int argc, char *argv[]) +DAnCE_ExecutionManager_Module::parse_args (int argc, ACE_TCHAR *argv[]) { DANCE_TRACE ("DAnCE_ExecutionManager_Module::parse_args"); @@ -92,66 +92,66 @@ DAnCE_ExecutionManager_Module::parse_args (int argc, char *argv[]) switch (c) { case 'e': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "Output filename is %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("Output filename is %s\n"), get_opts.opt_arg ())); this->options_.exec_mgr_file_ = get_opts.opt_arg (); break; case 'n': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "--node-mgr option was parsed out for EM\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("--node-mgr option was parsed out for EM\n"))); this->options_.node_managers_.push_back (get_opts.opt_arg ()); break; case 'p': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "--process-ns enabled for EM\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("--process-ns enabled for EM\n"))); this->options_.process_ns_ = true; this->options_.process_ns_file_ = get_opts.opt_arg (); break; case 'c': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "--create-plan-ns enabled for EM\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("--create-plan-ns enabled for EM\n"))); this->options_.create_plan_ns_ = true; this->options_.create_plan_ns_ior_ = get_opts.opt_arg (); break; case 'r': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "--rebind-plan-ns enabled for EM\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("--rebind-plan-ns enabled for EM\n"))); this->options_.rebind_plan_ns_ = true; this->options_.rebind_plan_ns_ior_ = get_opts.opt_arg (); break; case 'i': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "--port-indirection enabled for EM\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("--port-indirection enabled for EM\n"))); this->options_.port_indirection_ = true; break; case 'f': - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::parse_args - " - "--ignore-failure enabled for EM\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ") + ACE_TEXT("--ignore-failure enabled for EM\n"))); this->options_.ignore_failure_ = true; break; case 0: if (ACE_OS::strcmp (get_opts.long_option (), - "node-map") == 0) + ACE_TEXT("node-map")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Found Node map filename %C.\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Found Node map filename %s.\n"), get_opts.opt_arg ())); this->options_.node_map_ = get_opts.opt_arg (); break; } else if (ACE_OS::strcmp (get_opts.long_option (), - "domain-nc") == 0) + ACE_TEXT("domain-nc")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Binding to domain naming context %C.\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Binding to domain naming context %s.\n"), get_opts.opt_arg ())); this->options_.domain_nc_ = get_opts.opt_arg (); break; @@ -161,9 +161,9 @@ DAnCE_ExecutionManager_Module::parse_args (int argc, char *argv[]) //case '?': // Display help for use of the server. //default: DANCE_ERROR_RETURN ((LM_ERROR, - "Excution Manager options: %C\n" - "\t-e|--exec-mgr [execution manager ior file name]\n" - "\t-n|--node-mgr <node name>[=node manager ior file name]\n" + "usage: %s\n" + "\t--exec-mgr,-e [execution manager ior file name]\n" + "\t--node-mgr,-n <node name>[=node manager ior file name]\n" "\t--node-map <file name> \t\tFile containing a node manager map\n" "\t--domain-nc <nc ior> \t\tIOR for the Domain Naming Context\n" //"-p|--process-ns [file name] \t\tcreate process name service and store its ior to file name\n" @@ -190,26 +190,26 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, if (this->em_impl_ != 0) { DANCE_ERROR ( (LM_ERROR, - DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "Error: ExecutionManager already exists.\n")); + DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("Error: ExecutionManager already exists.\n"))); return CORBA::Object::_nil (); } - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "before parsing arguments.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("before parsing arguments.\n"))); if (!this->parse_args (argc, argv)) return CORBA::Object::_nil (); - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "before creating value factory.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("before creating value factory.\n"))); CORBA::ValueFactory_var vf = new Components::Cookie_init(); - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "before registering value factory.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("before registering value factory.\n"))); vf = orb->register_value_factory ("IDL:omg.org/Components/Cookie:1.0", vf.in()); - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "after creating value factory.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("after creating value factory.\n"))); // Get reference to Root POA. CORBA::Object_var poa_obj = orb->resolve_initial_references ("RootPOA"); @@ -224,8 +224,8 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, policies.length (2); try { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "before creating the \"Managers\" POA.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("before creating the \"Managers\" POA.\n"))); policies[0] = poa->create_id_assignment_policy (PortableServer::USER_ID); policies[1] = poa->create_lifespan_policy (PortableServer::PERSISTENT); @@ -245,8 +245,8 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, { if (this->options_.domain_nc_) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "before resolving \"DomainNC\".\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("before resolving \"DomainNC\".\n"))); CORBA::Object_var domain_obj = orb->string_to_object (this->options_.domain_nc_); if (!CORBA::is_nil (domain_obj.in ())) { @@ -254,7 +254,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, if (CORBA::is_nil (domain_nc.in ())) { DANCE_ERROR ( (LM_ERROR, - DLINFO "Narrow to NamingContext return nil for DomainNC.\n")); + DLINFO ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n"))); return CORBA::Object::_nil (); } } @@ -263,7 +263,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, catch (CORBA::Exception&) { DANCE_DEBUG ((LM_DEBUG, - DLINFO "DomainNC context not found!\n")); + DLINFO ACE_TEXT("DomainNC context not found!\n"))); } // Initialize IOR table @@ -276,12 +276,12 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, if (CORBA::is_nil (adapter.in ())) { DANCE_ERROR ( (LM_ERROR, - DLINFO "Nil IORTable\n")); + DLINFO ACE_TEXT("Nil IORTable\n"))); return CORBA::Object::_nil (); } // Create and install the DAnCE Daemon servant on child POA - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - before creating EM servant.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - before creating EM servant.\n"))); ACE_NEW_RETURN (this->em_impl_, DAnCE::ExecutionManager_Impl (orb, poa.in (), @@ -311,7 +311,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, // Binding execution manager to name service if (!CORBA::is_nil (domain_nc.in ())) { - DANCE_DEBUG((LM_TRACE, DLINFO "Registering EM in NC.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Registering EM in NC.\n"))); CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup ("ExecutionManager"); @@ -321,8 +321,8 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, // End ExecutionManager initialization part // Initializing NodeManagers - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "before processing --node-mgr options(%u).\n", this->options_.node_managers_.size())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("before processing --node-mgr options(%u).\n"), this->options_.node_managers_.size())); for (size_t i = 0; i < this->options_.node_managers_.size(); ++i) { size_t pos = this->options_.node_managers_[i].find ('='); @@ -331,8 +331,8 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, if (ACE_CString::npos == pos) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "Execution manager received --node-mgr without IOR\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("Execution manager received --node-mgr without IOR\n"))); continue; } @@ -351,14 +351,14 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb, continue; } */ - DANCE_DEBUG ((LM_TRACE, DLINFO "Placing node \"%C\" to EM's map.\n", node_name.c_str())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Placing node \"%C\" to EM's map.\n"), node_name.c_str())); this->em_impl_->add_node_manager (node_name.c_str(), nm_ior.c_str ()); } if (this->options_.node_map_ != 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_ExecutionManager_Module::create_object - " - "Parsing node map %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ") + ACE_TEXT("Parsing node map %C\n"), this->options_.node_map_)); this->em_impl_->load_node_map (this->options_.node_map_); } diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h index 869c2b093d4..0f4488fdfea 100644 --- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h +++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h @@ -46,15 +46,15 @@ class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module public: struct SOptions { - const char* exec_mgr_file_; + const ACE_TCHAR* exec_mgr_file_; bool process_ns_; - const char* process_ns_file_; + const ACE_TCHAR* process_ns_file_; bool create_plan_ns_; - const char* create_plan_ns_ior_; + const ACE_TCHAR* create_plan_ns_ior_; bool rebind_plan_ns_; - const char* rebind_plan_ns_ior_; + const ACE_TCHAR* rebind_plan_ns_ior_; bool port_indirection_; - ACE_Vector<ACE_CString> node_managers_; + ACE_Vector<ACE_TString> node_managers_; bool ignore_failure_; const char *node_map_; const char *domain_nc_; diff --git a/modules/CIAO/DAnCE/Logger/Log_Macros.h b/modules/CIAO/DAnCE/Logger/Log_Macros.h index 828ebe6c9f4..1df68a0c970 100644 --- a/modules/CIAO/DAnCE/Logger/Log_Macros.h +++ b/modules/CIAO/DAnCE/Logger/Log_Macros.h @@ -19,7 +19,7 @@ # endif #endif DANCE_NTRACE */ -#define DLINFO "(%P|%t) [%M] - %T - " +#define DLINFO ACE_TEXT("(%P|%t) [%M] - %T - ") #if (DANCE_NTRACE == 1) # if !defined (ACE_NTRACE) diff --git a/modules/CIAO/DAnCE/Logger/Logger_Service.cpp b/modules/CIAO/DAnCE/Logger/Logger_Service.cpp index 99dbc5f428b..82fcdd057eb 100644 --- a/modules/CIAO/DAnCE/Logger/Logger_Service.cpp +++ b/modules/CIAO/DAnCE/Logger/Logger_Service.cpp @@ -148,7 +148,7 @@ namespace DAnCE } ACE_Log_Msg::instance()->priority_mask(new_mask, ACE_Log_Msg::PROCESS); - DANCE_DEBUG ( (LM_TRACE, DLINFO "Logging level is set to %i\n", this->log_level_)); + DANCE_DEBUG ( (LM_TRACE, DLINFO ACE_TEXT("Logging level is set to %i\n"), this->log_level_)); } ACE_Log_Msg_Backend * diff --git a/modules/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp b/modules/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp index 0ffb14f539f..d0b38111a10 100644 --- a/modules/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp +++ b/modules/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp @@ -56,8 +56,8 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/ continue; } DANCE_DEBUG ((LM_DEBUG, DLINFO - "ComponentAttributesSetter::SetComponentAttributes - " - "Populating attribute name %C\n", name.c_str())); + ACE_TEXT("ComponentAttributesSetter::SetComponentAttributes - ") + ACE_TEXT("Populating attribute name %C\n"), name.c_str())); ACE_CString method = "_set_"; method += prop[i].name.in(); @@ -73,8 +73,8 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/ catch (const CORBA::BAD_OPERATION &) { DANCE_ERROR ((LM_WARNING, DLINFO - "ComponentAttributesSetter::SetComponentAttributes - " - "Caught BAD_OPERATION while trying to set attribute %C\n", + ACE_TEXT("ComponentAttributesSetter::SetComponentAttributes - ") + ACE_TEXT("Caught BAD_OPERATION while trying to set attribute %C\n"), name.c_str ())); } catch (const CORBA::Exception &e) diff --git a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp index 2134f278d55..9b4d8c92c18 100644 --- a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp +++ b/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp @@ -4,6 +4,7 @@ #include "ace/Auto_Ptr.h" #include "ace/SString.h" +#include "ace/Tokenizer_T.h" #include "Logger/Log_Macros.h" namespace DAnCE @@ -23,7 +24,7 @@ namespace DAnCE } return false; } - + bool Name_Utilities::bind_object (const char *name, CORBA::Object_ptr obj, @@ -33,146 +34,146 @@ namespace DAnCE if (CORBA::is_nil (ctx)) { - DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_object - " - "Provided naming context is nil, component %s will not be registered.", + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("Name_Utilities::bind_object - ") + ACE_TEXT("Provided naming context is nil, component %C will not be registered."), name)); return false; } - + try { CosNaming::Name nm; - + Name_Utilities::build_name (name, nm); - + if (nm.length () == 0) { - DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_object - " - "build_name resulted in an invalid name for string %C\n", + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("Name_Utilities::bind_object - ") + ACE_TEXT("build_name resulted in an invalid name for string %C\n"), name)); return false; } - + Name_Utilities::bind_context (nm, ctx); - + try { ctx->bind (nm, obj); } catch (const CosNaming::NamingContext::AlreadyBound &) { - DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_object - " - "Name %C already bound, rebinding....\n", + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("Name_Utilities::bind_object - ") + ACE_TEXT("Name %C already bound, rebinding....\n"), name)); ctx->rebind (nm, obj); } } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "Name_Utilities::bind_object - " - "Caught CORBA exception while attempting to bind name %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Name_Utilities::bind_object - ") + ACE_TEXT("Caught CORBA exception while attempting to bind name %C: %C\n"), name, ex._info ().c_str ())); return false; } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Name_Utilities::bind_object - " - "Caught unknown C++ exception while attemptint to bind name %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Name_Utilities::bind_object - ") + ACE_TEXT("Caught unknown C++ exception while attemptint to bind name %C\n"), name)); return false; } - + return true; } - + void Name_Utilities::bind_context (CosNaming::Name &nm, CosNaming::NamingContext_ptr ctx) { DANCE_TRACE ("Name_Utilities::bind_context"); - + if (CORBA::is_nil (ctx)) { - DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_context - " - "Provided naming context is nil, the naming context will not be bound.")); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("Name_Utilities::bind_context - ") + ACE_TEXT("Provided naming context is nil, the naming context will not be bound."))); } CosNaming::Name newname (nm.length ()); - + for (CORBA::ULong i = 0; i < (nm.length () - 1); ++i) { newname.length (i + 1); newname[i] = nm[i]; - + try { ctx->bind_new_context (newname); - DANCE_DEBUG ((LM_TRACE, DLINFO "Name_Utilities::bind_context - " - "Bound new context %C\n", newname[i].id.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Name_Utilities::bind_context - ") + ACE_TEXT("Bound new context %C\n"), newname[i].id.in ())); } - catch (CosNaming::NamingContext::AlreadyBound &) + catch (CosNaming::NamingContext::AlreadyBound &) { - DANCE_DEBUG ((LM_TRACE, DLINFO "Name_Utilities::bind_context - " - "Context %C already bound.\n", newname[i].id.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Name_Utilities::bind_context - ") + ACE_TEXT("Context %C already bound.\n"), newname[i].id.in ())); } } } - + bool - Name_Utilities::unbind_object (const char *name, + Name_Utilities::unbind_object (const char *name, CosNaming::NamingContext_ptr ctx) { DANCE_TRACE ("Name_Utilities::unbind_object"); if (CORBA::is_nil (ctx)) { - DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::unbind_object - " - "Provided naming context is nil, instance %s will not be unbound\n", + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("Name_Utilities::unbind_object - ") + ACE_TEXT("Provided naming context is nil, instance %C will not be unbound\n"), name)); } - + CosNaming::Name nm; Name_Utilities::build_name (name, nm); - + try { ctx->unbind (nm); } catch (CORBA::Exception &e) { - DANCE_ERROR ((LM_ERROR, DLINFO "Name_Utilities::unbind_object - " - "Caught CORBA exception whilst unbinding name %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Name_Utilities::unbind_object - ") + ACE_TEXT("Caught CORBA exception whilst unbinding name %C: %C\n"), name, e._info ().c_str ())); return false; } return true; } - + void Name_Utilities::build_name (const char *name, CosNaming::Name &nm) { DANCE_TRACE ("Name_Utilities::build_name"); - - /*ACE_Auto_Basic_Array_Ptr<ACE_TCHAR>*/ ACE_TCHAR *safe_array (new char[ACE_OS::strlen (name) + 1]); - - ACE_Tokenizer parser (ACE_OS::strcpy (safe_array/*.get ()*/, name)); + + /*ACE_Auto_Basic_Array_Ptr<ACE_TCHAR>*/ char *safe_array (new char[ACE_OS::strlen (name) + 1]); + + ACE_Tokenizer_T<char> parser (ACE_OS::strcpy (safe_array/*.get ()*/, name)); parser.delimiter ('/'); - - ACE_TCHAR *next (0); - + + char *next (0); + while ((next = parser.next ()) != 0) { CORBA::ULong i = nm.length (); nm.length (i + 1); - - DANCE_DEBUG ((LM_TRACE, DLINFO "Name_Utilities::build_name - " - "Found name component %C\n", + + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Name_Utilities::build_name - ") + ACE_TEXT("Found name component %C\n"), next)); - + nm[i].id = CORBA::string_dup (next); } } - + } diff --git a/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index f48d2ba1193..14685c56e23 100644 --- a/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -39,8 +39,8 @@ namespace DANCE_TRACE ("NodeApplicion::<anonymous>::get_property_value<T>"); CORBA::Any any; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Finding property value for name '%C'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Finding property value for name '%C'\n"), name)); if (properties.find (name, any) == 0) @@ -51,14 +51,14 @@ namespace } else { - DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Failed to extract property value for %C\n", name)); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Failed to extract property value for %C\n"), name)); return false; } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Property value for name '%C' has no value\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Property value for name '%C' has no value\n"), name)); return false; } @@ -69,8 +69,8 @@ namespace DANCE_TRACE ("NodeApplicion::<anonymous>::get_property_value<bool>"); CORBA::Any any; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<bool> - " - "Finding property value for name '%C'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<bool> - ") + ACE_TEXT("Finding property value for name '%C'\n"), name)); if (properties.find (name, any) == 0) @@ -81,14 +81,14 @@ namespace } else { - DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Failed to extract property value for %C\n", name)); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Failed to extract property value for %C\n"), name)); return false; } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<bool> - " - "Property value for name '%C' has no value\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<bool> - ") + ACE_TEXT("Property value for name '%C' has no value\n"), name)); return false; } @@ -99,8 +99,8 @@ namespace DANCE_TRACE ("NodeApplicion::<anonymous>::get_property_value<const char *>"); CORBA::Any any; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<bool> - " - "Finding property value for name '%C'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<bool> - ") + ACE_TEXT("Finding property value for name '%C'\n"), name)); if (properties.find (name, any) == 0) @@ -111,14 +111,14 @@ namespace } else { - DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<const char *> - " - "Failed to extract property value for %C\n", name)); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<const char *> - ") + ACE_TEXT("Failed to extract property value for %C\n"), name)); return false; } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<bool> - " - "Property value for name '%C' has no value\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<bool> - ") + ACE_TEXT("Property value for name '%C' has no value\n"), name)); return false; } @@ -128,30 +128,30 @@ namespace { DANCE_TRACE ("NodeApplicion::<anonymous>::get_property_value<T>"); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Finding property value for name '%C'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Finding property value for name '%C'\n"), name)); for (CORBA::ULong i = 0; i < properties.length (); ++i) { if (ACE_OS::strcmp (properties[i].name.in (), name) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Found property '%C'\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Found property '%C'\n"), name)); if (properties[i].value >>= val) return true; else { - DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Failed to extract property value for %C\n", name)); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Failed to extract property value for %C\n"), name)); return false; } } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Property value for name '%C' has no value\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Property value for name '%C' has no value\n"), name)); return false; } @@ -161,34 +161,35 @@ namespace { DANCE_TRACE ("NodeApplicion::<anonymous>::get_property_value<const char *>"); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Finding property value for name '%C'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Finding property value for name '%C'\n"), name)); for (CORBA::ULong i = 0; i < properties.length (); ++i) { if (ACE_OS::strcmp (properties[i].name.in (), name) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Found property '%C'\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Found property '%C'\n"), name)); if (properties[i].value >>= CORBA::Any::to_string (val, 0)) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Value is %C\n", val)); + DANCE_DEBUG ((LM_TRACE, + DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Value is %C\n"), val)); return true; } else { - DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Failed to extract property value for %C\n", name)); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Failed to extract property value for %C\n"), name)); return false; } } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " - "Unable to find property named %C\n", name)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ") + ACE_TEXT("Unable to find property named %C\n"), name)); return false; } @@ -241,8 +242,8 @@ NodeApplication_Impl::NodeApplication_Impl (CORBA::ORB_ptr orb, PROPERTY_MAP::const_iterator i = properties.begin (); while (!i.done ()) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::NodeApplication_Impl - " - "Binding value for property '%C'\n", i->key ().c_str ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::NodeApplication_Impl - ") + ACE_TEXT("Binding value for property '%C'\n"), i->key ().c_str ())); this->properties_.bind (i->key (), i->item ()); i.advance (); } @@ -264,21 +265,21 @@ NodeApplication_Impl::~NodeApplication_Impl() { /* TODO: This is highly suspect. I believe we should be using get_component_server, not calling create_container. */ - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Deactivating %u ComponentServers\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Deactivating %u ComponentServers\n"), this->servers_.size ())); for (size_t i = 0; i < this->servers_.size (); ++i) { ComponentServer &server = this->servers_[i]; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "In ComponentServer %u, deactivating %u containers\n", i, server.containers.size ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("In ComponentServer %u, deactivating %u containers\n"), i, server.containers.size ())); for (size_t j = 0; j < server.containers.size (); ++j) { Container &container = server.containers[j]; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "In container %u hosted in server %u\n", j, i)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("In container %u hosted in server %u\n"), j, i)); try { @@ -289,20 +290,20 @@ NodeApplication_Impl::~NodeApplication_Impl() } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Caught CORBA exception while removing container %u on server %u: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Caught CORBA exception while removing container %u on server %u: %C\n"), j, i, ex._info ().c_str ())); } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Caught unknown C++ exception while removing container %u on server %u.\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Caught unknown C++ exception while removing container %u on server %u.\n"), j, i)); } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Removing component server %u\n", i)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Removing component server %u\n"), i)); try { @@ -311,19 +312,19 @@ NodeApplication_Impl::~NodeApplication_Impl() } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Caught CORBA exception while removing server %u: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Caught CORBA exception while removing server %u: %C\n"), i, ex._info ().c_str ())); } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Caught unknown C++ exception while removing server %u.\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Caught unknown C++ exception while removing server %u.\n"), i)); } - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::~NodeApplication_Impl - " - "Successfully removed container %u on node %C.\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::~NodeApplication_Impl - ") + ACE_TEXT("Successfully removed container %u on node %C.\n"), i, this->node_name_.c_str ())); } } @@ -345,20 +346,20 @@ NodeApplication_Impl::init() CORBA::Boolean multithread = false; get_property_value (CIAO::Deployment::SERVER_EXECUTABLE, this->properties_, cs_path); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::init - " - "Component server path: %C\n", cs_path)); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::init - ") + ACE_TEXT("Component server path: %C\n"), cs_path)); get_property_value (CIAO::Deployment::SERVER_ARGUMENTS, this->properties_, cs_args); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::init - " - "Component server arguments: %C\n", cs_args)); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::init - ") + ACE_TEXT("Component server arguments: %C\n"), cs_args)); get_property_value (CIAO::Deployment::SERVER_TIMEOUT, this->properties_, spawn); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::init - " - "Spawn delay: %u\n", spawn)); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::init - ") + ACE_TEXT("Spawn delay: %u\n"), spawn)); get_property_value (CIAO::Deployment::SERVER_MULTITHREAD, this->properties_, multithread); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::init - " - "Threading: %C\n", multithread ? "Multi" : "Single")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::init - ") + ACE_TEXT("Threading: %C\n"), multithread ? "Multi" : "Single")); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::init - " - "Spawning server activator\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::init - ") + ACE_TEXT("Spawning server activator\n"))); CIAO::Deployment::ComponentInstallation_Impl *tmp_ci; @@ -391,9 +392,9 @@ NodeApplication_Impl::init() PortableServer::ObjectId_var sa_id = this->poa_->activate_object (this->activator_.get ()); - DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplication_impl::init - ServerActivator object created\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_impl::init - ServerActivator object created\n"))); - const ACE_TCHAR *ior; + const ACE_TCHAR *ior = 0; if (get_property_value (DAnCE::INSTANCE_NC, this->properties_, ior) || get_property_value (DAnCE::DOMAIN_NC, this->properties_, ior)) @@ -405,15 +406,15 @@ NodeApplication_Impl::init() } catch (const CORBA::Exception &e) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::init - " - "Unable to resolve the instance naming context:%C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::init - ") + ACE_TEXT("Unable to resolve the instance naming context:%C\n"), e._info ().c_str ())); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_impl::init - " - "Successfully resolved the instance naming context.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init - ") + ACE_TEXT("Successfully resolved the instance naming context.\n"))); } - else DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_impl::init - " - "No instance NC was provided\n")); + else DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init - ") + ACE_TEXT("No instance NC was provided\n"))); } void @@ -431,8 +432,8 @@ NodeApplication_Impl::configuration_complete_components () continue; } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::configuration_complete_components - " - "Invoking configuration_complete on component instance %C on node %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::configuration_complete_components - ") + ACE_TEXT("Invoking configuration_complete on component instance %C on node %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), this->node_name_.c_str ())); @@ -442,8 +443,8 @@ NodeApplication_Impl::configuration_complete_components () Components::CCMObject::_narrow (this->instances_[k]->ref.in ()); if (CORBA::is_nil (this->instances_[k]->ref)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::configuration_complete_components - " - "Failed to narrow object reference for component instance %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::configuration_complete_components - ") + ACE_TEXT("Failed to narrow object reference for component instance %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); continue; } @@ -464,14 +465,14 @@ NodeApplication_Impl::configuration_complete_components () } } - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::configuration_complete_components - " - "Component %C successfully configured.\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::configuration_complete_components - ") + ACE_TEXT("Component %C successfully configured.\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::configuration_complete_components - " - "Caught CORBA exception from ccm_activate on component %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::configuration_complete_components - ") + ACE_TEXT("Caught CORBA exception from ccm_activate on component %C: %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), ex._info ().c_str ())); if (!error) @@ -483,8 +484,8 @@ NodeApplication_Impl::configuration_complete_components () } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::configuration_complete_components - " - "Caught unknown C++ exception from ccm_activate on component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::configuration_complete_components - ") + ACE_TEXT("Caught unknown C++ exception from ccm_activate on component %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); if (!error) { @@ -514,8 +515,8 @@ NodeApplication_Impl::start () continue; } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::start - " - "Invoking start on component instance %C on node %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Invoking start on component instance %C on node %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), this->node_name_.c_str ())); @@ -526,9 +527,9 @@ NodeApplication_Impl::start () if (CORBA::is_nil (this->instances_[k]->container->ref.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::start - " - "Failed to narrow object reference for container managing " - "component instance %C to a CIAO container reference\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Failed to narrow object reference for container managing ") + ACE_TEXT("component instance %C to a CIAO container reference\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, exception, this->plan_.instance[this->instances_[k]->idd_idx].name.in (), @@ -553,14 +554,14 @@ NodeApplication_Impl::start () } } - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::start - " - "Component %C successfully activated.\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Component %C successfully activated.\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::start - " - "Caught CORBA exception from ccm_activate on component %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Caught CORBA exception from ccm_activate on component %C: %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), ex._info ().c_str ())); if (!error) @@ -572,8 +573,8 @@ NodeApplication_Impl::start () } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::start - " - "Caught unknown C++ exception from ccm_activate on component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Caught unknown C++ exception from ccm_activate on component %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); if (!error) { @@ -596,8 +597,8 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst) const ::Deployment::MonolithicDeploymentDescription &mdd = this->plan_.implementation[inst.mdd_idx]; const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx]; - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_home - " - "Starting installation of home %C on node %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Starting installation of home %C on node %C\n"), idd.name.in (), idd.node.in ())); this->instances_[inst.idd_idx] = &inst; @@ -608,8 +609,8 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst) if (entrypt == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_home - " - "Unable to find home factory property on home %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Unable to find home factory property on home %C\n"), idd.name.in ())); throw ::Deployment::InvalidComponentExecParameter (mdd.name.in (), "No 'home factory' property present on MDD\n"); @@ -622,25 +623,25 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst) for (CORBA::ULong i = 0; i < mdd.execParameter.length (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_home - " - "Inserting value for execParameter %C\n", mdd.execParameter[i].name.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Inserting value for execParameter %C\n"), mdd.execParameter[i].name.in ())); config[pos++] = new CIAO::ConfigValue_impl (mdd.execParameter[i].name.in (), mdd.execParameter[i].value); } for (CORBA::ULong i = 0; i < idd.configProperty.length (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_home - " - "Inserting value for configProperty %C\n", idd.configProperty[i].name.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Inserting value for configProperty %C\n"), idd.configProperty[i].name.in ())); config[pos++] = new CIAO::ConfigValue_impl (idd.configProperty[i].name.in (), idd.configProperty[i].value); } try { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_home - " - "Calling install_home on container. Home id '%C', entrypt '%C', " - "length of config values is %u\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Calling install_home on container. Home id '%C', entrypt '%C', ") + ACE_TEXT("length of config values is %u\n"), idd.name.in (), entrypt, config.length ())); ::Components::CCMHome_var home = cont.ref->install_home (idd.name.in (), @@ -649,22 +650,22 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst) if (CORBA::is_nil (home)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_home - " - "Got nil object reference from container while installing home %C on node %C," - "throwing PlanError\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Got nil object reference from container while installing home %C on node %C,") + ACE_TEXT("throwing PlanError\n"), idd.name.in (), idd.node.in ())); throw ::Deployment::PlanError (idd.name.in (), "Nil object reference returned from conainer"); } - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::install_home - " - "Home '%C' on node '%C' successfully installed\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Home '%C' on node '%C' successfully installed\n"), idd.name.in (), idd.node.in ())); inst.ref = CORBA::Object::_narrow (home); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_home - " - "Populating attributes for home %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Populating attributes for home %C\n"), idd.name.in ())); @@ -677,16 +678,16 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst) } catch (const Components::InvalidConfiguration &) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_home - " - "Error creating home %C on node %C, caught InvalidConfiguration. Throwing exception\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Error creating home %C on node %C, caught InvalidConfiguration. Throwing exception\n"), idd.name.in (), idd.node.in ())); throw ::Deployment::InvalidProperty (idd.name.in (), "Invalid configuration exception from container"); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_home - " - "Caught CORBA exception while installing home %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Caught CORBA exception while installing home %C: %C\n"), idd.name.in (), ex._info ().c_str ())); throw ::Deployment::StartError (idd.name.in (), @@ -694,8 +695,8 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst) } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_home - " - "Caught unknown C++ exception while installing home %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Caught unknown C++ exception while installing home %C\n"), idd.name.in ())); throw ::Deployment::StartError (idd.name.in (), "Unknown C++ exception"); @@ -710,8 +711,8 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) const ::Deployment::MonolithicDeploymentDescription &mdd = this->plan_.implementation[inst.mdd_idx]; const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx]; - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_component - " - "Starting installation of component %C on node %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Starting installation of home %C on node %C\n"), idd.name.in (), idd.node.in ())); this->instances_[inst.idd_idx] = &inst; @@ -721,8 +722,8 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) if (entrypt == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - " - "Unable to find component factory property on component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Unable to find component factory property on component %C\n"), idd.name.in ())); throw ::Deployment::InvalidComponentExecParameter (mdd.name.in (), "No 'component factory' property present on MDD\n"); @@ -735,16 +736,16 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) for (CORBA::ULong i = 0; i < mdd.execParameter.length (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_component - " - "Inserting value for execParameter %C\n", mdd.execParameter[i].name.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Inserting value for execParameter %C\n"), mdd.execParameter[i].name.in ())); config[pos++] = new CIAO::ConfigValue_impl (mdd.execParameter[i].name.in (), mdd.execParameter[i].value); } for (CORBA::ULong i = 0; i < idd.configProperty.length (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_component - " - "Inserting value for configProperty %C\n", idd.configProperty[i].name.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Inserting value for configProperty %C\n"), idd.configProperty[i].name.in ())); config[pos++] = new CIAO::ConfigValue_impl (idd.configProperty[i].name.in (), idd.configProperty[i].value); } @@ -753,18 +754,18 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) if (CORBA::is_nil (ciao_cont.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - " - "Unable to narrow container assigned for component instance %C to one that supports " - "un-homed components.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Unable to narrow container assigned for component instance %C to one that supports ") + ACE_TEXT("un-homed components.\n"))); throw ::Deployment::PlanError (idd.name.in (), "Hosting container does not support unhomed components.\n"); } try { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_component - " - "Calling install_component on container. Component id '%C', entrypt '%C', " - "length of config values is %u\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Calling install_component on container. Component id '%C', entrypt '%C', ") + ACE_TEXT("length of config values is %u\n"), idd.name.in (), entrypt, config.length ())); ::Components::CCMObject_var comp = ciao_cont->install_component (idd.name.in (), @@ -773,22 +774,22 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) if (CORBA::is_nil (comp)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - " - "Got nil object reference from container while installing component %C on node %C," - "throwing PlanError\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Got nil object reference from container while installing component %C on node %C,") + ACE_TEXT("throwing PlanError\n"), idd.name.in (), idd.node.in ())); throw ::Deployment::PlanError (idd.name.in (), "Nil object reference returned from install_component on conainer"); } - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::install_component - " - "Component '%C' on node '%C' successfully installed\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Component '%C' on node '%C' successfully installed\n"), idd.name.in (), idd.node.in ())); inst.ref = CORBA::Object::_narrow (comp); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_component - " - "Populating attributes for home %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Populating attributes for home %C\n"), idd.name.in ())); @@ -801,16 +802,16 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) } catch (const Components::InvalidConfiguration &) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - " - "Error creating component %C on node %C, caught InvalidConfiguration. Throwing exception\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Error creating component %C on node %C, caught InvalidConfiguration. Throwing exception\n"), idd.name.in (), idd.node.in ())); throw ::Deployment::InvalidProperty (idd.name.in (), "Invalid configuration exception from container"); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - " - "Caught CORBA exception while installing component %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Caught CORBA exception while installing component %C: %C\n"), idd.name.in (), ex._info ().c_str ())); throw ::Deployment::StartError (idd.name.in (), @@ -818,8 +819,8 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst) } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - " - "Caught unknown C++ exception while installing component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_component - ") + ACE_TEXT("Caught unknown C++ exception while installing component %C\n"), idd.name.in ())); throw ::Deployment::StartError (idd.name.in (), "Unknown C++ exception"); @@ -835,30 +836,30 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx]; this->instances_[inst.idd_idx] = &inst; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_homed_component - " - "Starting installation of homed component %C on node %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Starting installation of homed component %C on node %C\n"), idd.name.in (), idd.node.in ())); const char *home_id = 0; get_property_value (DAnCE::EXPLICIT_HOME, idd.configProperty, home_id); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_homed_component - " - "Property %C has value %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Property %C has value %C\n"), DAnCE::EXPLICIT_HOME, home_id)); if (home_id == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "Nodeapplication_Impl::install_homed_component - " - "Apparent homed component %C lacks a %C configProperty, aborting installation\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Nodeapplication_Impl::install_homed_component - ") + ACE_TEXT("Apparent homed component %C lacks a %C configProperty, aborting installation\n"), idd.name.in (), DAnCE::EXPLICIT_HOME)); throw ::Deployment::PlanError (idd.name.in (), "No explicit home property on component requiring explicit home."); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_homed_component - " - "Found explicit home property '%C' for component '%C'\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Found explicit home property '%C' for component '%C'\n"), home_id, idd.name.in ())); @@ -869,8 +870,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) if (ACE_OS::strcmp (home_id, this->plan_.instance[cont.homes[i].idd_idx].name.in ()) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_homed_component - " - "Found home designated for component '%C'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Found home designated for component '%C'\n"), idd.name.in ())); home_inst = &cont.homes[i]; break; @@ -879,8 +880,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) if (home_inst == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " - "Unable to find home instance matching %C allocated to same container as component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Unable to find home instance matching %C allocated to same container as component %C\n"), home_id, idd.name.in ())); throw Deployment::InvalidProperty (idd.name.in (), @@ -892,8 +893,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) if (CORBA::is_nil (home.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " - "Object reference for home '%C' for homed component '%C' is nil\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Object reference for home '%C' for homed component '%C' is nil\n"), home_id, idd.name.in ())); throw Deployment::PlanError (idd.name.in (), @@ -903,8 +904,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) try { inst.home = home_inst; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_homed_component - " - "Invoking create_component on home %C for component %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Invoking create_component on home %C for component %C\n"), home_id, idd.name.in ())); @@ -912,22 +913,22 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) if (CORBA::is_nil (ccm_obj)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " - "Received nil component reference from create_component on home %C " - " while creating component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Received nil component reference from create_component on home %C ") + ACE_TEXT(" while creating component %C\n"), home_id, idd.name.in ())); throw Deployment::StartError (idd.name.in (), "Home for explicitly homed component returned nil"); } inst.ref = CORBA::Object::_narrow (ccm_obj.in ()); - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::install_homed_component - " - "Component %C successfully installed in home %C\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Component %C successfully installed in home %C\n"), idd.name.in (), home_id)); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_home - " - "Populating attributes for component %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ") + ACE_TEXT("Populating attributes for component %C\n"), idd.name.in ())); ComponentAttributesSetter::SetComponentAttributes (idd.name.in (), inst.ref.in (), @@ -937,8 +938,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) } catch (const Components::CreateFailure &) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " - "Caught CreateFailure exception from home '%C' while installing component '%C'\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Caught CreateFailure exception from home '%C' while installing component '%C'\n"), home_inst, idd.name.in ())); throw Deployment::StartError (idd.name.in (), @@ -946,8 +947,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " - "Caught CORBA exception while installing component %C in home %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Caught CORBA exception while installing component %C in home %C: %C\n"), idd.name.in (), home_id, ex._info ().c_str ())); @@ -956,8 +957,8 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " - "Caught unknown C++ exception while installing component %C in home %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ") + ACE_TEXT("Caught unknown C++ exception while installing component %C in home %C\n"), idd.name.in (), home_id)); throw ::Deployment::StartError (idd.name.in (), @@ -974,26 +975,26 @@ NodeApplication_Impl::create_component_server (size_t index) try { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::create_component_Server - " - "creating component server %u\n", index)); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::create_component_Server - ") + ACE_TEXT("creating component server %u\n"), index)); ::Components::ConfigValues config_values; server.ref = this->activator_->create_component_server (config_values); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::create_component_server - " - "component server created\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::create_component_server - ") + ACE_TEXT("component server created\n"))); } catch (const ::Components::CreateFailure& ) { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::create_container - " - "Components::Deployment::ServerActivator_var::create_component_server() " - "returned ::Components::CreateFailure exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::create_container - ") + ACE_TEXT("Components::Deployment::ServerActivator_var::create_component_server() ") + ACE_TEXT("returned ::Components::CreateFailure exception\n"))); throw ::Deployment::StartError("", "Received a ::Components::CreateFailure exception while creating component server."); } catch (const ::Components::Deployment::InvalidConfiguration& ) { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::create_container - " - "Components::Deployment::ServerActivator_var::create_component_server() " - "returned ::Components::Deployment::InvalidConfiguration exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::create_container - ") + ACE_TEXT("Components::Deployment::ServerActivator_var::create_component_server() ") + ACE_TEXT("returned ::Components::Deployment::InvalidConfiguration exception\n"))); throw ::Deployment::InvalidProperty("", "::Components::Deployment::InvalidConfiguration exception caught while creating server"); } @@ -1007,8 +1008,8 @@ NodeApplication_Impl::create_component_server (size_t index) } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::create_container - " - "Caught exception whilst creating container; re-throwing.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::create_container - ") + ACE_TEXT("Caught exception whilst creating container; re-throwing.\n"))); throw; } } @@ -1024,8 +1025,8 @@ NodeApplication_Impl::store_instance_ior (Instance &inst) this->plan_.instance[inst.idd_idx].configProperty, name)) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_impl::store_instance_ior - " - "Storing instance '%C' object reference in Naming Service as %C", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::store_instance_ior - ") + ACE_TEXT("Storing instance '%C' object reference in Naming Service as %C"), this->plan_.instance[inst.idd_idx].name.in (), name)); @@ -1048,15 +1049,15 @@ NodeApplication_Impl::create_container (size_t server, size_t cont_idx) Container &container = this->servers_[server].containers[cont_idx]; - DANCE_DEBUG ((LM_TRACE, "NodeApplication_impl::create_container - " - "Creating container\n")); + DANCE_DEBUG ((LM_TRACE, ACE_TEXT("NodeApplication_impl::create_container - ") + ACE_TEXT("Creating container\n"))); // TODO: Need to create configvalues Components::ConfigValues cvs; container.ref = this->servers_[server].ref->create_container (cvs); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_impl::create_container - " - "Configuring %u homes on container %u on server %u\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_impl::create_container - ") + ACE_TEXT("Configuring %u homes on container %u on server %u\n"), container.homes.size (), server, cont_idx)); @@ -1067,8 +1068,8 @@ NodeApplication_Impl::create_container (size_t server, size_t cont_idx) this->store_instance_ior (container.homes[i]); } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_impl::create_container - " - "Configuring %u components on container %u on server %u\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_impl::create_container - ") + ACE_TEXT("Configuring %u components on container %u on server %u\n"), container.components.size (), server, cont_idx)); @@ -1143,8 +1144,8 @@ NodeApplication_Impl::init_components() DANCE_TRACE ("NodeApplication_impl::init_components"); Components::ConfigValues config_values; - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::init_components - " - "Configuring %u component/home instances\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init_components - ") + ACE_TEXT("Configuring %u component/home instances\n"), this->plan_.instance.length())); // @@TODO: For the moment, we are only going to support a single component server and container. @@ -1172,8 +1173,8 @@ NodeApplication_Impl::init_components() { case eHome: { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_impl::init_components - " - "Allocating instance %C as a home\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init_components - ") + ACE_TEXT("Allocating instance %C as a home\n"), this->plan_.instance[i].name.in ())); size_t pos = this->servers_[0].containers[0].homes.size (); @@ -1187,8 +1188,8 @@ NodeApplication_Impl::init_components() } case eComponent: { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_impl::init_components - " - "Allocating instance %C as a standalone component\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init_components - ") + ACE_TEXT("Allocating instance %C as a standalone component\n"), this->plan_.instance[i].name.in ())); size_t pos = this->servers_[0].containers[0].components.size (); this->servers_[0].containers[0].components.size (pos + 1); @@ -1201,8 +1202,8 @@ NodeApplication_Impl::init_components() } case eHomedComponent: { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_impl::init_components - " - "Allocating instance %C as a home managed component\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init_components - ") + ACE_TEXT("Allocating instance %C as a home managed component\n"), this->plan_.instance[i].name.in ())); size_t pos = this->servers_[0].containers[0].components.size (); this->servers_[0].containers[0].components.size (pos + 1); @@ -1215,30 +1216,30 @@ NodeApplication_Impl::init_components() } default: { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::init_components - " - "get_instance_type function returned invalid instance type\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::init_components - ") + ACE_TEXT("get_instance_type function returned invalid instance type\n"))); throw ::Deployment::InvalidProperty (this->plan_.instance[i].name.in (), "Unable to affirmatively determine instance type"); } } // switch } catch (...) { - DANCE_ERROR((LM_ERROR, DLINFO "Exception was thrown while sorting instance \"%C\".\n", this->plan_.instance[i].name.in())); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("Exception was thrown while sorting instance \"%C\".\n"), this->plan_.instance[i].name.in())); throw; } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_impl::init_components - " - "Creating component servers and installing components.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_impl::init_components - ") + ACE_TEXT("Creating component servers and installing components.\n"))); for (size_t i = 0; i < this->servers_.size (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_impl::init_components - " - "Creating component server with index %u\n", i)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_impl::init_components - ") + ACE_TEXT("Creating component server with index %u\n"), i)); this->create_component_server (i); } - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::init_components - finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::init_components - finished\n"))); } void @@ -1263,9 +1264,9 @@ NodeApplication_Impl::passivate_components() if (CORBA::is_nil (this->instances_[k]->container->ref.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::start - " - "Failed to narrow object reference for container managing " - "component instance %C to a CIAO container reference\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Failed to narrow object reference for container managing ") + ACE_TEXT("component instance %C to a CIAO container reference\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, exception, this->plan_.instance[this->instances_[k]->idd_idx].name.in (), @@ -1281,8 +1282,8 @@ NodeApplication_Impl::passivate_components() } else { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::start - " - "Attempting to passivate non-active component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::start - ") + ACE_TEXT("Attempting to passivate non-active component %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, exception, this->plan_.instance[this->instances_[k]->idd_idx].name.in (), @@ -1290,14 +1291,14 @@ NodeApplication_Impl::passivate_components() continue; } - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::passivate_components - " - "Component %C successfully passivated.\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::passivate_components - ") + ACE_TEXT("Component %C successfully passivated.\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::passivate_components - " - "Caught CORBA exception from ccm_passivate on component %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::passivate_components - ") + ACE_TEXT("Caught CORBA exception from ccm_passivate on component %C: %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), ex._info ().c_str ())); if (!error) @@ -1309,8 +1310,8 @@ NodeApplication_Impl::passivate_components() } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::passivate_components - " - "Caught unknown C++ exception from ccm_passivate on component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::passivate_components - ") + ACE_TEXT("Caught unknown C++ exception from ccm_passivate on component %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); if (!error) { @@ -1343,15 +1344,15 @@ NodeApplication_Impl::remove_components() continue; if (this->instances_[k]->state != ePassive) - DANCE_DEBUG ((LM_WARNING, DLINFO "NodeApplication_Impl::remove_components - " - "Attempting to remove component that is not passive.\n")); + DANCE_DEBUG ((LM_WARNING, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Attempting to remove component that is not passive.\n"))); if (this->instances_[k]->type == eComponent) { if (this->instances_[k]->container == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Container element in component data structure for '%C' is nill\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Container element in component data structure for '%C' is nill\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in () )); @@ -1368,8 +1369,8 @@ NodeApplication_Impl::remove_components() if (CORBA::is_nil (ciao_container.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Attempted to remove un-homed component from unsupported container\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Attempted to remove un-homed component from unsupported container\n"))); test_and_set_exception (error, exception, this->plan_.instance[this->instances_[k]->idd_idx].name.in (), @@ -1387,8 +1388,8 @@ NodeApplication_Impl::remove_components() if (CORBA::is_nil (home)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Object reference for home %C, managing component %C is nil.\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Object reference for home %C, managing component %C is nil.\n"), this->plan_.instance[this->instances_[k]->home->idd_idx].name.in (), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, @@ -1405,15 +1406,15 @@ NodeApplication_Impl::remove_components() this->instances_[k]->state = eRemoved; - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::remove_components - " - "Component %C successfully removed.\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Component %C successfully removed.\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Caught CORBA exception removing on component %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Caught CORBA exception removing on component %C: %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), ex._info ().c_str ())); test_and_set_exception (error, @@ -1423,8 +1424,8 @@ NodeApplication_Impl::remove_components() } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Caught unknown C++ exception from ccm_remove on component %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Caught unknown C++ exception from ccm_remove on component %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, exception, @@ -1440,15 +1441,15 @@ NodeApplication_Impl::remove_components() if (this->instances_[k]->type != eHome) continue; - DANCE_ERROR ((LM_TRACE, DLINFO "NodeApplication_Impl::remove_components - " - "Removing home %C\n", + DANCE_ERROR ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Removing home %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); if (this->instances_[k]->container == 0 || CORBA::is_nil (this->instances_[k]->container->ref.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Home %C lacks an associated container reference\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Home %C lacks an associated container reference\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, exception, @@ -1460,14 +1461,14 @@ NodeApplication_Impl::remove_components() Components::CCMHome_var home = Components::CCMHome::_narrow (this->instances_[k]->ref.in ()); this->instances_[k]->container->ref->remove_home (home.in ()); - DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::remove_components - " - "Successfully uninstalled home %C\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Successfully uninstalled home %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); } catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Caught CORBA exception removing home %C: %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Caught CORBA exception removing home %C: %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in (), ex._info ().c_str ())); test_and_set_exception (error, @@ -1477,8 +1478,8 @@ NodeApplication_Impl::remove_components() } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::remove_components - " - "Caught unknown C++ exception from while removing home %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::remove_components - ") + ACE_TEXT("Caught unknown C++ exception from while removing home %C\n"), this->plan_.instance[this->instances_[k]->idd_idx].name.in ())); test_and_set_exception (error, exception, @@ -1498,35 +1499,35 @@ NodeApplication_Impl::get_instance_type (const Deployment::Properties& prop) con for (CORBA::ULong i = 0; i < prop.length (); ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::get_instance_type - " - "Checking property %C\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::get_instance_type - ") + ACE_TEXT("Checking property %C\n"), prop[i].name.in ())); if (ACE_OS::strcmp (prop[i].name.in (), DAnCE::HOME_FACTORY) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::get_instance_type - " - "Found Home type\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::get_instance_type - ") + ACE_TEXT("Found Home type\n"))); return eHome; } if (ACE_OS::strcmp (prop[i].name.in (), DAnCE::COMPONENT_FACTORY) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::get_instance_type - " - "Found unmanaged component type.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::get_instance_type - ") + ACE_TEXT("Found unmanaged component type.\n"))); return eComponent; } if (ACE_OS::strcmp (prop[i].name.in (), DAnCE::EXPLICIT_HOME) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::get_instance_type - " - "Found explicit home component type.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::get_instance_type - ") + ACE_TEXT("Found explicit home component type.\n"))); return eHomedComponent; } } - DANCE_ERROR ((LM_INFO, DLINFO "NodeApplication_Impl::get_instance_type - " - "Unable to determine instance type\n")); + DANCE_ERROR ((LM_INFO, DLINFO ACE_TEXT("NodeApplication_Impl::get_instance_type - ") + ACE_TEXT("Unable to determine instance type\n"))); return eInvalid; } @@ -1556,9 +1557,9 @@ NodeApplication_Impl::create_config_values (const Deployment::Properties& /*prop } default: { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::create_config_values - " - "request is not a know type: eCreateComponentServer, eCreateContainer, " - "eInstallHome, eCreateComponentWithConfigValues\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::create_config_values - ") + ACE_TEXT("request is not a know type: eCreateComponentServer, eCreateContainer, ") + ACE_TEXT("eInstallHome, eCreateComponentWithConfigValues\n"))); throw ::Deployment::InvalidProperty("", "Invalid creation type for filling in config values"); } @@ -1568,7 +1569,7 @@ NodeApplication_Impl::create_config_values (const Deployment::Properties& /*prop Deployment::Connections* NodeApplication_Impl::getAllConnections() { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - started\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - started\n"))); Deployment::Connections_var conn; ACE_NEW_THROW_EX (conn, @@ -1602,8 +1603,8 @@ NodeApplication_Impl::getAllConnections() ACE_CString inst_name = this->plan_.instance[this->plan_.connection[i].internalEndpoint[j].instanceRef].name.in(); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::getAllConnections() - " - "Found provider '%C' for connection '%C'\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::getAllConnections() - ") + ACE_TEXT("Found provider '%C' for connection '%C'\n"), this->plan_.connection[i].name.in (), inst_name.c_str ())); @@ -1623,21 +1624,21 @@ NodeApplication_Impl::getAllConnections() ACE_CString name = this->plan_.connection[i].internalEndpoint[j].portName.in(); if (name.compare ("supports") != 0) { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - " - "provide_facet for connection %C endpoint %C started\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - ") + ACE_TEXT("provide_facet for connection %C endpoint %C started\n"), this->plan_.connection[i].name.in(), this->plan_.connection[i].internalEndpoint[j].portName.in())); CORBA::String_var facet_name = CORBA::string_dup (name.c_str()); (*conn) [index].endpoint[0] = obj->provide_facet (facet_name.in()); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - " - "provide_facet for connection %C endpoint %C finished\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - ") + ACE_TEXT("provide_facet for connection %C endpoint %C finished\n"), this->plan_.connection[i].name.in(), this->plan_.connection[i].internalEndpoint[j].portName.in())); } else { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - " - "provide_facet for connection %C endpoint %C started\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - ") + ACE_TEXT("provide_facet for connection %C endpoint %C started\n"), this->plan_.connection[i].name.in(), this->plan_.connection[i].internalEndpoint[j].portName.in())); (*conn) [index].endpoint[0] = CORBA::Object::_duplicate (obj.in()); @@ -1648,13 +1649,13 @@ NodeApplication_Impl::getAllConnections() name, (*conn) [index].endpoint[0].in());*/ //app_node.addChild(path.c_str(), obj->provide_facet(facet_name)); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - provide_facet finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - provide_facet finished\n"))); } catch (const ::Components::InvalidName& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::getAllConnections - " - "Components::CCMObject_var::provide_facet() returned " - "::Components::InvalidName exception for connection %C and port %C\n", + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::getAllConnections - ") + ACE_TEXT("Components::CCMObject_var::provide_facet() returned ") + ACE_TEXT("::Components::InvalidName exception for connection %C and port %C\n"), this->plan_.connection[i].name.in (), this->plan_.connection[i].internalEndpoint[j].portName.in ())); throw ::Deployment::InvalidProperty(this->plan_.connection[i].name.in (), @@ -1666,8 +1667,8 @@ NodeApplication_Impl::getAllConnections() { try { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - " - "get_consumer for connection %C endpoint %C started\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - ") + ACE_TEXT("get_consumer for connection %C endpoint %C started\n"), this->plan_.connection[i].name.in(), this->plan_.connection[i].internalEndpoint[j].portName.in())); (*conn) [index].endpoint[0] = obj->get_consumer (this->plan_.connection[i].internalEndpoint[j].portName.in()); @@ -1678,14 +1679,14 @@ NodeApplication_Impl::getAllConnections() (*conn) [index].endpoint[0].in());*/ //app_node.addChild(path.c_str(), obj->get_consumer(this->plan_.connection[i].internalEndpoint[j].portName)); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - " - "get_consumer finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - ") + ACE_TEXT("get_consumer finished\n"))); } catch (const ::Components::InvalidName& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::getAllConnections - " - "Components::CCMObject_var::get_consumer() returned " - "::Components::InvalidName exception for connection %C and port %C\n", + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::getAllConnections - ") + ACE_TEXT("Components::CCMObject_var::get_consumer() returned ") + ACE_TEXT("::Components::InvalidName exception for connection %C and port %C\n"), this->plan_.connection[i].name.in (), this->plan_.connection[i].internalEndpoint[j].portName.in ())); throw ::Deployment::InvalidProperty(this->plan_.connection[i].name.in (), @@ -1695,9 +1696,9 @@ NodeApplication_Impl::getAllConnections() } default: { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::getAllConnections - " - "Connection.InternalEndPoint.Kind is not a " - "Deployment::Facet or Deployment::EventConsumer\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::getAllConnections - ") + ACE_TEXT("Connection.InternalEndPoint.Kind is not a ") + ACE_TEXT("Deployment::Facet or Deployment::EventConsumer\n"))); throw ::Deployment::InvalidProperty(this->plan_.connection[i].name.in (), "Invalid connection type, should be Facet or EventConsumer"); } @@ -1708,7 +1709,7 @@ NodeApplication_Impl::getAllConnections() } /*this->redirection_.registration_finish (this->node_name_, this->plan_.UUID.in());*/ //this->node_.registerObjects(this->plan_.UUID.in(), app_node); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::getAllConnections - finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::getAllConnections - finished\n"))); return conn._retn(); } @@ -1718,8 +1719,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe { DANCE_TRACE ("NodeApplication_Impl::finishLaunch"); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "started for connections sequence with length: %d\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("started for connections sequence with length: %d\n"), providedReference.length())); #ifdef GEN_OSTREAM_OPS @@ -1735,8 +1736,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe { CORBA::ULong inst (this->plan_.connection[j].internalEndpoint[0].instanceRef); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_impl::finishLaunch - " - "Connection %C, instance %u\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Connection %C, instance %u\n"), this->plan_.connection[j].name.in (), inst)); @@ -1754,8 +1755,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe if (CORBA::is_nil (obj.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "Unable to narrow apparent component instance reference to CCMObject for instance '%C'\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Unable to narrow apparent component instance reference to CCMObject for instance '%C'\n"), this->plan_.instance[inst].name.in ())); throw Deployment::InvalidConnection (this->plan_.instance[inst].name.in (), "Unable to narrow apparent component instance reference to CCMObject\n"); @@ -1780,8 +1781,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe { case Deployment::Facet: { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "set for facet %C\n", name.c_str ())); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("set for facet %C\n"), name.c_str ())); Components::CCMObject_var ext_inst; try { @@ -1813,8 +1814,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe ext_inst = Components::CCMObject::_narrow (tmp); if (CORBA::is_nil (ext_inst.in())) { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "facet for %C can't be narrowed\n", name.c_str ())); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("facet for %C can't be narrowed\n"), name.c_str ())); break; } this->connect_receptacle_ext (ext_inst, @@ -1836,7 +1837,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe } case Deployment::EventConsumer: { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for consumer\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - set for consumer\n"))); Components::CCMObject_var ext_inst; try { @@ -1849,8 +1850,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe ext_inst = Components::CCMObject::_narrow (tmp); if (CORBA::is_nil (ext_inst.in())) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "reference for %C can't be narrowed\n", name.c_str ())); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("reference for %C can't be narrowed\n"), name.c_str ())); throw ::Deployment::InvalidConnection(conn.name.in (), "Couldn't narrow reference for external reference"); break; @@ -1884,7 +1885,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe case Deployment::SimplexReceptacle: { // What we should do with Cookie, returned from connect call??? - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for receptacle\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - set for receptacle\n"))); this->connect_receptacle (obj.in(), conn.internalEndpoint[0].portName.in(), providedReference[i].endpoint[0].in()); @@ -1892,7 +1893,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe } case Deployment::EventEmitter: { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for emitter\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - set for emitter\n"))); this->connect_emitter (obj.in(), conn.internalEndpoint[0].portName.in(), providedReference[i].endpoint[0].in()); @@ -1900,7 +1901,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe } case Deployment::EventPublisher: { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for publisher\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - set for publisher\n"))); this->connect_publisher (obj.in(), conn.internalEndpoint[0].portName.in(), providedReference[i].endpoint[0].in()); @@ -1908,9 +1909,9 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe } default: { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - currect Connection.InternalEndPoint.Kind " - "is not a Deployment::SimplexReceptacle, Deployment::EventEmitter, Deployment::EventPublisher " - "(Connection:%C Kind:%i PortName:%C)\n", + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - currect Connection.InternalEndPoint.Kind ") + ACE_TEXT("is not a Deployment::SimplexReceptacle, Deployment::EventEmitter, Deployment::EventPublisher ") + ACE_TEXT("(Connection:%C Kind:%i PortName:%C)\n"), conn.name.in(), conn.internalEndpoint[0].kind, conn.internalEndpoint[0].portName.in() @@ -1922,16 +1923,16 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe } catch (::Deployment::StartError &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "Intercepted StartError exception while configuring %C conneciton, rethrowing\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Intercepted StartError exception while configuring %C conneciton, rethrowing\n"), name.c_str ())); ex.name = name.c_str (); throw; } catch (::Deployment::InvalidConnection &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "Intercepted InvalidConnection exception while configuring %C conneciton, rethrowing\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Intercepted InvalidConnection exception while configuring %C conneciton, rethrowing\n"), name.c_str ())); ex.name = name.c_str (); throw; @@ -1947,7 +1948,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe this->start(); } - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - finished\n"))); } Components::Cookie* @@ -1958,36 +1959,36 @@ NodeApplication_Impl::connect_receptacle (Components::CCMObject_ptr inst, Components::Cookie* res = 0; try { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "connect SimplexReceptacle for %C started\n", port_name.c_str())); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("connect SimplexReceptacle for %C started\n"), port_name.c_str())); res = inst->connect (port_name.c_str(), facet); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - connect finished\n"))); } catch (const ::Components::InvalidName& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n"))); throw ::Deployment::StartError("", "Received InvalidName exception while connecting receptacle."); } catch (const ::Components::InvalidConnection& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::InvalidConnection exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::InvalidConnection exception\n"))); throw ::Deployment::InvalidConnection("", "InvalidConnection caught while connecting receptacle."); } catch (const ::Components::AlreadyConnected& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::AlreadyConnected exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::AlreadyConnected exception\n"))); throw ::Deployment::InvalidConnection("", "Caught AlredyConnected exception while connecting receptacle"); } catch (const ::Components::ExceededConnectionLimit& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::ExceededConnectionLimit exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::ExceededConnectionLimit exception\n"))); throw ::Deployment::InvalidConnection("", "Caught ExceededConnectionLimit exception while connecting receptacle."); } @@ -2002,36 +2003,36 @@ NodeApplication_Impl::connect_receptacle_ext (Components::CCMObject_ptr inst, Components::Cookie* res = 0; try { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "connect SimplexReceptacle for %C started\n", port_name.c_str())); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("connect SimplexReceptacle for %C started\n"), port_name.c_str())); res = inst->connect (port_name.c_str(), facet); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - connect finished\n"))); } catch (const ::Components::InvalidName& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n"))); throw ::Deployment::StartError("", "Caught InvalidName exception while connecting external receptacle."); } catch (const ::Components::InvalidConnection& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::InvalidConnection exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::InvalidConnection exception\n"))); throw ::Deployment::InvalidConnection("", "Caught InvalidConnection exception while connecting external receptacle."); } catch (const ::Components::AlreadyConnected& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::AlreadyConnected exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::AlreadyConnected exception\n"))); throw ::Deployment::InvalidConnection("", "Caught AlreadyConnected exception while connecting external receptacle."); } catch (const ::Components::ExceededConnectionLimit& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect() returned ::Components::ExceededConnectionLimit exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::ExceededConnectionLimit exception\n"))); throw ::Deployment::InvalidConnection("", "Caught ExceededConnectionLimit while connecting external receptacle."); } @@ -2046,30 +2047,30 @@ NodeApplication_Impl::connect_emitter (Components::CCMObject_ptr inst, Components::EventConsumerBase_var event = Components::EventConsumerBase::_unchecked_narrow (consumer); try { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "connect_consumer for %C started\n", port_name.c_str())); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("connect_consumer for %C started\n"), port_name.c_str())); inst->connect_consumer (port_name.c_str(), event); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "connect_consumer finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("connect_consumer finished\n"))); } catch (const ::Components::InvalidName& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect_consumer() returned ::Components::InvalidName exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" ACE_TEXT(NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect_consumer() returned ::Components::InvalidName exception\n"))); throw ::Deployment::StartError("", "Caught InvalidName while connecting emitter."); } catch (const ::Components::AlreadyConnected& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect_consumer() returned ::Components::AlreadyConnected exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect_consumer() returned ::Components::AlreadyConnected exception\n"))); throw ::Deployment::InvalidConnection("", "Caught AlreadyConnected exception while connecting emitter"); } catch (const ::Components::InvalidConnection& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect_consumer() returned ::Components::InvalidConnection exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect_consumer() returned ::Components::InvalidConnection exception\n"))); throw ::Deployment::InvalidConnection("", "Caught InvalidConnection while connecting emitter."); } @@ -2083,22 +2084,22 @@ NodeApplication_Impl::connect_emitter_ext (Components::CCMObject_ptr inst, Components::EventConsumerBase_var event = Components::EventConsumerBase::_unchecked_narrow (consumer); try { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "connect_emitter_ext for %C started\n", port_name.c_str())); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("connect_emitter_ext for %C started\n"), port_name.c_str())); inst->connect_consumer (port_name.c_str(), event); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect_emitter_ext finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - connect_emitter_ext finished\n"))); } catch (const ::Components::AlreadyConnected& ) { - DANCE_DEBUG ( (LM_WARNING, "NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect_consumer() returned ::Components::AlreadyConnected exception\n")); + DANCE_DEBUG ( (LM_WARNING, ACE_TEXT("NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect_consumer() returned ::Components::AlreadyConnected exception\n"))); throw ::Deployment::InvalidConnection("", "Caught AlreadyConnected exception while connecting external emitter."); } catch (const ::Components::InvalidConnection& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::connect_consumer() returned ::Components::InvalidConnection exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::connect_consumer() returned ::Components::InvalidConnection exception\n"))); throw ::Deployment::InvalidConnection("", "Caught InvalidConnection exception while connecting external emitter."); } @@ -2113,8 +2114,8 @@ NodeApplication_Impl::connect_publisher (Components::CCMObject_ptr inst, if (CORBA::is_nil (inst)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::connect_publisher - " - "Provided a nil CCMObject reference while connecting port %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::connect_publisher - ") + ACE_TEXT("Provided a nil CCMObject reference while connecting port %C\n"), port_name.c_str ())); throw ::Deployment::InvalidConnection (); } @@ -2123,25 +2124,25 @@ NodeApplication_Impl::connect_publisher (Components::CCMObject_ptr inst, try { res = inst->subscribe (port_name.c_str(), event); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - successfully subscribed %C\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_impl::finishLaunch - successfully subscribed %C\n"), port_name.c_str ())); } catch (const ::Components::InvalidName& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::subscribe() returned ::Components::InvalidName exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::subscribe() returned ::Components::InvalidName exception\n"))); throw ::Deployment::StartError("", "Caught InvalidName exception while connecting publisher"); } catch (const ::Components::InvalidConnection& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::subscribe() returned ::Components::InvalidConnection exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::subscribe() returned ::Components::InvalidConnection exception\n"))); throw ::Deployment::InvalidConnection("", "Caught InvalidConnection exception while connecting publisher."); } catch (const ::Components::ExceededConnectionLimit& ) { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "Components::CCMObject_var::subscribe() returned ::Components::ExceededCOnnectionLimit exception\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_impl::finishLaunch - ") + ACE_TEXT("Components::CCMObject_var::subscribe() returned ::Components::ExceededCOnnectionLimit exception\n"))); throw ::Deployment::InvalidConnection("", "Caught ExceededConnectionLimit exception while connecting publisher."); } return res; diff --git a/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index 114aa1999b9..f0587fb8d50 100644 --- a/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -27,8 +27,8 @@ NodeApplicationManager_Impl::NodeApplicationManager_Impl (CORBA::ORB_ptr orb, { DANCE_TRACE ("NodeApplicationManager_Impl::NodeApplicationManager_Impl"); - DANCE_DEBUG((LM_DEBUG, DLINFO " NodeApplicationManager_Impl::NodeApplicationManager_Impl - " - "Initializing for node '%s' and plan '%s' starting...\n", + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT(" NodeApplicationManager_Impl::NodeApplicationManager_Impl - ") + ACE_TEXT("Initializing for node '%C' and plan '%C' starting...\n"), node_name.c_str(), plan_.UUID.in())); this->register_plan(); @@ -36,8 +36,8 @@ NodeApplicationManager_Impl::NodeApplicationManager_Impl (CORBA::ORB_ptr orb, PROPERTY_MAP::const_iterator i = properties.begin (); while (!i.done ()) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplicationManager_Impl::NodeApplicationManager_Impl - " - "Binding value for property %s\n", i->key ().c_str ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplicationManager_Impl::NodeApplicationManager_Impl - ") + ACE_TEXT("Binding value for property %s\n"), i->key ().c_str ())); this->properties_.bind (i->key (), i->item ()); i.advance (); } @@ -61,8 +61,8 @@ NodeApplicationManager_Impl::~NodeApplicationManager_Impl() } catch (...) { - DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicationManager_Impl::~NodeApplicationManager_Impl - " - "Caught exception in NodeApplicationManager destructor\n")); + DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicationManager_Impl::~NodeApplicationManager_Impl - ") + ACE_TEXT("Caught exception in NodeApplicationManager destructor\n"))); } } @@ -73,8 +73,8 @@ NodeApplicationManager_Impl::startLaunch (const Deployment::Properties &, DANCE_TRACE ("NodeApplicationManager_Impl::startLaunch"); // Creating NodeApplication object - DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_impl::startLaunch - " - "Initializing NodeApplication\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_impl::startLaunch - ") + ACE_TEXT("Initializing NodeApplication\n"))); ACE_NEW_THROW_EX (this->application_, NodeApplication_Impl (this->orb_.in(), this->poa_.in(), @@ -84,17 +84,17 @@ NodeApplicationManager_Impl::startLaunch (const Deployment::Properties &, this->properties_), CORBA::NO_MEMORY ()); - DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_impl::startLaunch - " - "Instructing NodeApplication to initialize components.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_impl::startLaunch - ") + ACE_TEXT("Instructing NodeApplication to initialize components.\n"))); this->application_->init_components(); - DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_impl::startLaunch - " - "Collecting connection references\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_impl::startLaunch - ") + ACE_TEXT("Collecting connection references\n"))); providedReference = this->application_->getAllConnections(); //this->parent_.registerConnections(this->plan_.UUID.in(), *providedReference); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplicationManager_impl::startLaunch - " - "Activating NodeApplication servant\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO ACE_TEXT("NodeApplicationManager_impl::startLaunch - ") + ACE_TEXT("Activating NodeApplication servant\n"))); PortableServer::ObjectId_var as_id = this->poa_->activate_object (this->application_); @@ -113,8 +113,8 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app { if (!application->_is_equivalent (this->poa_->servant_to_reference (this->application_))) { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplicationManager_Impl::destroyApplication - " - "application is equivalent to current application\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplicationManager_Impl::destroyApplication - ") + ACE_TEXT("application is equivalent to current application\n"))); throw ::Deployment::StopError(); } // this->redirection_.unregister (this->node_name_, this->plan_.UUID.in()); @@ -124,16 +124,16 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app if (this->properties_.find (DAnCE::STANDALONE_NM, val) == 0) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicationManager_Impl::destroyApplication - " - "Found STANDALONE_NM property\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::destroyApplication - ") + ACE_TEXT("Found STANDALONE_NM property\n"))); CORBA::Boolean standalone (false); val >>= CORBA::Any::to_boolean (standalone); if (standalone) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplicationManager_Impl::destroyApplication - " - "Acting as a standalone NM, passivating and removing installed components\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplicationManager_Impl::destroyApplication - ") + ACE_TEXT("Acting as a standalone NM, passivating and removing installed components\n"))); this->application_->passivate_components (); this->application_->remove_components (); @@ -147,23 +147,23 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app delete this->application_; this->application_ = 0; } - catch (CORBA::SystemException &) + catch (const CORBA::SystemException &) { throw; } - catch (Deployment::StopError &) + catch (const Deployment::StopError &) { throw; } - catch (CORBA::UserException &e) + catch (const CORBA::UserException &e) { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplicationManager_Impl::destroyApplication failed with UserException %s(%s) \"%s\"\n", + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplicationManager_Impl::destroyApplication failed with UserException %C(%C) \"%C\"\n"), e._name(), e._rep_id(), e._info().c_str())); throw Deployment::StopError(e._name(), e._info().c_str()); } catch (...) { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplicationManager_Impl::destroyApplication failed with unknown exception.\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeApplicationManager_Impl::destroyApplication failed with unknown exception.\n"))); throw Deployment::StopError(); } } @@ -171,10 +171,10 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app void NodeApplicationManager_Impl::register_plan(void) { - DANCE_TRACE ("NodeApplicationManager_Impl::register_plan()"); + DANCE_TRACE("NodeApplicationManager_Impl::register_plan()"); // this->redirection_.registration_start (this->node_name_, this->plan_.UUID.in()); - DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_Impl::register_plan - registering objects...\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - registering objects...\n"))); for (unsigned int i = 0; i < this->plan_.instance.length(); i++) { // this->redirection_.registration (this->node_name_, @@ -183,15 +183,15 @@ NodeApplicationManager_Impl::register_plan(void) // CORBA::Object::_nil()); } - DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_Impl::register_plan - registering endpoints...\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - registering endpoints...\n"))); for (unsigned int i = 0; i < this->plan_.connection.length(); i++) { for (unsigned int j = 0; j < this->plan_.connection[i].internalEndpoint.length(); j++) { if (this->plan_.connection[i].internalEndpoint[j].provider) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicationManager_Impl::register_plan - ", - "Registering Port '%s' on instance '%s' on node '%s'\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - "), + ACE_TEXT("Registering Port '%s' on instance '%s' on node '%s'\n"), this->plan_.connection[i].internalEndpoint[j].portName.in(), this->plan_.instance[this->plan_.connection[i].internalEndpoint[j].instanceRef].name.in(), this->node_name_.c_str ())); @@ -203,7 +203,7 @@ NodeApplicationManager_Impl::register_plan(void) } } } - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicationManager_Impl::register_plan - " - "Finishing registration\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - ") + ACE_TEXT("Finishing registration\n"))); //this->redirection_.registration_finish (this->node_name_, this->plan_.UUID.in()); } diff --git a/modules/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/modules/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp index 75d6ea7527b..21719294108 100644 --- a/modules/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp +++ b/modules/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp @@ -29,13 +29,13 @@ namespace DAnCE { DANCE_TRACE ( "NodeManager_Impl::NodeManager_Impl"); // redirection.add_node (name); - DANCE_DEBUG ((LM_INFO, DLINFO "NodeManager_impl::NodeManager_impl has been created\n")); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeManager_impl::NodeManager_impl has been created\n"))); PROPERTY_MAP::const_iterator i = properties.begin (); while (!i.done ()) { - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_Impl::NodeManager_Impl - " - "Binding property %C provided by caller.\n", i->key ().c_str ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_Impl::NodeManager_Impl - ") + ACE_TEXT("Binding property %s provided by caller.\n"), i->key ().c_str ())); this->properties_.bind (i->key (), i->item ()); i.advance (); } @@ -52,20 +52,20 @@ namespace DAnCE { PortableServer::ObjectId_var id = this->poa_->servant_to_id ( (*iter).int_id_); DANCE_DEBUG ((LM_TRACE, DLINFO - "NodeManager_impl::~NodeManager_impl - Deactivating NodeApplicationManager %s\n", + ACE_TEXT("NodeManager_impl::~NodeManager_impl - Deactivating NodeApplicationManager %s\n"), (*iter).ext_id_.c_str ())); this->poa_->deactivate_object (id.in()); DANCE_DEBUG ((LM_TRACE, DLINFO - "NodeManager_impl::~NodeManager_impl - deleting NodeApplicationManager\n")); + ACE_TEXT("NodeManager_impl::~NodeManager_impl - deleting NodeApplicationManager\n"))); delete (*iter).int_id_; DANCE_DEBUG ((LM_DEBUG, DLINFO - "NodeManager_impl::~NodeManager_impl - NodeApplicationManager deleted\n")); + ACE_TEXT("NodeManager_impl::~NodeManager_impl - NodeApplicationManager deleted\n"))); } catch (...) { DANCE_ERROR ((LM_WARNING, DLINFO - "NodeManager_impl::~NodeManager_impl - Caught exception while removing " - "NodeApplicationManager %C\n", (*iter).ext_id_.c_str ())); + ACE_TEXT("NodeManager_impl::~NodeManager_impl - Caught exception while removing ") + ACE_TEXT("NodeApplicationManager %s\n"), (*iter).ext_id_.c_str ())); } } } @@ -77,8 +77,8 @@ namespace DAnCE ::CORBA::Long /*updateInterval*/) { DANCE_TRACE ( "NodeManager_Impl::joinDomain"); - ACE_DEBUG ((LM_ERROR, DLINFO "NodeManager_Impl::joinDomain - " - "joinDomain not implemented\n")); + ACE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::joinDomain - ") + ACE_TEXT("joinDomain not implemented\n"))); throw CORBA::NO_IMPLEMENT (); } @@ -86,8 +86,8 @@ namespace DAnCE NodeManager_Impl::leaveDomain () { DANCE_TRACE ( "NodeManager_Impl::leaveDomain"); - ACE_DEBUG ((LM_ERROR, DLINFO "NodeManager_Impl::leaveDomain - " - "leave not implemented\n")); + ACE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::leaveDomain - ") + ACE_TEXT("leave not implemented\n"))); throw CORBA::NO_IMPLEMENT (); } @@ -97,8 +97,8 @@ namespace DAnCE { DANCE_TRACE ( "NodeManager_Impl::preparePlan"); - DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeManager_impl::preparePlan - " - "started for node %s and plan %s\n", this->name_.c_str(), plan.UUID.in())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - ") + ACE_TEXT("started for node %C and plan %C\n"), this->name_.c_str(), plan.UUID.in())); #ifdef GEN_OSTREAM_OPS { @@ -115,13 +115,13 @@ namespace DAnCE // What should we do here if we already have application for this plan? // Probably it is mistake because we should previously call destroyApplication // before performe relaunching of application - DANCE_ERROR ((LM_ERROR, DLINFO "NodeManager_impl::preparePlan - " - "ApplicationManager for UUID %s already exists\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - ") + ACE_TEXT("ApplicationManager for UUID %C already exists\n"), plan.UUID.in ())); throw ::Deployment::PlanError(); } - ACE_DEBUG ((LM_DEBUG, "*** size of properties_:%u\n", properties_.current_size ())); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::preparePlan - creating NodeApplicationManager...\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** size of properties_:%u\n"), properties_.current_size ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - creating NodeApplicationManager...\n"))); NodeApplicationManager_Impl* manager = 0; ACE_NEW_THROW_EX (manager, NodeApplicationManager_Impl (this->orb_.in(), @@ -131,14 +131,14 @@ namespace DAnCE this->name_, this->properties_), CORBA::NO_MEMORY()); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::preparePlan - activating NodeApplicationManager...\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - activating NodeApplicationManager...\n"))); PortableServer::ObjectId_var id = this->poa_->activate_object (manager); CORBA::Object_var nam = this->poa_->id_to_reference (id.in()); //there is an idea to check if plan.UUID really exists this->managers_.bind (plan.UUID.in(), manager); // narrow should return a nil reference if it fails. - DANCE_DEBUG ((LM_INFO, DLINFO "NodeManager_impl::preparePlan - NodeApplicationManager for plan %s completed\n", + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - NodeApplicationManager for plan %C completed\n"), plan.UUID.in ())); return Deployment::NodeApplicationManager::_narrow (nam.in ()); } @@ -156,17 +156,17 @@ namespace DAnCE { PortableServer::ObjectId_var id = this->poa_->reference_to_id (appManager); this->poa_->deactivate_object (id.in()); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::destroyManager - deleting NodeApplicationManager\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_impl::destroyManager - deleting NodeApplicationManager\n"))); delete (*iter).int_id_; - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::destroyManager - NodeApplicationManager deleted\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_impl::destroyManager - NodeApplicationManager deleted\n"))); this->managers_.unbind ( (*iter).ext_id_); - DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::destroyManager - finished\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_impl::destroyManager - finished\n"))); return; } } - DANCE_ERROR((LM_ERROR, DLINFO "NodeManager_impl::destroyManager - " - "correponding NodeApplicationManager cannot be found\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("NodeManager_impl::destroyManager - ") + ACE_TEXT("correponding NodeApplicationManager cannot be found\n"))); throw ::Deployment::InvalidReference(); } @@ -174,8 +174,8 @@ namespace DAnCE NodeManager_Impl::getDynamicResources () { DANCE_TRACE ( "NodeManager_Impl::getDynamicResources ()"); - ACE_DEBUG ((LM_ERROR, DLINFO "NodeManager_Impl::getDynamicResources - " - "getDynamicResources not implemented\n")); + ACE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::getDynamicResources - ") + ACE_TEXT("getDynamicResources not implemented\n"))); throw CORBA::NO_IMPLEMENT (); return 0; } diff --git a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp index b8f89761773..62c8f4d506e 100644 --- a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp +++ b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp @@ -119,61 +119,61 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) switch (c) { case 'n': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Provided Node Manager name: %C\n", get_opts.opt_arg ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Provided Node Manager name: %s\n"), get_opts.opt_arg ())); this->options_.node_managers_.push_back (get_opts.opt_arg ()); break; case 'p': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Instructed to create process ns with file %C\n", get_opts.opt_arg ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Instructed to create process ns with file %s\n"), get_opts.opt_arg ())); this->options_.process_ns_ = true; this->options_.process_ns_file_ = get_opts.opt_arg (); break; case 'c': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Instructed to create plan NS in context: %C\n", get_opts.opt_arg ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Instructed to create plan NS in context: %s\n"), get_opts.opt_arg ())); this->options_.create_plan_ns_ = true; this->options_.create_plan_ns_ior_ = get_opts.opt_arg (); break; case 'r': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Instructed to rebind plan NS in context: %C\n", get_opts.opt_arg ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Instructed to rebind plan NS in context: %s\n"), get_opts.opt_arg ())); this->options_.rebind_plan_ns_ = true; this->options_.rebind_plan_ns_ior_ = get_opts.opt_arg (); break; case 'i': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Instructed to create port indirection service\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Instructed to create port indirection service\n"))); this->options_.port_indirection_ = true; break; case 'f': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Instructed to ignore deployment errors\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Instructed to ignore deployment errors\n"))); this->options_.ignore_failure_ = true; break; case 's': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Using provided component server executable:%C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Using provided component server executable:%s\n"), get_opts.opt_arg ())); this->options_.cs_path_ = get_opts.opt_arg (); break; case 't': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Using provided component server spawn timeout:%C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Using provided component server spawn timeout:%s\n"), get_opts.opt_arg ())); this->options_.timeout_ = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'd': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Binding to provided Domain Naming Context: '%s'\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Binding to provided Domain Naming Context: '%s'\n"), get_opts.opt_arg ())); this->options_.domain_nc_ = get_opts.opt_arg (); break; @@ -190,52 +190,52 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) case 0: if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("standalone-nm")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Found option directing NodeManager to run as standalone entity.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Found option directing NodeManager to run as standalone entity.\n"))); this->options_.standalone_ = true; } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("server-args")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Using provided compoent server arguments: '%C'\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Using provided compoent server arguments: '%s'\n"), get_opts.opt_arg ())); this->options_.server_args_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), - "instance-nc") == 0) + ACE_TEXT("instance-nc")) == 0) { if (get_opts.opt_arg () == 0) { if (this->options_.domain_nc_ == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Manager_Module::parse_args - " - "ERROR: instance-nc provided no argument, but domain-nc did not appear before.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("ERROR: instance-nc provided no argument, but domain-nc did not appear before.\n"))); DANCE_ERROR_RETURN ((LM_ERROR, this->usage (), argv[0], c), false); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Instance NC defaulting to Domain NC\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Instance NC defaulting to Domain NC\n"))); this->options_.instance_nc_ = this->options_.domain_nc_; } else { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Using provided instance NC: %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("Using provided instance NC: %s\n"), get_opts.opt_arg ())); this->options_.instance_nc_ = get_opts.opt_arg (); } } else { - DANCE_ERROR ((LM_ERROR, DLINFO "Node_Manager_Module::parse_args - " - "ERROR: unknown long option %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") + ACE_TEXT("ERROR: unknown long option %s\n"), get_opts.long_option ())); } break; default: - DANCE_DEBUG ((LM_TRACE, DLINFO "Node_Manager_Module::parse_args - ignoring unknown option %i\n", + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ignoring unknown option %i\n"), c)); } } @@ -251,21 +251,21 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb, { if (CORBA::is_nil(orb)) { - DANCE_ERROR((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - " - "Attempted to create Node Manager with a nil orb.\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("Attempted to create Node Manager with a nil orb.\n"))); return CORBA::Object::_nil(); } if (CORBA::is_nil(this->orb_.in())) { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_NodeManager_Module::create_object - " - "NM's orb is nil.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("NM's orb is nil.\n"))); this->orb_ = CORBA::ORB::_duplicate (orb); } else if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0) { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_NodeManager_Module::create_object - " - "Resetting NM's orb.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("Resetting NM's orb.\n"))); this->orb_ = CORBA::ORB::_duplicate (orb); this->domain_nc_ = CosNaming::NamingContext::_nil(); } @@ -317,36 +317,36 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb, { try { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_NodeManager_Module::create_object - " - "Resolving DomainNC.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("Resolving DomainNC.\n"))); CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_); if (!CORBA::is_nil (domain_obj.in ())) { this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in()); if (CORBA::is_nil (this->domain_nc_.in ())) { - DANCE_ERROR ((LM_ERROR,DLINFO "DAnCE_NodeManager_Module::create_object - " - "Narrow to NamingContext return nil for DomainNC.\n")); + DANCE_ERROR ((LM_ERROR,DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n"))); return CORBA::Object::_nil (); } } } - catch (CORBA::Exception&) + catch (const CORBA::Exception&) { - DANCE_DEBUG ((LM_WARNING, DLINFO "DAnCE_NodeManager_Module::create_object - " - "DomainNC context not found!\n")); + DANCE_DEBUG ((LM_WARNING, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("DomainNC context not found!\n"))); } } - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_NodeManager_Module::create_object - " - "Resolving plan NS naming context.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT("Resolving plan NS naming context.\n"))); CosNaming::NamingContext_var rebind_nc; if (this->options_.rebind_plan_ns_) { if (!this->options_.create_plan_ns_) { - DANCE_ERROR((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - " - "Rebind_plan_ns option is enabled but Create_plan_ns is not.\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT ("Rebind_plan_ns option is enabled but Create_plan_ns is not.\n"))); return CORBA::Object::_nil(); } CORBA::Object_var tmp_obj; @@ -359,11 +359,11 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb, { if (CORBA::is_nil (this->domain_nc_.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - " - "The rebind plan is enabled but neither NC " - "nor DomainNC are not supplied. No rebinding will be done.\n" - "Use the \"-rebind-plan-ns NC ior\" " - "or \"-ORBInitRef DomainNC\" option.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT ("The rebind plan is enabled but neither NC ") + ACE_TEXT ("nor DomainNC are not supplied. No rebinding will be done.\n") + ACE_TEXT ("Use the \"-rebind-plan-ns NC ior\" ") + ACE_TEXT ("or \"-ORBInitRef DomainNC\" option.\n"))); return CORBA::Object::_nil (); } rebind_nc = CosNaming::NamingContext::_duplicate (this->domain_nc_.in ()); @@ -377,8 +377,8 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb, if (CORBA::is_nil (adapter.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - " - "Unable to RIR the IORTable.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ") + ACE_TEXT ("Unable to RIR the IORTable.\n"))); return CORBA::Object::_nil (); } diff --git a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.h b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.h index 0584ec3642d..0a3617e0ab5 100644 --- a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.h +++ b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.h @@ -56,20 +56,20 @@ class DAnCE_NodeManager_Module_Export DAnCE_NodeManager_Module struct SOptions { bool process_ns_; - const char* process_ns_file_; + const ACE_TCHAR* process_ns_file_; bool create_plan_ns_; - const char* create_plan_ns_ior_; + const ACE_TCHAR* create_plan_ns_ior_; bool rebind_plan_ns_; - const char* rebind_plan_ns_ior_; + const ACE_TCHAR* rebind_plan_ns_ior_; bool port_indirection_; - ACE_Vector<ACE_CString> node_managers_; + ACE_Vector<ACE_TString> node_managers_; bool ignore_failure_; - const char * cs_path_; + const ACE_TCHAR * cs_path_; unsigned int timeout_; CORBA::Boolean standalone_; - const char * server_args_; - const char * domain_nc_; - const char * instance_nc_; + const ACE_TCHAR * server_args_; + const ACE_TCHAR * domain_nc_; + const ACE_TCHAR * instance_nc_; SOptions() : process_ns_ (false), diff --git a/modules/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/modules/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp index 6c96e2a9e04..8fbe32eb696 100644 --- a/modules/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp +++ b/modules/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp @@ -84,7 +84,7 @@ namespace CIAO ::Deployment::PackageConfiguration_var pc; - ACE_TCHAR package[PACKAGE_NAME_LEN]; + char package[PACKAGE_NAME_LEN]; size_t length = ACE_OS::strlen (package_uri); size_t pos1 = 0; @@ -133,12 +133,11 @@ namespace CIAO return false; } - ::Deployment::PackageConfiguration_var pc; - CORBA::StringSeq_var seq = rm_->findNamesByType (specific_type); for (CORBA::ULong i = 0; i < seq->length (); ++i) { - pc = rm_->findPackageByName (seq[i]); + ::Deployment::PackageConfiguration_var pc = + rm_->findPackageByName (seq[i]); PCVisitor pcv (plan, *pc, false); index = pcv.Visit (); diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp index dc4210c5905..9ce1d3813ae 100644 --- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp +++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp @@ -23,13 +23,13 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc, DANCE_TRACE ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl"); if (CORBA::is_nil (this->orb_)) { - DANCE_DEBUG ((LM_INFO, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "Creating internal ORB.\n")); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Creating internal ORB.\n"))); this->orb_ = CORBA::ORB_init (argc, argv); } this->parse_args(argc, argv); - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_i::init - em_ior = \"%s\"\n" + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_i::init - em_ior = \"%C\"\n") , is_empty (this->em_ior_) ? "NULL" : this->em_ior_.c_str())); if (this->mode_ & (MODE_START_PLAN | MODE_STOP_PLAN)) @@ -40,8 +40,8 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc, obj = this->orb_->string_to_object(this->em_ior_.c_str()); if (CORBA::is_nil(obj)) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "Failed to retrieve EM object from \"%s\"\n", this->em_ior_.c_str())); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Failed to retrieve EM object from \"%C\"\n"), this->em_ior_.c_str())); throw Deployment_Failure ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " "failed to retrieve EM object"); } @@ -52,22 +52,22 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc, } catch(CORBA::Exception&) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "Failed to retrieve EM object from \"%s\"\n", this->em_ior_.c_str())); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Failed to retrieve EM object from \"%C\"\n"), this->em_ior_.c_str())); throw Deployment_Failure ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " "failed to retrieve EM object"); } if (CORBA::is_nil (this->em_.in())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "failed to get an execution manager.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("failed to get an execution manager.\n"))); throw Deployment_Failure ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " "failed to get an execution manager"); } } - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "Obtained Execution Manager ref\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Obtained Execution Manager ref\n"))); } Plan_Launcher_Base_Impl::~Plan_Launcher_Base_Impl() @@ -83,8 +83,8 @@ void Plan_Launcher_Base_Impl::execute() size_t sz = this->cdr_plan_urls_.size(); for (size_t i= 0; i < sz; ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::execute - " - "launching plan \"%s\"...\n", this->cdr_plan_urls_[i].c_str())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::execute - ") + ACE_TEXT("launching plan \"%s\"...\n"), this->cdr_plan_urls_[i].c_str())); ::Deployment::DeploymentPlan_var plan = this->read_cdr_plan_file(this->cdr_plan_urls_[i].c_str()); try { @@ -94,8 +94,8 @@ void Plan_Launcher_Base_Impl::execute() throw Deployment_Failure ("Plan_Launcher_Base_Impl::execute - " "Error launching plan\n"); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::execute - " - "returned plan UUID is \"%s\"\n", uuid.in ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::execute - ") + ACE_TEXT("returned plan UUID is \"%C\"\n"), uuid.in ())); } catch (...) { @@ -117,7 +117,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) try { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - Starting...\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - Starting...\n"))); if (CORBA::is_nil (this->em_.in ())) { DANCE_ERROR ( (LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") @@ -136,8 +136,8 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) } catch(...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "An exception was thrown during EM->preparePlan.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during EM->preparePlan.\n"))); throw; } @@ -147,29 +147,29 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) if (CORBA::is_nil (dam.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "CIAO_PlanLauncher:preparePlan call failed: " - "nil DomainApplicationManager reference\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("CIAO_PlanLauncher:preparePlan call failed: ") + ACE_TEXT("nil DomainApplicationManager reference\n"))); return 0; } else { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "DAM was received from preparePlan.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("DAM was received from preparePlan.\n"))); } this->write_dam_ior (dam.in()); - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "Obtained DAM ref\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("Obtained DAM ref\n"))); ::Deployment::Properties_var properties; ACE_NEW_RETURN (properties, Deployment::Properties, 0); - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "before startLaunch...\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("before startLaunch...\n"))); ::Deployment::Connections_var conns; Deployment::Application_var da; @@ -179,22 +179,22 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) } catch(...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "An exception was thrown during DAM->startLaunch.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during DAM->startLaunch.\n"))); throw; } //Deployment::DomainApplication_var da = Deployment::DomainApplication::_narrow(obj) if (CORBA::is_nil (da.in())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "CIAO_PlanLauncher:startLaunch call failed: " - "nil DomainApplication reference\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("CIAO_PlanLauncher:startLaunch call failed: ") + ACE_TEXT("nil DomainApplication reference\n"))); return 0; } else { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "DomainApplication was received from startLaunch\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("DomainApplication was received from startLaunch\n"))); } //this is temporal workaround while cdmw checks object type in connect call /* @@ -204,25 +204,25 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) this->create_external_connections (plan, conns.inout()); // Call finish Launch to complete the connections - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "before finishLaunch\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("before finishLaunch\n"))); try { da->finishLaunch (conns.in(), false); // is_ReDAC by default is <false> } catch(...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "An exception was thrown during DA->finishLaunch.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during DA->finishLaunch.\n"))); throw; } - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "after finishLaunch\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("after finishLaunch\n"))); // Call start to activate components - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "before start activating components...\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("before start activating components...\n"))); try { @@ -230,12 +230,12 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) } catch(...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::launch_plan - " - "An exception was thrown during DA->start.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during DA->start.\n"))); throw; } - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - [success]\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - [success]\n"))); DANCE_DEBUG ( (LM_DEBUG, DLINFO ACE_TEXT ("[%M] Plan_Launcher_Base_Impl::launch_plan - ") ACE_TEXT ("Application Deployed successfully\n"))); @@ -254,7 +254,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) ex.propertyName.in (), ex.elementName.in (), ex.resourceName.in ()); - DANCE_ERROR ((LM_ERROR, DLINFO "%s", buf)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); throw Deployment_Failure (buf); } catch (const Deployment::StartError& ex) @@ -263,7 +263,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: StartError exception caught: %s, %s\n", ex.name.in (), ex.reason.in ()); - DANCE_ERROR ((LM_ERROR, DLINFO "%s", buf)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); throw Deployment_Failure (buf); } catch (const Deployment::InvalidProperty& ex) @@ -272,7 +272,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: InvalidProperty exception caught: %s, %s\n", ex.name.in (), ex.reason.in ()); - DANCE_ERROR ((LM_ERROR, DLINFO "%s", buf)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); throw Deployment_Failure (buf); } catch (const Deployment::InvalidConnection& ex) @@ -281,7 +281,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: InvalidConnection exception caught: %s, %s\n", ex.name.in (), ex.reason.in ()); - DANCE_ERROR ((LM_ERROR, DLINFO "%s", buf)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); throw Deployment_Failure (buf); } catch (const CORBA::Exception& ex) @@ -289,14 +289,14 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) char buf[1024]; ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - CORBA EXCEPTION: %s\n", ex._info().fast_rep()); - DANCE_ERROR ((LM_ERROR, DLINFO "%s", buf)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); throw Deployment_Failure (buf); } catch (...) { char buf[1024]; ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: non-CORBA exception\n"); - DANCE_ERROR ((LM_ERROR, DLINFO "%s", buf)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); throw Deployment_Failure (buf); } @@ -309,14 +309,14 @@ bool Plan_Launcher_Base_Impl::teardown_plan(const char *uuid) try { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::teardown_plan - looking for uuid=\"%s\"\n", uuid)); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - looking for uuid=\"%C\"\n"), uuid)); ::Deployment::DomainApplicationManagers_var mgrs = this->em_->getManagers(); ::Deployment::DomainApplicationManager_var dapp_mgr; for (size_t i = 0; i < mgrs->length(); ++i) { ACE_CString s = (*mgrs) [i]->getPlan()->UUID.in(); - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::teardown_plan - " - "comparing with existing uuid=\"%s\"\n", s.c_str())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ") + ACE_TEXT("comparing with existing uuid=\"%C\"\n"), s.c_str())); if (s == uuid) { dapp_mgr = ::Deployment::DomainApplicationManager::_duplicate ( (*mgrs) [i].in()); @@ -337,9 +337,9 @@ bool Plan_Launcher_Base_Impl::teardown_plan(const char *uuid) { // @todo the destroy_dam_by_plan could give a stoperror exception // we should handle - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::teardown_plan - " - "Unable to find DomainApplicationManager " - "for plan with uuid: %s\n", uuid)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ") + ACE_TEXT("Unable to find DomainApplicationManager ") + ACE_TEXT("for plan with uuid: %C\n"), uuid)); return false; } @@ -350,12 +350,12 @@ void Plan_Launcher_Base_Impl::teardown_plan(::Deployment::DomainApplicationManager_ptr dam) { DANCE_DEBUG ((LM_DEBUG, DLINFO - "Plan_Launcher_Base_Impl::teardown_plan - destroy the application.....\n")); + ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - destroy the application.....\n"))); ::Deployment::Applications_var apps = dam->getApplications(); if (0 == apps->length()) { - DANCE_DEBUG((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::teardown_plan - " - "DAM has no application.\n")); + DANCE_DEBUG((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ") + ACE_TEXT("DAM has no application.\n"))); } for (size_t i = 0; i < apps->length(); ++i) { @@ -363,17 +363,17 @@ Plan_Launcher_Base_Impl::teardown_plan(::Deployment::DomainApplicationManager_pt } this->destroy_dam(dam); - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::teardown_plan - [success]\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - [success]\n"))); } void Plan_Launcher_Base_Impl::destroy_dam( ::Deployment::DomainApplicationManager_ptr dam) { DANCE_DEBUG ((LM_DEBUG, DLINFO - "Plan_Launcher_Base_Impl::destroy_dam - destroy the manager.....\n")); + ACE_TEXT("Plan_Launcher_Base_Impl::destroy_dam - destroy the manager.....\n"))); this->em_->destroyManager(dam); - DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::destroy_dam - [success]\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_dam - [success]\n"))); } void Plan_Launcher_Base_Impl::usage(const ACE_TCHAR* program) @@ -398,7 +398,8 @@ void Plan_Launcher_Base_Impl::usage(const ACE_TCHAR* program) void Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[]) { - DANCE_DEBUG ((LM_TRACE, DLINFO "PL options :\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("PL options : \""))); + for (int i = 0; i < argc; ++i) { DANCE_DEBUG ( (LM_TRACE, "\t%s\n", argv[i])); @@ -440,7 +441,7 @@ void Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[]) case 'w': if (0 < this->cdr_dest_url_.length()) { - DANCE_ERROR ((LM_ERROR, DLINFO "Ambiguity: more then one --write-cdr-plan option.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Ambiguity: more then one --write-cdr-plan option.\n"))); throw Deployment_Failure("Ambiguity: more then one --write-cdr-plan option."); } this->cdr_dest_url_ = expand_env_vars (get_opt.opt_arg()); @@ -502,7 +503,7 @@ void Plan_Launcher_Base_Impl::write_dam_ior( } else { - DANCE_ERROR ((LM_ERROR, DLINFO "PlanLauncher.cpp::write_dap_ior - Error in opening file %s to write DAM IOR: %m", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("PlanLauncher.cpp::write_dap_ior - Error in opening file %s to write DAM IOR: %m"), this->dam_ior_.c_str())); throw Deployment_Failure (ACE_CString ("write_dap_ior - Error in opening file %s to write DAM IOR: %m") + this->dam_ior_); @@ -516,28 +517,28 @@ Plan_Launcher_Base_Impl::stop_plan() if (!is_empty (this->plan_uuid_)) { stopped = true; - DANCE_DEBUG((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::stop_plan - " - "Stopping plan \"%s\"\n", this->plan_uuid_.c_str())); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan \"%C\"\n"), this->plan_uuid_.c_str())); if (!this->teardown_plan(this->plan_uuid_.c_str())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::stop_plan - " - "tear down assembly failed: unknown plan uuid.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); } } if (!is_empty (this->dam_ior_)) { stopped = true; - DANCE_DEBUG((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::stop_plan - " - "Stopping plan by DAM IOR.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan by DAM IOR.\n"))); CORBA::Object_var obj = this->orb_->string_to_object(this->dam_ior_.c_str()); if (CORBA::is_nil (obj.in ())) { DANCE_ERROR ((LM_ERROR, DLINFO - "Plan_Launcher_Base_Impl::stop_plan - " - "tear down assembly failed: DAM IOR is invalid.\n")); + ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: DAM IOR is invalid.\n"))); } else { @@ -553,21 +554,21 @@ Plan_Launcher_Base_Impl::stop_plan() size_t sz = this->cdr_plan_urls_.size(); for (size_t i = 0; i < sz; ++i) { - DANCE_DEBUG((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::stop_plan - " - "Stopping plan by plan file : %s\n", this->cdr_plan_urls_[i].c_str())); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan by plan file : %s\n"), this->cdr_plan_urls_[i].c_str())); ::Deployment::DeploymentPlan_var plan = this->read_cdr_plan_file(this->cdr_plan_urls_[i].c_str()); if (!this->teardown_plan(plan->UUID.in())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::stop_plan - " - "tear down assembly failed: unknown plan uuid.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); } } } if (!stopped && 0 == this->xml_plan_urls_.size()) { - DANCE_DEBUG((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::stop_plan - " - "Stopping plan all running plans.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan all running plans.\n"))); ::Deployment::DomainApplicationManagers_var mgrs = this->em_->getManagers(); ::Deployment::DomainApplicationManager_var dapp_mgr; @@ -581,7 +582,7 @@ Plan_Launcher_Base_Impl::stop_plan() void Plan_Launcher_Base_Impl::create_external_connections( const ::Deployment::DeploymentPlan &plan, Deployment::Connections& conn) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "create_external_connections - start\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("create_external_connections - start\n"))); /* CORBA::Object_var obj = this->orb_->resolve_initial_references("NameService"); CosNaming::NamingContext_var naming = CosNaming::NamingContext::_narrow(obj.in()); CosNaming::BindingList_var bl; @@ -642,7 +643,7 @@ void Plan_Launcher_Base_Impl::create_external_connections( else { DANCE_DEBUG ( (LM_DEBUG, - "Plan_Launcher_i::create_external_connections - can't create object for IOR %C\n", + ACE_TEXT("Plan_Launcher_i::create_external_connections - can't create object for IOR %C\n"), plan.connection[i].externalReference[0].location.in())); throw 0; } @@ -683,7 +684,7 @@ Deployment::DeploymentPlan*Plan_Launcher_Base_Impl::read_cdr_plan_file( } catch(...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Failed to read CDR plan file.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Failed to read CDR plan file.\n"))); throw Deployment_Failure("Failed to read CDR plan file."); } return res; @@ -714,8 +715,8 @@ Plan_Launcher_Base_Impl::write_cdr_plan_file(const char * filename, } catch(...) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::write_cdr_plan_file - " - "Failed to write CDR plan file.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::write_cdr_plan_file - ") + ACE_TEXT("Failed to write CDR plan file.\n"))); throw Deployment_Failure("Failed to write CDR plan file."); } } @@ -758,7 +759,7 @@ Plan_Launcher_Base_Impl::check_mode_consistentness() } ACE_CString -Plan_Launcher_Base_Impl::expand_env_vars (const char * s) +Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s) { ACE_CString src = s; ACE_CString res; @@ -804,8 +805,8 @@ Plan_Launcher_Base_Impl::expand_env_vars (const char * s) } else { - DANCE_DEBUG ((LM_WARNING, DLINFO "Plan_Launcher_Base_Impl::expand_env_vars - " - "Envvar can not be parsed out at %i in \"%s\"", + DANCE_DEBUG ((LM_WARNING, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::expand_env_vars - ") + ACE_TEXT("Envvar can not be parsed out at %i in \"%s\""), pos_start, src.c_str())); } diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h index ede5512c32c..f960fc27d67 100644 --- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h +++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h @@ -88,7 +88,7 @@ public: Deployment::Connections& conn); virtual void check_mode_consistentness(); - static ACE_CString expand_env_vars(const char * src); + static ACE_CString expand_env_vars(const ACE_TCHAR * src); /// Cached ORB pointer CORBA::ORB_var orb_; diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index e42f2a62df9..ecf04d554a8 100644 --- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -21,20 +21,20 @@ namespace Plan_Launcher ::Deployment::DeploymentPlan * Plan_Launcher_Impl::load_xml_plan(const char *deployment_plan_uri) { - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Impl::load_xml_plan - " - "Parsing plan \"%s\"...\n", deployment_plan_uri)); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - ") + ACE_TEXT("Parsing plan \"%C\"...\n"), deployment_plan_uri)); ::Deployment::DeploymentPlan * plan = 0; try { CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri); - intf.add_search_path ("CIAO_ROOT", "/docs/schema/"); - intf.add_search_path ("TAO_ROOT", "/docs/schema/"); + intf.add_search_path (ACE_TEXT("CIAO_ROOT"), ACE_TEXT("/docs/schema/")); + intf.add_search_path (ACE_TEXT("TAO_ROOT"), ACE_TEXT("/docs/schema/")); plan = intf.release_plan (); if (0 == plan) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Impl::load_xml_plan - " - "Failed to parse plan \"%C\".\n", deployment_plan_uri)); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - ") + ACE_TEXT("Failed to parse plan \"%C\".\n"), deployment_plan_uri)); throw Deployment_Failure("Failed to parse plan."); } } @@ -43,11 +43,11 @@ Plan_Launcher_Impl::load_xml_plan(const char *deployment_plan_uri) ACE_CString s = "failed to parse deployment plan \""; s += deployment_plan_uri; s += "\""; - DANCE_DEBUG ((LM_ERROR, DLINFO "Plan_Launcher_Impl::load_xml_plan - %C\n", s.c_str())); + DANCE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - %C\n"), s.c_str())); throw Deployment_Failure (s.c_str()); } - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Impl::load_xml_plan - Parsing complete....\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - Parsing complete....\n"))); return plan; } @@ -60,8 +60,8 @@ void Plan_Launcher_Impl::execute() size_t sz = this->xml_plan_urls_.size(); for (size_t i= 0; i < sz; ++i) { - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Impl::execute - " - "launching plan \"%C\"...\n", this->xml_plan_urls_[i].c_str())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::execute - ") + ACE_TEXT("launching plan \"%C\"...\n"), this->xml_plan_urls_[i].c_str())); ::Deployment::DeploymentPlan_var plan = this->load_xml_plan(this->xml_plan_urls_[i].c_str()); try @@ -71,8 +71,8 @@ void Plan_Launcher_Impl::execute() { throw Deployment_Failure ("execute - Error launching plan\n"); } - DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Impl::execute - " - "returned plan UUID is \"%s\"\n", uuid.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::execute - ") + ACE_TEXT("returned plan UUID is \"%C\"\n"), uuid.in ())); } catch (...) { @@ -103,13 +103,13 @@ void Plan_Launcher_Impl::stop_plan() size_t sz = this->xml_plan_urls_.size(); for (size_t i= 0; i < sz; ++i) { - DANCE_DEBUG((LM_TRACE, DLINFO "Plan_Launcher_Impl::stop_plan - " - "Stopping plan by plan file: %C\n", this->xml_plan_urls_[i].c_str())); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ") + ACE_TEXT("Stopping plan by plan file: %C\n"), this->xml_plan_urls_[i].c_str())); ::Deployment::DeploymentPlan_var plan = this->load_xml_plan(this->xml_plan_urls_[i].c_str()); if (!this->teardown_plan(plan->UUID.in())) { - DANCE_ERROR ((LM_ERROR, DLINFO "Plan_Launcher_Impl::stop_plan - " - "tear down assembly failed: unknown plan uuid.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); } } } diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp index a1a58e407c3..fa07782f010 100644 --- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp +++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp @@ -23,9 +23,9 @@ DAnCE_Plan_Launcher_Module::create_object (CORBA::ORB_ptr orb, { try { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_Plan_Launcher_Module::create_object - " - "Creating Plan Launcher object.\n")); - + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Creating Plan Launcher object."))); + Plan_Launcher_Impl pl (orb, argc, argv); pl.execute(); } @@ -34,19 +34,19 @@ DAnCE_Plan_Launcher_Module::create_object (CORBA::ORB_ptr orb, } catch (const Plan_Launcher_Base_Impl::Deployment_Failure& e) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_Plan_Launcher_Module::create_object - " - "Error : %C.\n", e.error_.c_str())); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Error : %C.\n"), e.error_.c_str())); } catch (const CORBA::Exception& ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_Plan_Launcher_Module::create_object - " - "Caught CORBA Exception %C", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Caught CORBA Exception %C"), ex._info ().c_str ())); } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_Plan_Launcher_Module::create_object - " - "Unknown exception.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Unknown exception.\n"))); } return CORBA::Object::_nil (); } diff --git a/modules/CIAO/DAnCE/RedirectionService/NameServiceRedirection.cpp b/modules/CIAO/DAnCE/RedirectionService/NameServiceRedirection.cpp index c5c5c0c86b2..702d7e7c400 100644 --- a/modules/CIAO/DAnCE/RedirectionService/NameServiceRedirection.cpp +++ b/modules/CIAO/DAnCE/RedirectionService/NameServiceRedirection.cpp @@ -19,7 +19,7 @@ NameServiceRedirection::~NameServiceRedirection() void NameServiceRedirection::start_binding (const ACE_CString& node, const ACE_CString& plan) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::start_binding for node %s plan %s.\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::start_binding for node %C plan %C.\n"), node.c_str(), plan.c_str())); ACE_CString key = node + plan; @@ -38,7 +38,7 @@ NameServiceRedirection::start_binding (const ACE_CString& node, const ACE_CStrin void NameServiceRedirection::bind (const ACE_CString& node, const ACE_CString& plan, const ACE_CString& component, const ACE_CString& port, CORBA::Object_ptr obj) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::bind for node %s plan %s component %s and port %s is started.\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::bind for node %C plan %C component %C and port %C is started.\n"), node.c_str(), plan.c_str(), component.c_str(), @@ -68,7 +68,7 @@ NameServiceRedirection::bind (const ACE_CString& node, const ACE_CString& plan, TRecords* records = 0; if (0 != this->transactions_.find (key, records)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NameServiceRedirection::bind - Cann't find record %C for closing transaction.\n", key.c_str())); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NameServiceRedirection::bind - Can't find record %C for closing transaction.\n"), key.c_str())); return; } @@ -82,13 +82,13 @@ NameServiceRedirection::bind (const ACE_CString& node, const ACE_CString& plan, // { // component_context->rebind(name, obj); // } - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::bind has finished.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::bind has finished.\n"))); } void NameServiceRedirection::bind (const ACE_CString& node, const ACE_CString& plan, const ACE_CString& component, CORBA::Object_ptr obj) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::bind for node %s plan %s and component %s is started.\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::bind for node %C plan %C and component %C is started.\n"), node.c_str(), plan.c_str(), component.c_str())); @@ -111,7 +111,7 @@ NameServiceRedirection::bind (const ACE_CString& node, const ACE_CString& plan, TRecords* records = 0; if (0 != this->transactions_.find (key, records)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NameServiceRedirection::bind - Cann't find record %s for closing transaction.\n", key.c_str())); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NameServiceRedirection::bind - Can't find record %C for closing transaction.\n"), key.c_str())); return; } @@ -129,18 +129,18 @@ NameServiceRedirection::bind (const ACE_CString& node, const ACE_CString& plan, // DANCE_DEBUG((LM_DEBUG, "[%M] NameServiceRedirection::bind - Already bound exception was thrown. Rebinding\n")); // plan_context->rebind(name, obj); // } - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::bind has finished.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::bind has finished.\n"))); } void NameServiceRedirection::finish_binding (const ACE_CString& node, const ACE_CString& plan) { ACE_CString key = node + plan; - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::finish_binding started for %s.\n", key.c_str())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::finish_binding started for %s.\n"), key.c_str())); TRecords* records = 0; if (0 != this->transactions_.find (key, records)) { - DANCE_ERROR ((LM_ERROR, DLINFO "NameServiceRedirection::finish_binding - Cann't find record %s for closing transaction.\n", key.c_str())); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("NameServiceRedirection::finish_binding - Can't find record %C for closing transaction.\n"), key.c_str())); return; } for (unsigned int i = 0; i < records->size(); i++) @@ -152,7 +152,7 @@ NameServiceRedirection::finish_binding (const ACE_CString& node, const ACE_CStri } catch (CosNaming::NamingContext::AlreadyBound&) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::finish_bind - Already bound exception was thrown. Rebinding\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::finish_bind - Already bound exception was thrown. Rebinding\n"))); this->naming_->rebind ( (*records) [i].name, (*records) [i].obj.in()); } @@ -174,38 +174,38 @@ NameServiceRedirection::finish_binding (const ACE_CString& node, const ACE_CStri this->domain_->rebind_context (name, context.in()); } } - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::finish_bind has finished.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::finish_bind has finished.\n"))); } void NameServiceRedirection::unbind_context (const ACE_CString& node, const ACE_CString& plan) { - DANCE_DEBUG ( (LM_TRACE, "[%M] NameServiceRedirection::unbind_context started...\n")); + DANCE_DEBUG ( (LM_TRACE, ACE_TEXT("[%M] NameServiceRedirection::unbind_context started...\n"))); ACE_CString kind = ""; CosNaming::NamingContext_var node_context = this->resolve_context (node, kind, this->naming_.in()); kind = "DeploymentPlan"; CosNaming::NamingContext_var plan_context = this->resolve_context (plan, kind, node_context.in()); - DANCE_DEBUG ( (LM_TRACE, "[%M] NameServiceRedirection::unbind_context before clear_context for %s.%s\n", plan.c_str(), kind.c_str())); + DANCE_DEBUG ( (LM_TRACE, ACE_TEXT("[%M] NameServiceRedirection::unbind_context before clear_context for %s.%s\n"), plan.c_str(), kind.c_str())); this->clear_context (plan_context.inout()); CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (plan.c_str()); name[0].kind = CORBA::string_dup (kind.c_str()); - DANCE_DEBUG ( (LM_TRACE, "[%M] NameServiceRedirection::unbind_context before unbinding %s.%s\n" + DANCE_DEBUG ( (LM_TRACE, ACE_TEXT("[%M] NameServiceRedirection::unbind_context before unbinding %s.%s\n") , name[0].id.in(), name[0].kind.in())); node_context->unbind (name); - DANCE_DEBUG ( (LM_TRACE, "[%M] NameServiceRedirection::unbind_context before destroying plan context.\n")); + DANCE_DEBUG ( (LM_TRACE, ACE_TEXT("[%M] NameServiceRedirection::unbind_context before destroying plan context.\n"))); plan_context->destroy(); - DANCE_DEBUG ( (LM_TRACE, "[%M] NameServiceRedirection::unbind_context fininshed.\n")); + DANCE_DEBUG ( (LM_TRACE, ACE_TEXT("[%M] NameServiceRedirection::unbind_context fininshed.\n"))); } CosNaming::NamingContext_ptr NameServiceRedirection::resolve_context (const ACE_CString& context_name, const ACE_CString& context_kind, CosNaming::NamingContext_ptr naming) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::resolve_context is started for context %s.%s\n", context_name.c_str(), context_kind.c_str())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::resolve_context is started for context %C.%C\n"), context_name.c_str(), context_kind.c_str())); if (CORBA::is_nil (naming)) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::resolve_context source context is nil!.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::resolve_context source context is nil!.\n"))); return CosNaming::NamingContext::_nil (); } CORBA::Object_var obj; @@ -221,7 +221,7 @@ NameServiceRedirection::resolve_context (const ACE_CString& context_name, const { obj = naming->bind_new_context (name); } - DANCE_DEBUG ((LM_DEBUG, DLINFO "NameServiceRedirection::resolve_context has finished.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NameServiceRedirection::resolve_context has finished.\n"))); return CosNaming::NamingContext::_narrow (obj._retn()); } diff --git a/modules/CIAO/DAnCE/RedirectionService/RedirectionService.cpp b/modules/CIAO/DAnCE/RedirectionService/RedirectionService.cpp index e79673bfa4c..551d7bb5be6 100644 --- a/modules/CIAO/DAnCE/RedirectionService/RedirectionService.cpp +++ b/modules/CIAO/DAnCE/RedirectionService/RedirectionService.cpp @@ -22,8 +22,8 @@ RedirectionService::RedirectionService (CORBA::ORB_ptr orb, { if (CORBA::is_nil (hosting_naming)) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "RedirectionService::RedirectionService - " - "Name Service redirection is enabled but name context is nil.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("RedirectionService::RedirectionService - ") + ACE_TEXT("Name Service redirection is enabled but name context is nil.\n"))); } } } @@ -83,8 +83,8 @@ void RedirectionService::registration (const ACE_CString& node, const ACE_CString& plan, const ACE_CString& component, const ACE_CString& port, CORBA::Object_ptr obj) { DANCE_TRACE ("RedirectionService::registration"); - DANCE_DEBUG ((LM_DEBUG, DLINFO "RedirectionService::registration - " - "for node %s plan %s component %s and port %s is started.\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("RedirectionService::registration - ") + ACE_TEXT("for node %C plan %C component %C and port %C is started.\n"), node.c_str(), plan.c_str(), component.c_str(), @@ -111,8 +111,8 @@ RedirectionService::registration (const ACE_CString& node, const ACE_CString& pl this->naming_.bind (node, plan, component, port, ns_obj.in()); } } - DANCE_DEBUG ((LM_DEBUG, DLINFO "RedirectionService::registration - " - "Registration has been finished.\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("RedirectionService::registration - ") + ACE_TEXT("Registration has been finished.\n"))); } void @@ -146,17 +146,17 @@ void RedirectionService::unregister (const ACE_CString& node, const ACE_CString& plan) { DANCE_TRACE ("RedirectionService::unregister"); - DANCE_DEBUG((LM_TRACE, DLINFO "RedirectionService::unregister - " - "unregistering %s/%s...\n", node.c_str(), plan.c_str())); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("RedirectionService::unregister - ") + ACE_TEXT("unregistering %C/%C...\n"), node.c_str(), plan.c_str())); if (this->ns_) { this->naming_.unbind_context (node, plan); - DANCE_DEBUG((LM_TRACE, DLINFO "RedirectionService::unregister - " - "finished.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("RedirectionService::unregister - ") + ACE_TEXT("finished.\n"))); } else { - DANCE_DEBUG((LM_TRACE, DLINFO "RedirectionService::unregister - " - "nothing to do.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("RedirectionService::unregister - ") + ACE_TEXT("nothing to do.\n"))); } } diff --git a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp index a6e0399fdb9..96dead11bb0 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -56,9 +56,9 @@ namespace { static const char* PC_EXTENSION = ".epc"; - static const char *RM_RECORD_FILE = "RM_record"; - static const char *RM_RECORD_NAME_SECTION = "Names"; - static const char *RM_RECORD_UUID_SECTION = "UUIDs"; + static const ACE_TCHAR *RM_RECORD_FILE = ACE_TEXT("RM_record"); + static const ACE_TCHAR *RM_RECORD_NAME_SECTION = ACE_TEXT("Names"); + static const ACE_TCHAR *RM_RECORD_UUID_SECTION = ACE_TEXT("UUIDs"); } namespace DAnCE @@ -70,7 +70,7 @@ namespace DAnCE //----------------------------------------------------------------- RepositoryManagerDaemon_i::RepositoryManagerDaemon_i - (CORBA::ORB_ptr the_orb, const char* server, const char* install_dir) + (CORBA::ORB_ptr the_orb, const ACE_TCHAR* server, const ACE_TCHAR* install_dir) : the_orb_ (CORBA::ORB::_duplicate (the_orb)), install_root_ (""), HTTP_server_ ("http://"), diff --git a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h index e7b3a9164a1..051c6577514 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h +++ b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h @@ -57,8 +57,8 @@ namespace DAnCE public: /// Constructor RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb, - const ACE_TCHAR* server = "localhost:5432", - const ACE_TCHAR* install_dir = "RepositoryManager"); + const ACE_TCHAR* server = ACE_TEXT("localhost:5432"), + const ACE_TCHAR* install_dir = ACE_TEXT("RepositoryManager")); /// Destructor virtual ~RepositoryManagerDaemon_i (void); diff --git a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp index 31d87faf550..a8fcdf872ab 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp @@ -60,23 +60,23 @@ namespace DAnCE try { - DANCE_DEBUG ((LM_INFO, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "Spawning thread %u for the ORB.\n", thread_id)); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("Spawning thread %u for the ORB.\n"), thread_id)); this->orb_->run (); - DANCE_DEBUG ((LM_INFO, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "ORB event loop for thread %u completed successfully.\n", thread_id)); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("ORB event loop for thread %u completed successfully.\n"), thread_id)); } - catch (CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "Caught CORBA exception from ORB event loop for thread %u: %s\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("Caught CORBA exception from ORB event loop for thread %u: %C\n"), thread_id, ex._info ().c_str ())); return -1; } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "Caught unknown C++ exception from ORB event loop for thread %u\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("Caught unknown C++ exception from ORB event loop for thread %u\n"), thread_id)); return -1; } @@ -169,42 +169,42 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) switch (c) { case 'd': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Binding to provided Domain Naming Context: '%s'\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Binding to provided Domain Naming Context: '%s'\n"), get_opts.opt_arg ())); this->options_.domain_nc_ = get_opts.opt_arg (); break; case 'f': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Output filename for IOR is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Output filename for IOR is %s\n"), get_opts.opt_arg ())); this->options_.ior_file_ = get_opts.opt_arg (); break; case 't': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Number of threads is %C\n", get_opts.opt_arg ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Number of threads is %s\n"), get_opts.opt_arg ())); this->options_.threads_ = (ACE_OS::atoi (get_opts.opt_arg ())); break; case 'p': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Package directory is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Package directory is %s\n"), get_opts.opt_arg ())); this->options_.package_dir_ = get_opts.opt_arg (); break; case 'n': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Name is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Name is %s\n"), get_opts.opt_arg ())); this->options_.name_ = get_opts.opt_arg (); break; case 's': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Server address is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Server address is %s\n"), get_opts.opt_arg ())); this->options_.server_address_ = get_opts.opt_arg (); break; @@ -212,54 +212,54 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) case 0: if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("spawn-http")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Found option to spawn in-process HTTP server\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Found option to spawn in-process HTTP server\n"))); this->options_.spawn_http_ = true; } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-port")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server port\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server port\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_port_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-threads")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP number of threads\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP number of threads\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_threads_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-threading")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server threading model\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server threading model\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_threading_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-io")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server IO strategy\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server IO strategy\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_io_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-caching")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server caching strategy\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server caching strategy\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_caching_ = get_opts.opt_arg (); } else { - DANCE_ERROR ((LM_ERROR, DLINFO "Repository_Manager_Module::parse_args - " - "ERROR: unknown long option %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("ERROR: unknown long option %s\n"), get_opts.long_option ())); } @@ -279,8 +279,8 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) if (this->options_.server_address_ == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "Repository_Manager_Module::parse_args - " - "Must provider server address using --server-address option.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Must provider server address using --server-address option.\n"))); return false; } @@ -298,8 +298,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, { if (CORBA::is_nil(orb)) { - DANCE_ERROR((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Attempted to create Repository Manager with a nil orb.\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Attempted to create Repository Manager with a nil orb.\n"))); return CORBA::Object::_nil(); } else @@ -309,8 +309,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0) { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Resetting NM's orb.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Resetting NM's orb.\n"))); this->orb_ = CORBA::ORB::_duplicate (orb); this->domain_nc_ = CosNaming::NamingContext::_nil(); } @@ -329,30 +329,30 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, { try { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Resolving DomainNC.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Resolving DomainNC.\n"))); CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_); if (!CORBA::is_nil (domain_obj.in ())) { this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in()); if (CORBA::is_nil (this->domain_nc_.in ())) { - DANCE_ERROR ((LM_ERROR,DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Narrow to NamingContext return nil for DomainNC.\n")); + DANCE_ERROR ((LM_ERROR,DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n"))); return CORBA::Object::_nil (); } } } - catch (CORBA::Exception&) + catch (const CORBA::Exception&) { - DANCE_DEBUG ((LM_WARNING, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "DomainNC context not found!\n")); + DANCE_DEBUG ((LM_WARNING, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("DomainNC context not found!\n"))); } } - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Initializing the IOR Table\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Initializing the IOR Table\n"))); // Initialize IOR table CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable"); @@ -360,8 +360,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, if (CORBA::is_nil (adapter.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Unable to RIR the IORTable.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Unable to RIR the IORTable.\n"))); return CORBA::Object::_nil (); } @@ -402,8 +402,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, ns_name = "RepositoryManager"; else ns_name = this->options_.name_; - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Registering NM in NC as \"%C\".\n", ns_name.c_str ())); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Registering NM in NC as \"%C\".\n"), ns_name.c_str ())); CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (ns_name.c_str ()); @@ -414,11 +414,11 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, // Writing ior to file if (0 != this->options_.ior_file_) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Writing RM IOR %C to file %C.\n", this->options_.ior_file_, ior.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Writing RM IOR %C to file %C.\n"), this->options_.ior_file_, ior.in ())); if (!DAnCE::Repository_Manager::write_IOR (this->options_.ior_file_, ior.in ())) - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Error: Unable to write IOR to file %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Error: Unable to write IOR to file %C\n"), this->options_.ior_file_)); } @@ -427,11 +427,11 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, mgr->activate (); // Finishing Deployment part - DANCE_DEBUG ((LM_NOTICE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "DAnCE_RepositoryManager is running...\n")); + DANCE_DEBUG ((LM_NOTICE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("DAnCE_RepositoryManager is running...\n"))); - DANCE_DEBUG ((LM_DEBUG, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "RepositoryManager IOR: %s\n", ior.in ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("RepositoryManager IOR: %C\n"), ior.in ())); return nm_obj._retn (); } @@ -447,14 +447,14 @@ DAnCE_RepositoryManager_Module::create_poas (void) { DANCE_TRACE("DAnCE_Repository_Manager_Module::create_poas"); // Get reference to Root POA. - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "Resolving root POA\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Resolving root POA\n"))); CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA"); this->root_poa_ = PortableServer::POA::_narrow (obj.in ()); - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "Obtaining the POAManager\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Obtaining the POAManager\n"))); PortableServer::POAManager_var mgr = this->root_poa_->the_POAManager (); TAO::Utils::PolicyList_Destroyer policies (2); @@ -462,9 +462,9 @@ DAnCE_RepositoryManager_Module::create_poas (void) try { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "DAnCE_RepositoryManager_Module::create_poas - " - "Creating the \"Repository\" POA.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Creating the \"Repository\" POA.\n"))); policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID); policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT); @@ -474,8 +474,8 @@ DAnCE_RepositoryManager_Module::create_poas (void) } catch (const PortableServer::POA::AdapterAlreadyExists &) { - DANCE_DEBUG ((LM_INFO, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "Using exiswting \"Repository\" POA\n")); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Using existing \"Repository\" POA\n"))); this->rm_poa_ = this->root_poa_->find_POA ("Repository", 0); } } diff --git a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h index 21804fec10a..18a149e5e21 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h +++ b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h @@ -75,11 +75,11 @@ class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module package_dir_ (ACE_TEXT("RepositoryManager_Packages")), server_address_ (0), spawn_http_ (false), - http_port_ ("5432"), - http_threads_ ("1"), - http_threading_ ("POOL"), - http_io_ ("SYNCH"), - http_caching_ ("NO_CACHE") + http_port_ (ACE_TEXT("5432")), + http_threads_ (ACE_TEXT("1")), + http_threading_ (ACE_TEXT("POOL")), + http_io_ (ACE_TEXT("SYNCH")), + http_caching_ (ACE_TEXT("NO_CACHE")) { } }; @@ -96,7 +96,7 @@ class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module int argc, ACE_TCHAR *argv []); - virtual const ACE_TCHAR * usage (void); + virtual const char * usage (void); virtual bool parse_args (int argc, ACE_TCHAR *argv []); diff --git a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp index 37187ebff61..47cf4fbb039 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp @@ -38,20 +38,20 @@ URL_Parser::parse_args (int argc, ACE_TCHAR *argv[]) } URL_Parser::URL_Parser (void) - : hostname_ (ACE::strnew ("127.0.0.1")), + : hostname_ (ACE::strnew (ACE_TEXT("127.0.0.1"))), port_ (ACE_DEFAULT_HTTP_SERVER_PORT), filename_ (0), debug_ (false) { } -bool URL_Parser::parseURL (char* url) +bool URL_Parser::parseURL (ACE_TCHAR* url) { - char* ptr = 0; + ACE_TCHAR* ptr = 0; bool success = true; - ptr = ACE_OS::strstr (url, "http://"); + ptr = ACE_OS::strstr (url, ACE_TEXT("http://")); if (ptr) - url += ACE_OS::strlen ("http://"); + url += ACE_OS::strlen (ACE_TEXT("http://")); if (url[0] == '/') { diff --git a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h index 0dfef0262ad..16805c390b7 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h +++ b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h @@ -37,7 +37,7 @@ public: bool parse_args (int argc, ACE_TCHAR *argv[]); /// Return false on failure - bool parseURL (char* url); + bool parseURL (ACE_TCHAR* url); void Error (void); diff --git a/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp index 41a247cb717..d5f130b828f 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp @@ -72,16 +72,16 @@ int ZIP_Wrapper::file_list_info (char* zip_name, /* If zipfile could not be opened still, return */ if (uf==0) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening" - " %s or %s.zip using unzOpen\n"), zip_name, zip_name)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening") + ACE_TEXT(" %s or %s.zip using unzOpen\n"), zip_name, zip_name)); return 1; } unz_global_info gi; /* get information about all the files in zip file*/ int err = unzGetGlobalInfo(uf, &gi); if (err!=UNZ_OK) - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying" - " to get global information about zipfile\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying") + ACE_TEXT(" to get global information about zipfile\n"), err)); /* gi.number_entry corresponds to the number of directory entries in the zip file */ for (uLong i=0;i<gi.number_entry;i++) @@ -93,9 +93,9 @@ int ZIP_Wrapper::file_list_info (char* zip_name, sizeof(filename_inzip), 0, 0, 0, 0); if (err!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" - " while trying to get information" - " about current file\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed") + ACE_TEXT(" while trying to get information") + ACE_TEXT(" about current file\n"), err)); break; } ZIP_File_Info* next = 0; @@ -109,8 +109,8 @@ int ZIP_Wrapper::file_list_info (char* zip_name, if (err!=UNZ_OK) { ACE_DEBUG((LM_DEBUG, - ACE_TEXT(" unzGoToNextFile failed" - " while trying to go to next file\n"), + ACE_TEXT(" unzGoToNextFile failed") + ACE_TEXT(" while trying to go to next file\n"), err)); break; } @@ -140,8 +140,8 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename, int k=unzOpenCurrentFile(uf); if (k!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current" - " file using unzOpenCurrentFile"))); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current") + ACE_TEXT(" file using unzOpenCurrentFile"))); return false; } else @@ -187,8 +187,8 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) uf = unzOpen(zip_archive); if (uf==0) { - ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the" - " zipfile\n"))); + ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the") + ACE_TEXT(" zipfile\n"))); return false; } //get the name of the archive @@ -212,15 +212,15 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) int err = unzGetGlobalInfo(uf, &gi); if (err!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global" - " information about zipfile\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global") + ACE_TEXT(" information about zipfile\n"), err)); return false; } err =unzGoToFirstFile(uf); if (err!=UNZ_OK) { ACE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in" - " unzGoToFirstFile\n"), err)); + ACE_TEXT(" unzGoToFirstFile\n")), err)); return false; } /* read each entry of zip file, create directory structure if it is @@ -234,9 +234,9 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) sizeof(filename_inzip), 0, 0, 0, 0); if (err!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" - " while trying to get information" - " about currentfile\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed") + ACE_TEXT(" while trying to get information") + ACE_TEXT(" about currentfile\n"), err)); break; } int direc = checkdir(filename_inzip); @@ -256,9 +256,9 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) err = unzGoToNextFile(uf); if (err!=UNZ_OK) { - ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed" - " while trying to go to" - " nextfile\n"), err)); + ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed") + ACE_TEXT(" while trying to go to") + ACE_TEXT(" nextfile\n"), err)); break; } } diff --git a/modules/CIAO/DAnCE/Starter/Starter.cpp b/modules/CIAO/DAnCE/Starter/Starter.cpp index 8aa2a2c5d97..17827f0c103 100644 --- a/modules/CIAO/DAnCE/Starter/Starter.cpp +++ b/modules/CIAO/DAnCE/Starter/Starter.cpp @@ -78,14 +78,14 @@ Starter::Starter(int argc, ACE_TCHAR * argv[]) : this->logger_->init (argc, argv); DANCE_DEBUG ((LM_TRACE, DLINFO - "Starter::Starter - Creating starter...\n")); + ACE_TEXT("Starter::Starter - Creating starter...\n"))); this->parseArgs(argc, argv); this->configure_logging_backend (); DANCE_DEBUG ((LM_TRACE, DLINFO - "Starter::Starter - Starter was created successfully.\n")); + ACE_TEXT("Starter::Starter - Starter was created successfully.\n"))); } Starter::~Starter() @@ -137,7 +137,7 @@ void Starter::parseArgs(int argc, ACE_TCHAR * argv[]) int j; char c; - ACE_CString s; + ACE_TString s; while ( (c = opts ()) != -1) { DANCE_DEBUG((LM_TRACE, "[%M] Option : \"%s\" with argument \"%s\"\n", opts.last_option(), opts.opt_arg())); @@ -159,7 +159,7 @@ void Starter::parseArgs(int argc, ACE_TCHAR * argv[]) { ACE_CString nodename; Node node; - size_t pos = s.find("="); + size_t const pos = s.find(ACE_TEXT("=")); if (ACE_CString::npos != pos) { nodename = s.substring(0, pos); @@ -573,7 +573,7 @@ Starter::initNodeManager (const char * node) throw ACE_CString ("Failed to load NodeManager."); } int c = 0; - char ** v = 0; + ACE_TCHAR ** v = 0; this->argCopyForNode (node, c, v); CORBA::Object_var res = loader->create_object (this->orb_, c, v); this->releaseArgs (c, v); @@ -602,7 +602,7 @@ Starter::initExecutionManager() throw ACE_CString ("Failed to load ExecutionManager."); } int c = 0; - char ** v = 0; + ACE_TCHAR ** v = 0; this->argCopyForEM (c, v); CORBA::Object_var em = loader->create_object (this->orb_, c, v); this->releaseArgs (c, v); @@ -643,7 +643,7 @@ Starter::runPlanLauncher() throw ACE_CString ("Failed to load PlanLauncher."); } int c = 0; - char ** v = 0; + ACE_TCHAR ** v = 0; this->argCopyForPL (c, v); loader->create_object (this->orb_, c, v); this->releaseArgs (c, v); @@ -719,7 +719,7 @@ Starter::argCopyForNode (const char * node, int & c, char **& v) if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], validOptions[j])) { if (i + 1 < this->argc_ - && (0 == ACE_OS::strcmp (this->argv_[i], "--node-mgr") || 0 == ACE_OS::strcmp (this->argv_[i], "-n"))) + && (0 == ACE_OS::strcmp (this->argv_[i], ACE_TEXT("--node-mgr")) || 0 == ACE_OS::strcmp (this->argv_[i], ACE_TEXT("-n")))) { ACE_CString s = this->argv_[i+1]; if (ACE_CString::npos != s.find ('=')) diff --git a/modules/CIAO/DAnCE/TargetManager/CmpClient.cpp b/modules/CIAO/DAnCE/TargetManager/CmpClient.cpp index 1575e3f2b59..b35912393cb 100644 --- a/modules/CIAO/DAnCE/TargetManager/CmpClient.cpp +++ b/modules/CIAO/DAnCE/TargetManager/CmpClient.cpp @@ -289,7 +289,7 @@ namespace TM_Tester std::string file_name = "NA_"; file_name += domain.node[i].name.in (); ACE_FILE_IO file_io; - ACE_FILE_Connector (file_io, ACE_FILE_Addr (file_name.c_str ())); + ACE_FILE_Connector (file_io, ACE_FILE_Addr (ACE_TEXT_ALWAYS_CHAR (file_name.c_str ()))); CORBA::Double na_node_cpu; domain.node[i].resource[j].property[0].value >>= na_node_cpu; char buf[BUFSIZ]; diff --git a/modules/CIAO/MPC/config/dance_plan_launcher_base.mpc b/modules/CIAO/MPC/config/dance_plan_launcher_base.mpc new file mode 100644 index 00000000000..675ca3045d7 --- /dev/null +++ b/modules/CIAO/MPC/config/dance_plan_launcher_base.mpc @@ -0,0 +1,6 @@ +// $Id$ + +project : naming, dance_executionmanager_stub { + after += Plan_Launcher_Base + libs += DAnCE_Plan_Launcher_Base +}
\ No newline at end of file diff --git a/modules/CIAO/NEWS b/modules/CIAO/NEWS index df49ae25969..77b0a449dc3 100644 --- a/modules/CIAO/NEWS +++ b/modules/CIAO/NEWS @@ -1,9 +1,20 @@ PLANNED CHANGES BEFORE NEXT RELEASE =================================== -This is advanced notification that the CIAO-0.6.7 release of CIAO will be -the last release before a major refactoring is introduced into CIAO/DAnCE -that will remove several features, with no planned replacement in +. The RepositoryManager will be ported to the new DAnCE. + +. The TargetManager will be ported to the new DAnCE. + +. The CIDL Compiler will be deprecated in the next version to be replaced by + code generation being handled entirely by tao_idl. As a result, CIDL will + no longer be used to specify containers and local executor mappings for component + implementations, to be instead handled by either command line options to the + compiler or some new file type. + +PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) +=========================================================================== + +. Several features have been recently removed, with no planned replacement in their current form, such as: . ReDaC @@ -18,9 +29,6 @@ replacement in the near term: . RepositoryManager . Swapping container -PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) -=========================================================================== - . Enhance Execution Manager and Domain Application Manager to make calls on the Target Manager to get resource information. @@ -52,18 +60,6 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) can be implemented in such a way as to not break copliance with the DnC specification. -. Implement Resource Allocation and Control Engine (RACE), which is a - component middleware framework built atop of CIAO/DAnCE that integrates - multiple resource allocation/control algorithms for (re)deploying and - (re)configuring component applications. RACE enables (1) system - developers to configure algorithms depending on the characteristics of - applications and operating environment, and (2) swapping in and swapping - out multiple algorithms to make different resource allocation and control - decisions, without handcrafting the mechanisms needed to (1) configure - the algorithms and (2) deploy the decisions made by the algorithms. - -. Implement support for more complex type initialization with XML. - . Decouple dependencies to NodeApplication from other DAnCE tools. These dependencies were added to support static configurator. We need to have these tools in both conventional version and static @@ -86,9 +82,14 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.7.1 and CIAO-0.7.2 CIAO code generation is now handled by the TAO IDL compiler. See $TAO_ROOT/docs/compiler.html for details. + USER VISIBLE CHANGES BETWEEN CIAO-0.6.9 and CIAO-0.7.0 ======================================================= +. CIDLC compiler has new command line options: --suppress-lem which will suppress + generation of the local executor mapping, --suppress-svnt which will suppress + generation of the servant code, --lem-enclosing-module which will generate the + local executor mapping inside a given module. USER VISIBLE CHANGES BETWEEN CIAO-0.6.8 and CIAO-0.6.9 ====================================================== diff --git a/modules/CIAO/PROBLEM-REPORT-FORM b/modules/CIAO/PROBLEM-REPORT-FORM index 62e6001d266..52912bf70fe 100644 --- a/modules/CIAO/PROBLEM-REPORT-FORM +++ b/modules/CIAO/PROBLEM-REPORT-FORM @@ -43,9 +43,9 @@ To: ciao-users@cs.wustl.edu Subject: [area]: [synopsis] - CIAO VERSION: 0.6.9 - TAO VERSION : 1.6.9 - ACE VERSION : 5.6.9 + CIAO VERSION: 0.7 + TAO VERSION : 1.7 + ACE VERSION : 5.7 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you @@ -62,6 +62,9 @@ Subject: [area]: [synopsis] (unless this isn't used in this case, e.g., with Microsoft Visual C++)]: + BUILD METHOD USED: +[Experimental ./configure or traditional makefile/project file?] + CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features (used by MPC when you generate your own makefiles): diff --git a/modules/CIAO/VERSION b/modules/CIAO/VERSION index 5f26f548ba8..a8cd7bceba7 100644 --- a/modules/CIAO/VERSION +++ b/modules/CIAO/VERSION @@ -1,4 +1,4 @@ -This is CIAO version 0.6.9, released Tue Apr 14 10:06:19 CDT 2009 +This is CIAO version 0.7, released Mon Jun 22 09:33:40 CDT 2009 If you have any problems with or questions about CIAO, please send e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the diff --git a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp index b7c2eaa6895..126c0309502 100644 --- a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp +++ b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp @@ -83,7 +83,7 @@ namespace CIAO ComponentServer_Task::ComponentServer_Task (int argc, ACE_TCHAR **argv) : orb_ (0), uuid_ (""), - callback_ior_str_ ("") + callback_ior_str_ (ACE_TEXT("")) { CIAO_TRACE ("CIAO_ComponentServer_Task::CIAO_ComponentServer_Task ()"); @@ -169,7 +169,7 @@ namespace CIAO } - if (this->callback_ior_str_ != "") + if (this->callback_ior_str_ != ACE_TEXT("")) { CIAO_DEBUG ((LM_TRACE, CLINFO " resolving callback IOR\n")); CORBA::Object_ptr obj = this->orb_->string_to_object (this->callback_ior_str_.c_str ()); @@ -337,7 +337,7 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::parse_args - " "uuid is %s\n", opts.opt_arg ())); - this->uuid_ = opts.opt_arg (); + this->uuid_ = ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()); break; case 'c': @@ -370,8 +370,8 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO " Unknown option: %s\n", opts.last_option ())); this->usage (); - ACE_TString err (ACE_TEXT("Unknown option ")); - err += opts.last_option (); + ACE_CString err ("Unknown option "); + err += ACE_TEXT_ALWAYS_CHAR (opts.last_option ()); throw Error (err); } } @@ -379,7 +379,7 @@ namespace CIAO // check required options. if (this->uuid_ == "") throw Error ("Option required: -u|--uuid"); - if (this->callback_ior_str_ == "") + if (this->callback_ior_str_ == ACE_TEXT("")) CIAO_ERROR ((LM_WARNING, CLINFO "ComponentServer_Task::parse_args - Starting ComponentServer without a callback IOR\n")); } diff --git a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h index 1b89ff461e0..26919ad8486 100644 --- a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h +++ b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h @@ -58,7 +58,7 @@ namespace CIAO auto_ptr<CIAO::Logger_Service> logger_; ACE_CString uuid_; - ACE_CString callback_ior_str_; + ACE_TString callback_ior_str_; ACE_TString output_file_; auto_ptr<ComponentServer_Configurator> configurator_; diff --git a/modules/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp b/modules/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp index 2c5ba71d2ad..ae9d0ba709d 100644 --- a/modules/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp +++ b/modules/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp @@ -33,7 +33,7 @@ namespace CIAO ci_ (CIAO::Deployment::ComponentInstallation::_duplicate (ci)) { - CIAO_TRACE ("CIAO_ServerActivator_i::CIAO_ServerActivator_i"); + CIAO_TRACE (ACE_TEXT("CIAO_ServerActivator_i::CIAO_ServerActivator_i")); ACE_Utils::UUID_GENERATOR::instance ()->init (); } @@ -47,7 +47,7 @@ namespace CIAO const char * server_UUID, ::Components::ConfigValues_out config) { - CIAO_TRACE("CIAO_ServerActivator_i::component_server_callback"); + CIAO_TRACE(ACE_TEXT("CIAO_ServerActivator_i::component_server_callback")); CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::component_server_callback - " @@ -124,7 +124,7 @@ namespace CIAO void CIAO_ServerActivator_i::configuration_complete (const char *server_UUID) { - CIAO_TRACE ("CIAO_ServerActivator_i::configuration_complete"); + CIAO_TRACE (ACE_TEXT("CIAO_ServerActivator_i::configuration_complete")); CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::configuration_complete - " @@ -194,7 +194,7 @@ namespace CIAO ::Components::Deployment::ComponentServer_ptr CIAO_ServerActivator_i::create_component_server (const ::Components::ConfigValues & config) { - CIAO_TRACE("CIAO_ServerActivator_i::create_component_server"); + CIAO_TRACE(ACE_TEXT("CIAO_ServerActivator_i::create_component_server")); Safe_Server_Info server (new Server_Info (config.length () + 1)); @@ -254,7 +254,8 @@ namespace CIAO ACE_CString CIAO_ServerActivator_i::construct_command_line (Server_Info &server) { - CIAO_TRACE ("CIAO_ServerActivator_i::construct_command_line"); + CIAO_TRACE (ACE_TEXT("CIAO_ServerActivator_i::construct_command_line")); + // Build our command line to launch the compoent server ACE_CString cmd_options (this->cs_args_); @@ -378,7 +379,8 @@ namespace CIAO single_threaded_wait_for_callback (const Server_Info &si, ACE_Time_Value &timeout) { - CIAO_TRACE ("CIAO_ServerActivator_i::single_threaded_wait_for_callback"); + CIAO_TRACE (ACE_TEXT("CIAO_ServerActivator_i::single_threaded_wait_for_callback")); + // Below code is broken for thread-per-connection concurrency model, // since the main thread is running ORB event loop and will spawn // a different thread to handle the call <register_node_application>, @@ -410,7 +412,7 @@ namespace CIAO multi_threaded_wait_for_callback (const Server_Info &si, ACE_Time_Value &timeout) { - CIAO_TRACE ("CIAO_ServerActivator_i::multi_threaded_wait_for_callback"); + CIAO_TRACE (ACE_TEXT("CIAO_ServerActivator_i::multi_threaded_wait_for_callback")); // Wait for a conditional variable ACE_GUARD_THROW_EX ( TAO_SYNCH_MUTEX, @@ -432,7 +434,7 @@ namespace CIAO void CIAO_ServerActivator_i::remove_component_server (::Components::Deployment::ComponentServer_ptr server) { - CIAO_TRACE("CIAO_ServerActivator_i::remove_component_server"); + CIAO_TRACE(ACE_TEXT("CIAO_ServerActivator_i::remove_component_server")); if (this->server_infos_.is_empty ()) { @@ -503,7 +505,7 @@ namespace CIAO ::Components::Deployment::ComponentServers * CIAO_ServerActivator_i::get_component_servers (void) { - CIAO_TRACE("CIAO_ServerActivator_i::get_component_servers"); + CIAO_TRACE(ACE_TEXT("CIAO_ServerActivator_i::get_component_servers")); ::Components::Deployment::ComponentServers_var retval = new Components::Deployment::ComponentServers (this->server_infos_.size ()); diff --git a/modules/CIAO/ciao/Server_init.cpp b/modules/CIAO/ciao/Server_init.cpp index 591dd2bd8a0..37fc2693641 100644 --- a/modules/CIAO/ciao/Server_init.cpp +++ b/modules/CIAO/ciao/Server_init.cpp @@ -7,6 +7,7 @@ #include "Valuetype_Factories/Cookies.h" #include "CIAO_common.h" #include "Client_init.h" +#include "ace/Tokenizer_T.h" namespace CIAO { @@ -22,9 +23,9 @@ namespace CIAO namespace Utility { - int write_IOR (const char *pathname, const char *ior) + int write_IOR (const ACE_TCHAR *pathname, const char *ior) { - FILE* ior_output_file_ = ACE_OS::fopen (pathname, "w"); + FILE* ior_output_file_ = ACE_OS::fopen (pathname, ACE_TEXT("w")); if (ior_output_file_) { @@ -71,13 +72,13 @@ namespace CIAO NameUtility::create_name (const char *namestr, CosNaming::Name &name) { ACE_Auto_Basic_Array_Ptr<char> namebfr (ACE::strnew (namestr)); - ACE_Tokenizer tok (namebfr.get ()); + ACE_Tokenizer_T<char> tok (namebfr.get ()); tok.delimiter ('/'); for (char *p = tok.next (); p; p=tok.next ()) { - CORBA::ULong pos = name.length (); + CORBA::ULong const pos = name.length (); name.length (pos + 1); name[pos].id = CORBA::string_dup (p); } @@ -88,7 +89,7 @@ namespace CIAO { bool isNotFound = false; CORBA::ULong lengthMissing = 0; - CORBA::ULong OriginalLength = name.length (); + CORBA::ULong const OriginalLength = name.length (); CosNaming::Name tmpName; CosNaming::NamingContext_var tmpCtxVar; diff --git a/modules/CIAO/ciao/Server_init.h b/modules/CIAO/ciao/Server_init.h index db9b126f37d..bb9e00ede9f 100644 --- a/modules/CIAO/ciao/Server_init.h +++ b/modules/CIAO/ciao/Server_init.h @@ -50,7 +50,7 @@ namespace CIAO /// Write a string (usually a stringified IOR) to a file /// designated by the @c pathname. The file named will always get /// overwritten. - CIAO_SERVER_Export int write_IOR (const char *pathname, + CIAO_SERVER_Export int write_IOR (const ACE_TCHAR *pathname, const char *IOR); class CIAO_SERVER_Export NameUtility diff --git a/modules/CIAO/ciao/Version.h b/modules/CIAO/ciao/Version.h index 34a8fa590d1..1071d4d0675 100644 --- a/modules/CIAO/ciao/Version.h +++ b/modules/CIAO/ciao/Version.h @@ -4,6 +4,6 @@ // This is file was automatically generated by \$ACE_ROOT/bin/make_release. #define CIAO_MAJOR_VERSION 0 -#define CIAO_MINOR_VERSION 6 -#define CIAO_BETA_VERSION 9 -#define CIAO_VERSION "0.6.9" +#define CIAO_MINOR_VERSION 7 +#define CIAO_BETA_VERSION 0 +#define CIAO_VERSION "0.7" diff --git a/modules/CIAO/examples/Hello/Sender/starter.cpp b/modules/CIAO/examples/Hello/Sender/starter.cpp index 610ee410d11..e91b55f47d7 100644 --- a/modules/CIAO/examples/Hello/Sender/starter.cpp +++ b/modules/CIAO/examples/Hello/Sender/starter.cpp @@ -58,8 +58,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return -1; } - CORBA::Object_var obj = - orb->string_to_object (ior); + CORBA::Object_var obj = orb->string_to_object (ior); Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ()); @@ -71,9 +70,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } if (message) - { - sender->local_message (message); - } + { + sender->local_message (message); + } sender->start (); diff --git a/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp b/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp index 576e8218144..bdcdf022d1a 100644 --- a/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp +++ b/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp @@ -24,7 +24,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) switch (c) { case 's': - cs_path = get_opts.opt_arg (); + cs_path = ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()); break; case 'd': @@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) case '?': default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " + "usage: %s " "-s <path> " "-d <uint> " "\n", diff --git a/modules/CIAO/tools/Config_Handlers/IRDD_Handler.h b/modules/CIAO/tools/Config_Handlers/IRDD_Handler.h index af641813e26..dc4955988ee 100644 --- a/modules/CIAO/tools/Config_Handlers/IRDD_Handler.h +++ b/modules/CIAO/tools/Config_Handlers/IRDD_Handler.h @@ -12,8 +12,8 @@ #define CIAO_CONFIG_HANDLERS_IRDD_Handler_H #include /**/ "ace/pre.h" -#include "Common.h" #include "Config_Handlers_Export.h" +#include "Common.h" #include "ace/config-lite.h" #include "Utils/Functors.h" diff --git a/modules/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/modules/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp index 92f707e937f..2a3198b9201 100644 --- a/modules/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp +++ b/modules/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp @@ -222,7 +222,7 @@ namespace XSCRT { public: // typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr; - + FundamentalType () { } @@ -272,7 +272,7 @@ namespace XSCRT }; #if ((defined (__GNUC__) && (__GNUC__ == 3 && (__GNUC_MINOR__ < 3))) || \ - (defined (__BORLANDC__) && (__BORLANDC__ == 0x610)) || \ + (defined (__BORLANDC__) && (__BORLANDC__ < 0x620)) || \ (defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x570))) // Stuff for broken gcc < 3.3. Don't like what you see - use better diff --git a/modules/CIAO/tools/XML/XML_Schema_Resolver.cpp b/modules/CIAO/tools/XML/XML_Schema_Resolver.cpp index cc78dca37cd..afa2ef14dc7 100644 --- a/modules/CIAO/tools/XML/XML_Schema_Resolver.cpp +++ b/modules/CIAO/tools/XML/XML_Schema_Resolver.cpp @@ -1,8 +1,9 @@ // $Id$ +#include "XML/XML_Schema_Resolver.h" + #include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/XercesDefs.hpp> -#include "XML/XML_Schema_Resolver.h" #include "XML/XercesString.h" #include "ace/Env_Value_T.h" diff --git a/modules/CIAO/tools/XML/XML_Schema_Resolver.h b/modules/CIAO/tools/XML/XML_Schema_Resolver.h index 5ccc00c4bde..1826c8c1af6 100644 --- a/modules/CIAO/tools/XML/XML_Schema_Resolver.h +++ b/modules/CIAO/tools/XML/XML_Schema_Resolver.h @@ -44,7 +44,7 @@ namespace CIAO { public: XML_Schema_Resolver (void); - + XML_Schema_Resolver (Resolver &resolver); /// This function is called by the Xerces infrastructure to @@ -57,7 +57,7 @@ namespace CIAO Resolver &resolver_; }; - + /** * @class NoOp_Resolver * @brief Resolver that does nothing. @@ -76,27 +76,27 @@ namespace CIAO struct Basic_Resolver { Basic_Resolver (const ACE_TCHAR *path); - + XMLCh* operator() (const XMLCh *const publicId, const XMLCh *const systemId) const; XStr path_; }; - + /** * @class Environment_Resolver * @brief Resolves a schema location from a path from an environment variable. */ struct CIAO_XML_Utils_Export Environment_Resolver { - Environment_Resolver (const ACE_TCHAR *variable = "", - const ACE_TCHAR *path = "./"); - - void add_path (const ACE_TCHAR *variable, + Environment_Resolver (const ACE_TCHAR *variable = ACE_TEXT(""), + const ACE_TCHAR *path = ACE_TEXT("./")); + + void add_path (const ACE_TCHAR *variable, const ACE_TCHAR *path); - + XMLCh* operator() (const XMLCh *const publicId, const XMLCh *const systemId) const; - + std::vector<XStr> paths_; }; } |