summaryrefslogtreecommitdiff
path: root/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp')
-rw-r--r--CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp152
1 files changed, 76 insertions, 76 deletions
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
index d372e64827a..6fe6f8e3e9b 100644
--- a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
+++ b/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;
}
@@ -168,42 +168,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;
@@ -220,54 +220,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-")) == 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-")) == 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-")) == 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-")) == 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 ()));
}
@@ -275,12 +275,12 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
case '\?':
case ':':
- DANCE_ERROR ((LM_ERROR, DLINFO "Repository_Manager_Module::parse_args - "
- "Options %c:%C requires an argument\n", c, get_opts.opt_opt ()));
+ DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+ ACE_TEXT("Options %c:%s requires an argument\n"), c, get_opts.opt_opt ()));
break;
default:
- DANCE_DEBUG ((LM_TRACE, DLINFO "Repository_Manager_Module::parse_args - ignoring unknown option %c:%C\n",
+ DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ignoring unknown option %c:%s\n"),
c, get_opts.opt_arg ()));
}
@@ -288,8 +288,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;
}
@@ -307,8 +307,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
@@ -318,16 +318,16 @@ 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();
}
if (!this->parse_args (argc, argv))
{
- DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - "
- "Failed to parse command line arguments, exiting\n"));
+ DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
+ ACE_TEXT("Failed to parse command line arguments, exiting\n")));
return CORBA::Object::_nil ();
}
@@ -340,30 +340,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");
@@ -371,8 +371,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 ();
}
@@ -413,8 +413,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 ());
@@ -425,11 +425,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_));
}
@@ -438,11 +438,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 ();
}
@@ -458,14 +458,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);
@@ -473,9 +473,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);
@@ -485,8 +485,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);
}
}
View Lorry Controller Status