summaryrefslogtreecommitdiff
path: root/CIAO/tools/Config_Handlers/RT-CCM
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/tools/Config_Handlers/RT-CCM')
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp4
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp212
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp4
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp12
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc10
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h4
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp18
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp4
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h10
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp4
-rw-r--r--CIAO/tools/Config_Handlers/RT-CCM/test.cpp12
11 files changed, 146 insertions, 148 deletions
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
index c0ab8d5daa9..85a06851d78 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
@@ -34,7 +34,7 @@ namespace CIAO
if (!IDD_Handler::IDREF.bind_ref (cstr, dest))
return false;
*/
- dest.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+ dest.Id = CORBA::string_dup (src.id ().c_str ());
}
return true;
@@ -61,7 +61,7 @@ namespace CIAO
*/
if (src.Id.in () != 0)
- cb.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+ cb.id (src.Id.in ());
return cb;
}
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index a653c2fa311..01f192d5201 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -1906,19 +1906,19 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("cmdline"))
+ if (n == "cmdline")
{
::CIAO::Config_Handlers::ServerCmdlineOptions t (e);
cmdline (t);
}
- else if (n == ACE_TEXT ("svcconf"))
+ else if (n == "svcconf")
{
::CIAO::Config_Handlers::ACESvcConf t (e);
svcconf (t);
}
- else if (n == ACE_TEXT ("orbConfigs"))
+ else if (n == "orbConfigs")
{
orbConfigs_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ORBConfigs > (new ::CIAO::Config_Handlers::ORBConfigs (e));
orbConfigs_->container (this);
@@ -1933,7 +1933,7 @@ namespace CIAO
{
::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
- if (n == ACE_TEXT ("id"))
+ if (n == "id")
{
::XMLSchema::ID< ACE_TCHAR > t (a);
id (t);
@@ -1960,7 +1960,7 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("arg"))
+ if (n == "arg")
{
::XMLSchema::string< ACE_TCHAR > t (e);
add_arg (t);
@@ -1987,7 +1987,7 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("uri"))
+ if (n == "uri")
{
::XMLSchema::string< ACE_TCHAR > t (e);
uri (t);
@@ -2014,13 +2014,13 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("resources"))
+ if (n == "resources")
{
::CIAO::Config_Handlers::ORBResources t (e);
resources (t);
}
- else if (n == ACE_TEXT ("policySet"))
+ else if (n == "policySet")
{
::CIAO::Config_Handlers::PolicySet t (e);
add_policySet (t);
@@ -2047,19 +2047,19 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("threadpool"))
+ if (n == "threadpool")
{
::CIAO::Config_Handlers::ThreadpoolDef t (e);
add_threadpool (t);
}
- else if (n == ACE_TEXT ("threadpoolWithLanes"))
+ else if (n == "threadpoolWithLanes")
{
::CIAO::Config_Handlers::ThreadpoolWithLanesDef t (e);
add_threadpoolWithLanes (t);
}
- else if (n == ACE_TEXT ("connectionBands"))
+ else if (n == "connectionBands")
{
::CIAO::Config_Handlers::ConnectionBandsDef t (e);
add_connectionBands (t);
@@ -2086,43 +2086,43 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("stacksize"))
+ if (n == "stacksize")
{
stacksize_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
stacksize_->container (this);
}
- else if (n == ACE_TEXT ("static_threads"))
+ else if (n == "static_threads")
{
static_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
static_threads_->container (this);
}
- else if (n == ACE_TEXT ("dynamic_threads"))
+ else if (n == "dynamic_threads")
{
dynamic_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
dynamic_threads_->container (this);
}
- else if (n == ACE_TEXT ("default_priority"))
+ else if (n == "default_priority")
{
default_priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
default_priority_->container (this);
}
- else if (n == ACE_TEXT ("allow_request_buffering"))
+ else if (n == "allow_request_buffering")
{
allow_request_buffering_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
allow_request_buffering_->container (this);
}
- else if (n == ACE_TEXT ("max_buffered_requests"))
+ else if (n == "max_buffered_requests")
{
max_buffered_requests_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
max_buffered_requests_->container (this);
}
- else if (n == ACE_TEXT ("max_request_buffered_size"))
+ else if (n == "max_request_buffered_size")
{
max_request_buffered_size_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
max_request_buffered_size_->container (this);
@@ -2137,7 +2137,7 @@ namespace CIAO
{
::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
- if (n == ACE_TEXT ("id"))
+ if (n == "id")
{
::XMLSchema::ID< ACE_TCHAR > t (a);
id (t);
@@ -2164,37 +2164,37 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("threadpoolLane"))
+ if (n == "threadpoolLane")
{
::CIAO::Config_Handlers::ThreadpoolLaneDef t (e);
add_threadpoolLane (t);
}
- else if (n == ACE_TEXT ("stacksize"))
+ else if (n == "stacksize")
{
stacksize_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
stacksize_->container (this);
}
- else if (n == ACE_TEXT ("allow_borrowing"))
+ else if (n == "allow_borrowing")
{
allow_borrowing_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
allow_borrowing_->container (this);
}
- else if (n == ACE_TEXT ("allow_request_buffering"))
+ else if (n == "allow_request_buffering")
{
allow_request_buffering_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
allow_request_buffering_->container (this);
}
- else if (n == ACE_TEXT ("max_buffered_requests"))
+ else if (n == "max_buffered_requests")
{
max_buffered_requests_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
max_buffered_requests_->container (this);
}
- else if (n == ACE_TEXT ("max_request_buffered_size"))
+ else if (n == "max_request_buffered_size")
{
max_request_buffered_size_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
max_request_buffered_size_->container (this);
@@ -2209,7 +2209,7 @@ namespace CIAO
{
::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
- if (n == ACE_TEXT ("id"))
+ if (n == "id")
{
::XMLSchema::ID< ACE_TCHAR > t (a);
id (t);
@@ -2236,19 +2236,19 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("static_threads"))
+ if (n == "static_threads")
{
static_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
static_threads_->container (this);
}
- else if (n == ACE_TEXT ("dynamic_threads"))
+ else if (n == "dynamic_threads")
{
dynamic_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
dynamic_threads_->container (this);
}
- else if (n == ACE_TEXT ("priority"))
+ else if (n == "priority")
{
priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
priority_->container (this);
@@ -2275,7 +2275,7 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("band"))
+ if (n == "band")
{
::CIAO::Config_Handlers::PriorityBandDef t (e);
add_band (t);
@@ -2290,7 +2290,7 @@ namespace CIAO
{
::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
- if (n == ACE_TEXT ("id"))
+ if (n == "id")
{
::XMLSchema::ID< ACE_TCHAR > t (a);
id (t);
@@ -2317,13 +2317,13 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("low"))
+ if (n == "low")
{
low_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
low_->container (this);
}
- else if (n == ACE_TEXT ("high"))
+ else if (n == "high")
{
high_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
high_->container (this);
@@ -2350,31 +2350,31 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("priorityModel"))
+ if (n == "priorityModel")
{
::CIAO::Config_Handlers::PriorityModelPolicyDef t (e);
add_priorityModel (t);
}
- else if (n == ACE_TEXT ("nwpriorityModel"))
+ else if (n == "nwpriorityModel")
{
::CIAO::Config_Handlers::NWPriorityModelPolicyDef t (e);
add_nwpriorityModel (t);
}
- else if (n == ACE_TEXT ("cnwpriorityModel"))
+ else if (n == "cnwpriorityModel")
{
::CIAO::Config_Handlers::CNWPriorityModelPolicyDef t (e);
add_cnwpriorityModel (t);
}
- else if (n == ACE_TEXT ("threadpool"))
+ else if (n == "threadpool")
{
::XMLSchema::IDREF< ACE_TCHAR > t (e);
add_threadpool (t);
}
- else if (n == ACE_TEXT ("priorityBandedConnection"))
+ else if (n == "priorityBandedConnection")
{
::XMLSchema::IDREF< ACE_TCHAR > t (e);
add_priorityBandedConnection (t);
@@ -2389,7 +2389,7 @@ namespace CIAO
{
::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
- if (n == ACE_TEXT ("id"))
+ if (n == "id")
{
::XMLSchema::ID< ACE_TCHAR > t (a);
id (t);
@@ -2410,8 +2410,8 @@ namespace CIAO
{
::std::basic_string< ACE_TCHAR > v (e.value ());
- if (v == ACE_TEXT ("SERVER_DECLARED")) v_ = SERVER_DECLARED_l;
- else if (v == ACE_TEXT ("CLIENT_PROPAGATED")) v_ = CLIENT_PROPAGATED_l;
+ if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
+ else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
else
{
}
@@ -2423,8 +2423,8 @@ namespace CIAO
{
::std::basic_string< ACE_TCHAR > v (a.value ());
- if (v == ACE_TEXT ("SERVER_DECLARED")) v_ = SERVER_DECLARED_l;
- else if (v == ACE_TEXT ("CLIENT_PROPAGATED")) v_ = CLIENT_PROPAGATED_l;
+ if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
+ else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
else
{
}
@@ -2442,8 +2442,8 @@ namespace CIAO
{
::std::basic_string< ACE_TCHAR > v (e.value ());
- if (v == ACE_TEXT ("SERVER_DECLARED_NWPRIORITY")) v_ = SERVER_DECLARED_NWPRIORITY_l;
- else if (v == ACE_TEXT ("CLIENT_PROPAGATED_NWPRIORITY")) v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
+ if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
+ else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
else
{
}
@@ -2455,8 +2455,8 @@ namespace CIAO
{
::std::basic_string< ACE_TCHAR > v (a.value ());
- if (v == ACE_TEXT ("SERVER_DECLARED_NWPRIORITY")) v_ = SERVER_DECLARED_NWPRIORITY_l;
- else if (v == ACE_TEXT ("CLIENT_PROPAGATED_NWPRIORITY")) v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
+ if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
+ else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
else
{
}
@@ -2480,7 +2480,7 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("priority_model"))
+ if (n == "priority_model")
{
priority_model_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PriorityModel > (new ::CIAO::Config_Handlers::PriorityModel (e));
priority_model_->container (this);
@@ -2495,7 +2495,7 @@ namespace CIAO
{
::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
- if (n == ACE_TEXT ("server_priority"))
+ if (n == "server_priority")
{
::XMLSchema::int_ t (a);
server_priority (t);
@@ -2522,19 +2522,19 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("nw_priority_model"))
+ if (n == "nw_priority_model")
{
nw_priority_model_ = ::std::auto_ptr< ::CIAO::Config_Handlers::NWPriorityModel > (new ::CIAO::Config_Handlers::NWPriorityModel (e));
nw_priority_model_->container (this);
}
- else if (n == ACE_TEXT ("request_dscp"))
+ else if (n == "request_dscp")
{
request_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
request_dscp_->container (this);
}
- else if (n == ACE_TEXT ("reply_dscp"))
+ else if (n == "reply_dscp")
{
reply_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
reply_dscp_->container (this);
@@ -2561,13 +2561,13 @@ namespace CIAO
::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
- if (n == ACE_TEXT ("request_dscp"))
+ if (n == "request_dscp")
{
request_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
request_dscp_->container (this);
}
- else if (n == ACE_TEXT ("reply_dscp"))
+ else if (n == "reply_dscp")
{
reply_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
reply_dscp_->container (this);
@@ -2589,7 +2589,7 @@ namespace CIAO
ServerResources (xercesc::DOMDocument const* d)
{
::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
- if (e.name () == ACE_TEXT ("ServerResources"))
+ if (e.name () == "ServerResources")
{
::CIAO::Config_Handlers::ServerResourcesDef r (e);
return r;
@@ -4985,7 +4985,7 @@ namespace CIAO
void ServerResourcesDef::
cmdline (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("cmdline"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("cmdline", top_ ()));
Traversal::ServerResourcesDef::cmdline (o);
pop_ ();
}
@@ -4993,7 +4993,7 @@ namespace CIAO
void ServerResourcesDef::
svcconf (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("svcconf"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svcconf", top_ ()));
Traversal::ServerResourcesDef::svcconf (o);
pop_ ();
}
@@ -5001,7 +5001,7 @@ namespace CIAO
void ServerResourcesDef::
orbConfigs (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("orbConfigs"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("orbConfigs", top_ ()));
Traversal::ServerResourcesDef::orbConfigs (o);
pop_ ();
}
@@ -5009,7 +5009,7 @@ namespace CIAO
void ServerResourcesDef::
id (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
attr_ (&a);
Traversal::ServerResourcesDef::id (o);
attr_ (0);
@@ -5039,7 +5039,7 @@ namespace CIAO
void ServerCmdlineOptions::
arg_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("arg"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("arg", top_ ()));
}
void ServerCmdlineOptions::
@@ -5079,7 +5079,7 @@ namespace CIAO
void ACESvcConf::
uri (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("uri"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("uri", top_ ()));
Traversal::ACESvcConf::uri (o);
pop_ ();
}
@@ -5108,7 +5108,7 @@ namespace CIAO
void ORBConfigs::
resources (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resources"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resources", top_ ()));
Traversal::ORBConfigs::resources (o);
pop_ ();
}
@@ -5116,7 +5116,7 @@ namespace CIAO
void ORBConfigs::
policySet_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("policySet"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("policySet", top_ ()));
}
void ORBConfigs::
@@ -5156,7 +5156,7 @@ namespace CIAO
void ORBResources::
threadpool_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpool"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpool", top_ ()));
}
void ORBResources::
@@ -5175,7 +5175,7 @@ namespace CIAO
void ORBResources::
threadpoolWithLanes_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpoolWithLanes"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpoolWithLanes", top_ ()));
}
void ORBResources::
@@ -5194,7 +5194,7 @@ namespace CIAO
void ORBResources::
connectionBands_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connectionBands"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connectionBands", top_ ()));
}
void ORBResources::
@@ -5234,7 +5234,7 @@ namespace CIAO
void ThreadpoolDef::
stacksize (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("stacksize"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("stacksize", top_ ()));
Traversal::ThreadpoolDef::stacksize (o);
pop_ ();
}
@@ -5242,7 +5242,7 @@ namespace CIAO
void ThreadpoolDef::
static_threads (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("static_threads"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("static_threads", top_ ()));
Traversal::ThreadpoolDef::static_threads (o);
pop_ ();
}
@@ -5250,7 +5250,7 @@ namespace CIAO
void ThreadpoolDef::
dynamic_threads (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dynamic_threads"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic_threads", top_ ()));
Traversal::ThreadpoolDef::dynamic_threads (o);
pop_ ();
}
@@ -5258,7 +5258,7 @@ namespace CIAO
void ThreadpoolDef::
default_priority (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("default_priority"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("default_priority", top_ ()));
Traversal::ThreadpoolDef::default_priority (o);
pop_ ();
}
@@ -5266,7 +5266,7 @@ namespace CIAO
void ThreadpoolDef::
allow_request_buffering (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("allow_request_buffering"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("allow_request_buffering", top_ ()));
Traversal::ThreadpoolDef::allow_request_buffering (o);
pop_ ();
}
@@ -5274,7 +5274,7 @@ namespace CIAO
void ThreadpoolDef::
max_buffered_requests (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_buffered_requests"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_buffered_requests", top_ ()));
Traversal::ThreadpoolDef::max_buffered_requests (o);
pop_ ();
}
@@ -5282,7 +5282,7 @@ namespace CIAO
void ThreadpoolDef::
max_request_buffered_size (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_request_buffered_size"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_request_buffered_size", top_ ()));
Traversal::ThreadpoolDef::max_request_buffered_size (o);
pop_ ();
}
@@ -5290,7 +5290,7 @@ namespace CIAO
void ThreadpoolDef::
id (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
attr_ (&a);
Traversal::ThreadpoolDef::id (o);
attr_ (0);
@@ -5320,7 +5320,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
threadpoolLane_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpoolLane"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpoolLane", top_ ()));
}
void ThreadpoolWithLanesDef::
@@ -5339,7 +5339,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
stacksize (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("stacksize"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("stacksize", top_ ()));
Traversal::ThreadpoolWithLanesDef::stacksize (o);
pop_ ();
}
@@ -5347,7 +5347,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
allow_borrowing (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("allow_borrowing"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("allow_borrowing", top_ ()));
Traversal::ThreadpoolWithLanesDef::allow_borrowing (o);
pop_ ();
}
@@ -5355,7 +5355,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
allow_request_buffering (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("allow_request_buffering"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("allow_request_buffering", top_ ()));
Traversal::ThreadpoolWithLanesDef::allow_request_buffering (o);
pop_ ();
}
@@ -5363,7 +5363,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
max_buffered_requests (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_buffered_requests"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_buffered_requests", top_ ()));
Traversal::ThreadpoolWithLanesDef::max_buffered_requests (o);
pop_ ();
}
@@ -5371,7 +5371,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
max_request_buffered_size (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_request_buffered_size"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_request_buffered_size", top_ ()));
Traversal::ThreadpoolWithLanesDef::max_request_buffered_size (o);
pop_ ();
}
@@ -5379,7 +5379,7 @@ namespace CIAO
void ThreadpoolWithLanesDef::
id (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
attr_ (&a);
Traversal::ThreadpoolWithLanesDef::id (o);
attr_ (0);
@@ -5409,7 +5409,7 @@ namespace CIAO
void ThreadpoolLaneDef::
static_threads (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("static_threads"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("static_threads", top_ ()));
Traversal::ThreadpoolLaneDef::static_threads (o);
pop_ ();
}
@@ -5417,7 +5417,7 @@ namespace CIAO
void ThreadpoolLaneDef::
dynamic_threads (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dynamic_threads"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic_threads", top_ ()));
Traversal::ThreadpoolLaneDef::dynamic_threads (o);
pop_ ();
}
@@ -5425,7 +5425,7 @@ namespace CIAO
void ThreadpoolLaneDef::
priority (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priority"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priority", top_ ()));
Traversal::ThreadpoolLaneDef::priority (o);
pop_ ();
}
@@ -5454,7 +5454,7 @@ namespace CIAO
void ConnectionBandsDef::
band_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("band"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("band", top_ ()));
}
void ConnectionBandsDef::
@@ -5473,7 +5473,7 @@ namespace CIAO
void ConnectionBandsDef::
id (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
attr_ (&a);
Traversal::ConnectionBandsDef::id (o);
attr_ (0);
@@ -5503,7 +5503,7 @@ namespace CIAO
void PriorityBandDef::
low (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("low"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("low", top_ ()));
Traversal::PriorityBandDef::low (o);
pop_ ();
}
@@ -5511,7 +5511,7 @@ namespace CIAO
void PriorityBandDef::
high (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("high"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("high", top_ ()));
Traversal::PriorityBandDef::high (o);
pop_ ();
}
@@ -5540,7 +5540,7 @@ namespace CIAO
void PolicySet::
priorityModel_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priorityModel"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priorityModel", top_ ()));
}
void PolicySet::
@@ -5559,7 +5559,7 @@ namespace CIAO
void PolicySet::
nwpriorityModel_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("nwpriorityModel"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nwpriorityModel", top_ ()));
}
void PolicySet::
@@ -5578,7 +5578,7 @@ namespace CIAO
void PolicySet::
cnwpriorityModel_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("cnwpriorityModel"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("cnwpriorityModel", top_ ()));
}
void PolicySet::
@@ -5597,7 +5597,7 @@ namespace CIAO
void PolicySet::
threadpool_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpool"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpool", top_ ()));
}
void PolicySet::
@@ -5616,7 +5616,7 @@ namespace CIAO
void PolicySet::
priorityBandedConnection_pre (Type const&)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priorityBandedConnection"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priorityBandedConnection", top_ ()));
}
void PolicySet::
@@ -5635,7 +5635,7 @@ namespace CIAO
void PolicySet::
id (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
attr_ (&a);
Traversal::PolicySet::id (o);
attr_ (0);
@@ -5661,8 +5661,8 @@ namespace CIAO
{
::std::basic_string< ACE_TCHAR > s;
- if (o == ::CIAO::Config_Handlers::PriorityModel::SERVER_DECLARED) s = ACE_TEXT ("SERVER_DECLARED");
- else if (o == ::CIAO::Config_Handlers::PriorityModel::CLIENT_PROPAGATED) s = ACE_TEXT ("CLIENT_PROPAGATED");
+ if (o == ::CIAO::Config_Handlers::PriorityModel::SERVER_DECLARED) s = "SERVER_DECLARED";
+ else if (o == ::CIAO::Config_Handlers::PriorityModel::CLIENT_PROPAGATED) s = "CLIENT_PROPAGATED";
else
{
}
@@ -5698,8 +5698,8 @@ namespace CIAO
{
::std::basic_string< ACE_TCHAR > s;
- if (o == ::CIAO::Config_Handlers::NWPriorityModel::SERVER_DECLARED_NWPRIORITY) s = ACE_TEXT ("SERVER_DECLARED_NWPRIORITY");
- else if (o == ::CIAO::Config_Handlers::NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY) s = ACE_TEXT ("CLIENT_PROPAGATED_NWPRIORITY");
+ if (o == ::CIAO::Config_Handlers::NWPriorityModel::SERVER_DECLARED_NWPRIORITY) s = "SERVER_DECLARED_NWPRIORITY";
+ else if (o == ::CIAO::Config_Handlers::NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY) s = "CLIENT_PROPAGATED_NWPRIORITY";
else
{
}
@@ -5739,7 +5739,7 @@ namespace CIAO
void PriorityModelPolicyDef::
priority_model (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priority_model"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priority_model", top_ ()));
Traversal::PriorityModelPolicyDef::priority_model (o);
pop_ ();
}
@@ -5747,7 +5747,7 @@ namespace CIAO
void PriorityModelPolicyDef::
server_priority (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("server_priority"), ACE_TEXT (""), top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a ("server_priority", "", top_ ());
attr_ (&a);
Traversal::PriorityModelPolicyDef::server_priority (o);
attr_ (0);
@@ -5777,7 +5777,7 @@ namespace CIAO
void NWPriorityModelPolicyDef::
nw_priority_model (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("nw_priority_model"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nw_priority_model", top_ ()));
Traversal::NWPriorityModelPolicyDef::nw_priority_model (o);
pop_ ();
}
@@ -5785,7 +5785,7 @@ namespace CIAO
void NWPriorityModelPolicyDef::
request_dscp (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("request_dscp"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("request_dscp", top_ ()));
Traversal::NWPriorityModelPolicyDef::request_dscp (o);
pop_ ();
}
@@ -5793,7 +5793,7 @@ namespace CIAO
void NWPriorityModelPolicyDef::
reply_dscp (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("reply_dscp"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reply_dscp", top_ ()));
Traversal::NWPriorityModelPolicyDef::reply_dscp (o);
pop_ ();
}
@@ -5822,7 +5822,7 @@ namespace CIAO
void CNWPriorityModelPolicyDef::
request_dscp (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("request_dscp"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("request_dscp", top_ ()));
Traversal::CNWPriorityModelPolicyDef::request_dscp (o);
pop_ ();
}
@@ -5830,7 +5830,7 @@ namespace CIAO
void CNWPriorityModelPolicyDef::
reply_dscp (Type const& o)
{
- push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("reply_dscp"), top_ ()));
+ push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reply_dscp", top_ ()));
Traversal::CNWPriorityModelPolicyDef::reply_dscp (o);
pop_ ();
}
@@ -5846,7 +5846,7 @@ namespace CIAO
ServerResources (::CIAO::Config_Handlers::ServerResourcesDef const& s, xercesc::DOMDocument* d)
{
::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
- if (e.name () != ACE_TEXT ("ServerResources"))
+ if (e.name () != "ServerResources")
{
throw 1;
}
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
index 510b3f5c755..39e2d72bbbf 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
dest.length(len+1);
- dest[len] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (loc->c_str ()));
+ dest[len] = CORBA::string_dup (loc->c_str ());
}
return true;
@@ -35,7 +35,7 @@ namespace CIAO
i < src.length ();
++i)
{
- co.add_arg (ACE_TEXT_CHAR_TO_TCHAR (src[i].in ()));
+ co.add_arg (src[i].in ());
}
return co;
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
index 2d13dc42d1c..16a2f71f40a 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
@@ -15,7 +15,7 @@ namespace CIAO
::CIAO::DAnCE::PolicySet &dest)
{
if (src.id_p ())
- dest.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+ dest.Id = CORBA::string_dup (src.id ().c_str ());
// Make room for all of the policies
CORBA::ULong len (dest.policies.length ());
@@ -67,7 +67,7 @@ namespace CIAO
{
::CIAO::DAnCE::ThreadpoolPolicyDef tpd;
- tpd.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->id ().c_str ()));
+ tpd.Id = CORBA::string_dup (i->id ().c_str ());
dest.policies[len++].ThreadpoolDef (tpd);
}
@@ -79,7 +79,7 @@ namespace CIAO
{
::CIAO::DAnCE::PriorityBandedConnectionPolicyDef pbc;
- pbc.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->id ().c_str ()));
+ pbc.Id = CORBA::string_dup (i->id ().c_str ());
dest.policies[len++].PriorityBandedConnectionDef (pbc);
}
@@ -92,7 +92,7 @@ namespace CIAO
PolicySet ps;
if (src.Id.in ())
- ps.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+ ps.id (src.Id.in ());
for (CORBA::ULong i = 0;
i < src.policies.length ();
@@ -123,12 +123,12 @@ namespace CIAO
break;
case ::CIAO::DAnCE::THREADPOOL_POLICY_TYPE:
- ps.add_threadpool (ACE_TEXT_CHAR_TO_TCHAR (src.policies[i].ThreadpoolDef ().Id.in ()));
+ ps.add_threadpool (src.policies[i].ThreadpoolDef ().Id.in ());
break;
case ::CIAO::DAnCE::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
ps.add_priorityBandedConnection (
- ACE_TEXT_CHAR_TO_TCHAR (src.policies[i].PriorityBandedConnectionDef ().Id.in ()));
+ src.policies[i].PriorityBandedConnectionDef ().Id.in ());
break;
case 0:
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
index e39be8550a8..eb95e0788d5 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
@@ -1,7 +1,7 @@
//$Id$
project (RT_CCM_XML_Generation) : xscdefaults {
- requires += xsc
+ requires += xsc dummy_label
xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
@@ -9,7 +9,7 @@ project (RT_CCM_XML_Generation) : xscdefaults {
xscflags += --cxx-namespace-regex <%quote%>%.*vanderbilt.*%CIAO/Config_Handlers%<%quote%>
xscflags += --cxx-export-header RT_CCM_Handlers_Export.h
xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
-
+
custom_only = 1
XSC_Files {
@@ -18,7 +18,7 @@ project (RT_CCM_XML_Generation) : xscdefaults {
}
}
-project (RT_CCM_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, ciao_config_handlers_base {
+project (RT_CCM_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base {
sharedname = RT_CCM_Config_Handlers
dynamicflags = RT_CCM_HANDLERS_BUILD_DLL
macros += XML_USE_PTHREADS
@@ -26,6 +26,8 @@ project (RT_CCM_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, cia
includes += $(CIAO_ROOT)/ciao
after += RT_CCM_XML_Generation
+
+ requires += dummy_label
Source_Files {
CIAOServerResources.cpp
@@ -46,7 +48,7 @@ project (RT_CCM_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, cia
}
}
-//project (RT-CCM_Config_Handlers_Tests) : ciao_component_dnc, xerces {
+//project (RT-CCM_Config_Handlers_Tests) : ciao_executor, xerces {
// requires += dummy_label
// exename = rt-ccm-test
// after += RT-CCM-Handlers
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h b/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
index 8a969d10f7d..fdba117ae61 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
@@ -9,10 +9,6 @@
#include "ace/config-all.h"
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RT_CCM_HANDLERS_HAS_DLL)
-# define RT_CCM_HANDLERS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RT_CCM_HANDLERS_HAS_DLL */
-
#if !defined (RT_CCM_HANDLERS_HAS_DLL)
# define RT_CCM_HANDLERS_HAS_DLL 1
#endif /* ! RT_CCM_HANDLERS_HAS_DLL */
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
index 89f3d7d5ee7..17ce790182e 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
@@ -1,5 +1,5 @@
// $Id$
-#include "Utils/XML_Helper.h"
+#include "Utils/XML_Typedefs.h"
#include "SRD_Handler.h"
#include "CIAOServerResources.hpp"
#include "CLA_Handler.h"
@@ -14,10 +14,8 @@ namespace CIAO
srd_ (0),
retval_ (false)
{
- XML_Helper helper;
-
XERCES_CPP_NAMESPACE::DOMDocument *dom =
- helper.create_dom (file);
+ XML_HELPER.create_dom (file);
if (!dom)
throw SRD_Handler::NoSRD ();
@@ -64,7 +62,7 @@ namespace CIAO
if(this->srd_->svcconf_p())
{
- this->idl_srd_->svcconf = ACE_TEXT_ALWAYS_CHAR (srd_->svcconf().uri().c_str());
+ this->idl_srd_->svcconf = (srd_->svcconf().uri().c_str());
}
this->retval_ = OC_Handler::orb_config (this->srd_->orbConfigs (),
@@ -72,7 +70,7 @@ namespace CIAO
if (this->srd_->id_p ())
{
- this->idl_srd_->Id = ACE_TEXT_ALWAYS_CHAR (srd_->id ().c_str ());
+ this->idl_srd_->Id = srd_->id ().c_str ();
}
return this->retval_;
@@ -96,18 +94,18 @@ namespace CIAO
len = idl_srd_->args.length();
for(size_t i = 0; i < len; i++)
{
- XMLSchema::string < ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (this->idl_srd_->args[i]));
+ XMLSchema::string < ACE_TCHAR > curr ((this->idl_srd_->args[i]));
sco.add_arg(curr);
}
this->srd_->cmdline (sco);
//Then a similar thing for the svcconf
- XMLSchema::string < ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (this->idl_srd_->svcconf.in ()));
+ XMLSchema::string < ACE_TCHAR > curr (this->idl_srd_->svcconf);
ACESvcConf asc;
asc.uri(curr);
this->srd_->svcconf (asc);
- XMLSchema::string < ACE_TCHAR > id (ACE_TEXT_CHAR_TO_TCHAR (this->idl_srd_->Id.in ()));
+ XMLSchema::string < ACE_TCHAR > id (this->idl_srd_->Id.in ());
this->srd_->id (id);
return true;
@@ -154,3 +152,5 @@ namespace CIAO
}
}
}
+
+
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
index 5f78fc91e00..4d65478d19c 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
@@ -14,7 +14,7 @@ namespace CIAO
{
if (src.id_p ())
{
- dest.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (src.id().c_str ()));
+ dest.Id = CORBA::string_dup (src.id().c_str ());
}
for (ThreadpoolWithLanesDef::threadpoolLane_const_iterator loc =
@@ -62,7 +62,7 @@ namespace CIAO
);
//XMLSchema::ID <ACE_TCHAR> id = ((src.Id));
- tpl.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+ tpl.id (src.Id.in ());
size_t len = src.threadpool_lanes.length ();
for (size_t i = 0; i < len; i++)
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
index 9b8a4508213..6d1b3b72e98 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
@@ -20,8 +20,8 @@
namespace CIAO
{
- namespace Config_Handlers
- {
+ namespace Config_Handlers
+ {
class ThreadpoolWithLanesDef;
/*
@@ -33,14 +33,14 @@ namespace CIAO
{
public:
- static bool threadpool_with_lanes (
+ static bool threadpool_with_lanes (
const ThreadpoolWithLanesDef &src,
::CIAO::DAnCE::ORS_ThreadpoolWithLanes &dest);
- static ThreadpoolWithLanesDef threadpool_with_lanes (
+ static ThreadpoolWithLanesDef threadpool_with_lanes (
const ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &src);
};
- }
+ }
}
#include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
index fd2316a17d0..3def524a0bb 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
@@ -10,7 +10,7 @@ namespace CIAO
bool TP_Handler::thread_pool (const ThreadpoolDef &src,
::CIAO::DAnCE::ORS_Threadpool &dest)
{
- dest.Id = CORBA::String_var (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+ dest.Id = CORBA::String_var (src.id ().c_str ());
dest.stacksize =
static_cast <ACE_UINT32> (src.stacksize ());
@@ -48,7 +48,7 @@ namespace CIAO
if (src.Id.in () == 0)
{
- tp.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+ tp.id (src.Id.in ());
}
return tp;
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index 3ec97cab2ab..0476fddd6cc 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -7,16 +7,16 @@
#include "ciao/ServerResourcesC.h"
#include "ace/Get_Opt.h"
-#include "XML_Helper.h"
+#include "Utils/XML_Typedefs.h"
#include "tao/ORB.h"
-static const ACE_TCHAR *input_file = ACE_TEXT ("BasicSP.cdp");
+static const char *input_file = "BasicSP.cdp";
static int
-parse_args (int argc, ACE_TCHAR *argv[])
+parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:"));
+ ACE_Get_Opt get_opts (argc, argv, "i:");
int c;
@@ -53,7 +53,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
//Create an XML_Helper for all the file work
XML_Helper the_helper;
- if (xercesc::DOMDocument *doc = the_helper.create_dom (ACE_TEXT_ALWAYS_CHAR (input_file)))
+ if (xercesc::DOMDocument *doc = the_helper.create_dom (input_file))
{
//Read in the XSC type structure from the DOMDocument
ServerResourcesDef srd = ServerResources (doc);
@@ -79,7 +79,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ServerResources (*reverse_handler.srd_xsc (), the_xsc);
// write out the result
- the_helper.write_DOM (the_xsc, ACE_TEXT ("output.srd"));
+ the_helper.write_DOM (the_xsc, "output.srd");
}
std::cout << "Test completed!";
View Lorry Controller Status