ChangeLogTag: Wed Oct 23 10:26:59 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>

39 files changed, 297 insertions, 247 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index 45384a20aee..6053605b052 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -278,35 +278,29 @@ int be_visitor_args_arglist::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->width () == (long) sizeof (char))
+  switch (this->direction ())
     {
-      switch (this->direction ())
+    case AST_Argument::dir_IN:
+      *os << "const " << this->type_name (node);
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node) << "&";
+      break;
+    case AST_Argument::dir_OUT:
+      if (this->ctx_->alias ())
+        {
+          *os << this->type_name (node, "_out");
+        }
+      else if (node->width () == (long) sizeof (char))
         {
-        case AST_Argument::dir_IN:
-          *os << "const char *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "char *&";
-          break;
-        case AST_Argument::dir_OUT:
           *os << "CORBA::String_out";
-          break;
         }
-    }
-  else
-    {
-      switch (this->direction ())
+      else
         {
-        case AST_Argument::dir_IN:
-          *os << "const CORBA::WChar *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "CORBA::WChar *&";
-          break;
-        case AST_Argument::dir_OUT:
           *os << "CORBA::WString_out";
-          break;
         }
+
+      break;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
index 74090920d4a..264ef4290d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -61,9 +61,24 @@ be_visitor_args::type_name (be_type *node,
       bt = node;
     }
 
-  ACE_OS::sprintf (namebuf,
-                   "%s",
-                   bt->full_name ());
+  AST_Decl::NodeType nt = bt->node_type ();
+
+  if (nt == AST_Decl::NT_string)
+    {
+      ACE_OS::sprintf (namebuf,
+                       "char *");
+    }
+  else if (nt == AST_Decl::NT_wstring)
+    {
+      ACE_OS::sprintf (namebuf,
+                       "CORBA::WChar *");
+    }
+  else
+    {
+      ACE_OS::sprintf (namebuf,
+                       "%s",
+                       bt->full_name ());
+    }
 
   if (suffix)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
index 9896c17f4f9..1dec0439f88 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
@@ -48,6 +48,7 @@ int be_visitor_args_request_info_arglist::visit_argument (be_argument *node)
 
   // retrieve the type
   be_type *bt = be_type::narrow_from_decl (node->field_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -302,35 +303,25 @@ int be_visitor_args_request_info_arglist::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->width () == (long) sizeof (char))
+  switch (this->direction ())
     {
-      switch (this->direction ())
+    case AST_Argument::dir_IN:
+      *os << "const " << this->type_name (node);
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node) << "&";
+      break;
+    case AST_Argument::dir_OUT:
+      if (node->width () == (long) sizeof (char))
         {
-        case AST_Argument::dir_IN:
-          *os << "const char *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "char *&";
-          break;
-        case AST_Argument::dir_OUT:
-          *os << "CORBA::String_out";
-          break;
+          *os << "CORBA::String_out ";
         }
-    }
-  else
-    {
-      switch (this->direction ())
+      else
         {
-        case AST_Argument::dir_IN:
-          *os << "const CORBA::WChar *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "CORBA::WChar *&";
-          break;
-        case AST_Argument::dir_OUT:
-          *os << "CORBA::WString_out";
-          break;
+          *os << "CORBA::WString_out ";
         }
+
+      break;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
index 8ba93c73b82..1b3234de34e 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
@@ -298,35 +298,25 @@ int be_visitor_args_request_info_ch::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->width () == 1)
+  switch (this->direction ())
     {
-      switch (this->direction ())
+    case AST_Argument::dir_IN:
+      *os << "const " << this->type_name (node);
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node);
+      break;
+    case AST_Argument::dir_OUT:
+      if (node->width () == (long) sizeof (char))
         {
-        case AST_Argument::dir_IN:
-          *os << "const char *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "char *";
-          break;
-        case AST_Argument::dir_OUT:
           *os << "CORBA::String_out ";
-          break;
         }
-    }
-  else
-    {
-      switch (this->direction ())
+      else
         {
-        case AST_Argument::dir_IN:
-          *os << "const CORBA::WChar *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "CORBA::WChar *";
-          break;
-        case AST_Argument::dir_OUT:
           *os << "CORBA::WString_out ";
-          break;
         }
+
+      break;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
index abaf16de16d..492b744e5e6 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
@@ -253,35 +253,25 @@ int be_visitor_args_request_info_sh::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->width () == 1)
+  switch (this->direction ())
     {
-      switch (this->direction ())
+    case AST_Argument::dir_IN:
+      *os << "const " << this->type_name (node) << " &";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node) << " &";
+      break;
+    case AST_Argument::dir_OUT:
+      if (node->width () == (long) sizeof (char))
         {
-        case AST_Argument::dir_IN:
-          *os << "const char *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "char *&";
-          break;
-        case AST_Argument::dir_OUT:
           *os << "CORBA::String_out ";
-          break;
         }
-    }
-  else
-    {
-      switch (this->direction ())
+      else
         {
-        case AST_Argument::dir_IN:
-          *os << "const CORBA::WChar *";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << "CORBA::WChar *&";
-          break;
-        case AST_Argument::dir_OUT:
-          *os << "CORBA::WString_out";
-          break;
+          *os << "CORBA::WString_out ";
         }
+
+      break;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index 2692167cb45..0b13a232bcf 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -442,7 +442,7 @@ int be_visitor_args_upcall_ss::visit_sequence (be_sequence *)
   return 0;
 }
 
-int be_visitor_args_upcall_ss::visit_string (be_string *)
+int be_visitor_args_upcall_ss::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg = this->ctx_->be_node_as_argument ();
@@ -457,7 +457,24 @@ int be_visitor_args_upcall_ss::visit_string (be_string *)
         }
       else
         {
-          *os << arg->local_name () << ".in ()";
+          *os << "ACE_const_cast (const ";
+
+          be_type *bt = this->ctx_->alias ();
+
+          if (bt != 0)
+            {
+              *os << bt->name ();
+            }
+          else if (node->width () == (long) sizeof (char))
+            {
+              *os << "char *";
+            }
+          else
+            {
+              *os << "CORBA::WChar *";
+            }
+
+          *os << ", " << arg->local_name () << ".in ())";
         }
 
       break;
@@ -468,8 +485,8 @@ int be_visitor_args_upcall_ss::visit_string (be_string *)
           *os << arg->local_name ();
         }
       else
-          {
-        *os << arg->local_name () << ".inout ()";
+        {
+          *os << arg->local_name () << ".inout ()";
         }
 
       break;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index 20e17732581..0872648eae5 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -386,32 +386,20 @@ int be_visitor_args_vardecl_ss::visit_string (be_string *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg = this->ctx_->be_node_as_argument ();
 
-  switch (this->direction ())
+  if (this->ctx_->alias ())
     {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      if (node->width () == (long) sizeof (char))
-        {
-          *os << "CORBA::String_var " << arg->local_name () << ";";
-        }
-      else
-        {
-          *os << "CORBA::WString_var " << arg->local_name () << ";";
-        }
-
-      break;
-    case AST_Argument::dir_OUT:
-      if (node->width () == (long )sizeof (char))
-        {
-          *os << "CORBA::String_var " << arg->local_name () << ";";
-        }
-      else
-        {
-          *os << "CORBA::WString_var " << arg->local_name () << ";";
-        }
-
-      break;
+      *os << this->type_name (node, "_var ");
     }
+  else if (node->width () == (long) sizeof (char))
+    {
+      *os << "CORBA::String_var ";
+    }
+  else
+    {
+      *os << "CORBA::WString_var ";
+    }
+
+  *os << arg->local_name () << ";";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index c4281f40ac7..60a9e751fdb 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -382,7 +382,7 @@ int be_visitor_exception_ctor::visit_sequence (be_sequence *node)
 
 int be_visitor_exception_ctor::visit_string (be_string *node)
 {
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  TAO_OutStream *os = this->ctx_->stream ();
 
   if (node->width () == (long) sizeof (char))
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
index 1c57bdb2439..6cef9ec9397 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
@@ -176,7 +176,7 @@ be_visitor_operation_interceptors_cs::generate_class_declaration (
       *os << be_uidt;
     }
 
-  *os << ");\n" << be_uidt_nl;
+  *os << be_uidt_nl << ");" << be_uidt_nl << be_nl;
 
   // Here I still need to generate the other methods + private args.
   *os << "virtual Dynamic::ParameterList * arguments "
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp
index 6094412d1f5..be1132e777f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp
@@ -203,8 +203,13 @@ int
 be_visitor_operation_interceptors_info_rettype::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt = this->ctx_->alias ();
 
-  if (node->width () == (long) sizeof (char))
+  if (bt != 0)
+    {
+      *os << bt->name ();
+    }
+  else if (node->width () == (long) sizeof (char))
     {
       *os << "char *";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index a92df07a4c2..c0d021f7ba2 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -216,8 +216,13 @@ int
 be_visitor_operation_rettype::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt = this->ctx_->alias ();
 
-  if (node->width () == (long) sizeof (char))
+  if (bt != 0)
+    {
+      *os << bt->name ();
+    }
+  else if (node->width () == (long) sizeof (char))
     {
       *os << "char *";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
index 03c5ebe2613..aed377cc5c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
@@ -140,8 +140,13 @@ int
 be_visitor_sequence_buffer_type::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt = this->ctx_->alias ();
 
-  if (node->width () == (long) sizeof (char))
+  if (bt != 0)
+    {
+      *os << bt->name ();
+    }
+  else if (node->width () == (long) sizeof (char))
     {
       *os << "char *";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index a3d720f5608..1cae88fdac3 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -3013,15 +3013,16 @@ be_visitor_typecode_defn::compute_tc_size (be_typedef *node)
   else
     {
       if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typecode_defn::"
-                           "compute_tc_size (typedef) - "
-                           "queue insert failed\n"),
-                          -1);
-      }
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_typecode_defn::"
+                             "compute_tc_size (typedef) - "
+                             "queue insert failed\n"),
+                            -1);
+        }
 
       this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+
       if (node->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -3053,6 +3054,7 @@ be_visitor_typecode_defn::compute_encap_length (be_typedef *node)
   // add the encapsulation length of our base type
   bt = be_type::narrow_from_decl (node->base_type ());
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+
   if (!bt || bt->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -3064,7 +3066,6 @@ be_visitor_typecode_defn::compute_encap_length (be_typedef *node)
 
   this->computed_encap_len_ = encap_len + this->computed_tc_size_;
   return this->computed_encap_len_;
-
 }
 
 
@@ -3427,6 +3428,7 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
       // size of the repoID field
       this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
     }
+
   *os << "\n";
 
   return;
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
index 2340ba59374..6b679cffc12 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
@@ -104,6 +104,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node)
                              "failed to accept visitor\n"),  
                             -1);
         }
+
       this->ctx_->alias (0); // reset
     }
   else
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 4fb31825759..bdd5b71ed33 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -130,7 +130,8 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
               "Identity_Client: Requesting Object Group "
               "with id <%s>\n", group_name));
   Load_Balancer::Object_Group_var object_group =
-    factory->resolve (group_name
+    factory->resolve (ACE_const_cast (const Load_Balancer::Group_ID,
+                                      group_name)
                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index 78537a45bd4..6dd12dea7a3 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -32,7 +32,7 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_round_robin (const char * id
+Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
@@ -43,7 +43,7 @@ Object_Group_Factory_i::make_round_robin (const char * id
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_random (const char * id
+Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
@@ -55,7 +55,7 @@ Object_Group_Factory_i::make_random (const char * id
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
-                                    const char * id
+                                    const Load_Balancer::Group_ID id
                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
@@ -122,7 +122,7 @@ Object_Group_Factory_i::make_group (int random,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::resolve (const char * id
+Object_Group_Factory_i::resolve (const Load_Balancer::Group_ID id
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
@@ -256,7 +256,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
 }
 
 void
-Object_Group_i::unbind (const char * id
+Object_Group_i::unbind (const Load_Balancer::Member_ID id
                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
@@ -286,7 +286,7 @@ Object_Group_i::unbind (const char * id
 }
 
 CORBA::Object_ptr
-Object_Group_i::resolve_with_id (const char * id
+Object_Group_i::resolve_with_id (const Load_Balancer::Member_ID id
                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
@@ -458,7 +458,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RR_Object_Group::unbind (const char *id
+RR_Object_Group::unbind (const Load_Balancer::Member_ID id
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 55a649c273e..c6f786da3ab 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -58,7 +58,7 @@ public:
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
+  Load_Balancer::Object_Group_ptr make_round_robin (const Load_Balancer::Group_ID id
                                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
@@ -68,7 +68,7 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id
+  Load_Balancer::Object_Group_ptr make_random (const Load_Balancer::Group_ID id
                                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
@@ -78,7 +78,7 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id
+  Load_Balancer::Object_Group_ptr resolve (const Load_Balancer::Group_ID id
                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
@@ -115,7 +115,7 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id
+                                              const Load_Balancer::Group_ID id
                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
@@ -183,7 +183,7 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id
+  void unbind (const Load_Balancer::Member_ID id
                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
@@ -199,7 +199,7 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  CORBA::Object_ptr resolve_with_id (const char * id
+  CORBA::Object_ptr resolve_with_id (const Load_Balancer::Member_ID id
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
@@ -294,7 +294,7 @@ public:
   ~RR_Object_Group (void);
   // Destructor.
 
-  void unbind (const char * id
+  void unbind (const Load_Balancer::Member_ID id
                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index d8843235965..42fa18798b4 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -156,7 +156,8 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 #endif /*TAO_MEASURE_STATS*/
       // Remote call
       object_group =
-        factory->resolve (group_name
+        factory->resolve (ACE_const_cast (const Load_Balancer::Group_ID,
+                                          group_name)
                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 30bb0dd6831..82cc60d6e08 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -47,7 +47,7 @@ Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_round_robin (const char * id
+Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
@@ -78,7 +78,7 @@ Object_Group_Factory_i::make_round_robin (const char * id
 }
 
 void
-Object_Group_Factory_i::unbind_round_robin (const char * id
+Object_Group_Factory_i::unbind_round_robin (const Load_Balancer::Group_ID id
                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
@@ -119,7 +119,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_random (const char * id
+Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
@@ -151,7 +151,7 @@ Object_Group_Factory_i::make_random (const char * id
 
 
 void
-Object_Group_Factory_i::unbind_random (const char * id
+Object_Group_Factory_i::unbind_random (const Load_Balancer::Group_ID id
                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
@@ -192,7 +192,7 @@ Object_Group_Factory_i::unbind_random (const char * id
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
-                                    const char * id
+                                    const Load_Balancer::Group_ID id
                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
@@ -308,7 +308,7 @@ Object_Group_Factory_i::make_group (int random,
 
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::resolve (const char * id
+Object_Group_Factory_i::resolve (const Load_Balancer::Group_ID id
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
@@ -698,7 +698,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
 }
 
 void
-Object_Group_i::unbind (const char * id
+Object_Group_i::unbind (const Load_Balancer::Member_ID id
                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
@@ -752,7 +752,7 @@ Object_Group_i::unbind (const char * id
 }
 
 char *
-Object_Group_i::resolve_with_id (const char * id
+Object_Group_i::resolve_with_id (const Load_Balancer::Member_ID id
                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
@@ -948,7 +948,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RR_Object_Group::unbind (const char *id
+RR_Object_Group::unbind (const Load_Balancer::Member_ID id
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 7eff01186b3..3a413e1b40f 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -73,7 +73,7 @@ public:
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
+  Load_Balancer::Object_Group_ptr make_round_robin (const Load_Balancer::Group_ID id
                                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
@@ -83,13 +83,13 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_round_robin (const char *id
+  void unbind_round_robin (const Load_Balancer::Group_ID id
                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id
+  Load_Balancer::Object_Group_ptr make_random (const Load_Balancer::Group_ID id
                                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
@@ -99,12 +99,12 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_random (const char *id
+  void unbind_random (const Load_Balancer::Group_ID id
                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id
+  Load_Balancer::Object_Group_ptr resolve (const Load_Balancer::Group_ID id
                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
@@ -137,7 +137,7 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id
+                                              const Load_Balancer::Group_ID id
                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
@@ -229,7 +229,7 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id
+  void unbind (const Load_Balancer::Group_ID id
                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
@@ -245,7 +245,7 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  char * resolve_with_id (const char * id
+  char * resolve_with_id (const Load_Balancer::Group_ID id
                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
@@ -329,7 +329,7 @@ public:
                    PortableServer::POA_ptr poa);
   // Constructor.
 
-  void unbind (const char * id
+  void unbind (const Load_Balancer::Group_ID id
                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
@@ -337,7 +337,7 @@ public:
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_ID resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index dbc3fd4b4ff..163bfcbb0c1 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -265,8 +265,8 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED)
   // guard against the access to the list from another thread.
   // But this is omitted in this example.
 
-  Event_List_Link_var new_link (ACE_static_cast(Event_List_Link*,
-                                                new Event_List_Link_impl (e)));
+  Event_List_Link_var new_link (ACE_static_cast (Event_List_Link*,
+                                                 new Event_List_Link_impl (e)));
 
    // We need a new link to store the reference to the event e.
    // But if we'd had assigned the newly created instance directly through
@@ -295,7 +295,7 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED)
   else
     {
       last_link_cache_->attach_next_link (new_link);
-      last_link_cache_ = new_link;
+      last_link_cache_ = new_link.in ();
     }
 }
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index 8d2448ba833..559e68ecc78 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -26,7 +26,9 @@ ACE_RCSID(LifeCycle_Service, Factory_Trader, "$Id$")
 
 // This const char * is used for adding a new type to the service repository
 // the added types will be subclasses of this.
-const char * Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID = "IDL:omg.org/CosLifeCycle/GenericFactory:1.0";
+const CosTrading::ServiceTypeName 
+Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID = 
+  "IDL:omg.org/CosLifeCycle/GenericFactory:1.0";
 
 
 Factory_Trader::Factory_Trader (int debug_level)
@@ -163,7 +165,7 @@ Factory_Trader::_cxx_export (const char * name,
 
 
 CORBA::Object_ptr
-Factory_Trader::query (const char* constraint)
+Factory_Trader::query (const CosTrading::Constraint constraint)
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
index bba04656a87..9a3b3d4281e 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
@@ -38,10 +38,10 @@ public:
                     const CORBA::Object_ptr object_ptr);
   // export a specific factory
 
-  CORBA::Object_ptr query (const char* constraint);
+  CORBA::Object_ptr query (const CosTrading::Constraint constraint);
   // query for a specific factory using a constraint
 
-  static const char * GENERIC_FACTORY_INTERFACE_REPOSITORY_ID;
+  static const CosTrading::ServiceTypeName GENERIC_FACTORY_INTERFACE_REPOSITORY_ID;
 private:
   TAO_Service_Type_Repository repository_;
   TAO_Trader_Factory::TAO_TRADER *trader_ptr_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 59bb6b187fa..9b580a58294 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -67,7 +67,7 @@ class TAO_LB_ObjectReferenceFactory
    */
   //@{
   virtual CORBA::Object_ptr make_object (
-      const char * repository_id,
+      const char *repository_id,
       const PortableInterceptor::ObjectId & id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -95,7 +95,7 @@ protected:
 
   /// Retrieve the object group reference for objects with the given
   /// RepositoryId.
-  CORBA::Boolean find_object_group (const char * repository_id,
+  CORBA::Boolean find_object_group (const PortableGroup::TypeId repository_id,
                                     CORBA::ULong & index,
                                     PortableGroup::ObjectGroup_out object_group
                                     ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 482fc25f02c..d09af807b95 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -55,7 +55,7 @@ TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
 
 CORBA::Object_ptr
 TAO_PG_GenericFactory::create_object (
-    const char * type_id,
+    const PortableGroup::GroupDomainId type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
     ACE_ENV_ARG_DECL)
@@ -306,7 +306,7 @@ TAO_PG_GenericFactory::populate_object_group (
   const CORBA::ULong fcid,
   PortableGroup::ObjectGroup_ptr object_group,
   const PortableServer::ObjectId & oid,
-  const char * type_id,
+  const PortableGroup::GroupDomainId type_id,
   const PortableGroup::FactoryInfos & factory_infos,
   const PortableGroup::InitialNumberMembersValue initial_number_members,
   TAO_PG_Factory_Set & factory_set
@@ -454,7 +454,7 @@ TAO_PG_GenericFactory::get_ObjectId (
 
 void
 TAO_PG_GenericFactory::process_criteria (
-  const char * type_id,
+  const PortableGroup::GroupDomainId type_id,
   const PortableGroup::Criteria & criteria,
   PortableGroup::MembershipStyleValue & membership_style,
   PortableGroup::FactoriesValue *& factory_infos,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index d1289d2c0e4..78773e007c9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -69,7 +69,7 @@ public:
    * method to delete the object.
    */
   virtual CORBA::Object_ptr create_object (
-      const char * type_id,
+      const PortableGroup::GroupDomainId type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
         factory_creation_id
@@ -120,7 +120,7 @@ private:
          const CORBA::ULong fcid,
          PortableGroup::ObjectGroup_ptr object_group,
          const PortableServer::ObjectId & oid,
-         const char * type_id,
+         const PortableGroup::GroupDomainId type_id,
          const PortableGroup::FactoryInfos &factory_infos,
          const PortableGroup::InitialNumberMembersValue initial_number_members,
          TAO_PG_Factory_Set & factory_set
@@ -148,7 +148,7 @@ private:
    * they are the object group creation time criteria.
    */
   void process_criteria (
-    const char * type_id,
+    const PortableGroup::GroupDomainId type_id,
     const PortableGroup::Criteria & criteria,
     PortableGroup::MembershipStyleValue & membership_style,
     PortableGroup::FactoriesValue *& factory_infos,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 9267b475d6d..004e2faed34 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -46,7 +46,7 @@ PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::create_member (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     const PortableGroup::Location & /* the_location */,
-    const char * /* type_id */,
+    const PortableGroup::TypeId /* type_id */,
     const PortableGroup::Criteria & /* the_criteria */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -337,7 +337,7 @@ PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::create_object_group (
   CORBA::ULong group_id,
   const PortableServer::ObjectId &oid,
-  const char * type_id,
+  const PortableGroup::TypeId type_id,
   const PortableGroup::Criteria & the_criteria
   ACE_ENV_ARG_DECL)
 {
@@ -404,7 +404,7 @@ TAO_PG_ObjectGroupManager::destroy_object_group (
   delete group_entry;
 }
 
-char *
+PortableGroup::TypeId
 TAO_PG_ObjectGroupManager::type_id (
   PortableGroup::ObjectGroup_ptr object_group
   ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 9802a020b67..0cd0fd52fc5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -60,7 +60,7 @@ public:
   virtual PortableGroup::ObjectGroup_ptr create_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      const char * type_id,
+      const PortableGroup::TypeId type_id,
       const PortableGroup::Criteria & the_criteria
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -140,7 +140,7 @@ public:
   PortableGroup::ObjectGroup_ptr create_object_group (
     CORBA::ULong group_id,
     const PortableServer::ObjectId &oid,
-    const char * type_id,
+    const PortableGroup::TypeId type_id,
     const PortableGroup::Criteria & the_criteria
     ACE_ENV_ARG_DECL);
 
@@ -161,8 +161,8 @@ public:
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the type_id for the given object group.
-  char * type_id (PortableGroup::ObjectGroup_ptr object_group
-                  ACE_ENV_ARG_DECL);
+  PortableGroup::TypeId type_id (PortableGroup::ObjectGroup_ptr object_group
+                                 ACE_ENV_ARG_DECL);
 
   /// Return the object group associated with the given ObjectId.
   /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index 67997d65266..db39017f656 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -98,7 +98,7 @@ TAO_PG_PropertyManager::remove_default_properties (
 
 void
 TAO_PG_PropertyManager::set_type_properties (
-    const char * type_id,
+    const PortableGroup::TypeId type_id,
     const PortableGroup::Properties & overrides
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -127,7 +127,7 @@ TAO_PG_PropertyManager::set_type_properties (
 
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_type_properties (
-    const char * type_id
+    const PortableGroup::TypeId type_id
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -175,7 +175,7 @@ TAO_PG_PropertyManager::get_type_properties (
 
 void
 TAO_PG_PropertyManager::remove_type_properties (
-    const char * type_id,
+    const PortableGroup::TypeId type_id,
     const PortableGroup::Properties & props
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 7043389256d..8c6b5ca1a20 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -87,7 +87,7 @@ public:
   /// Set properties associated with a given Member type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
-      const char * type_id,
+      const PortableGroup::TypeId type_id,
       const PortableGroup::Properties & overrides
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -100,13 +100,13 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id
+      const PortableGroup::TypeId type_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
-      const char * type_id,
+      const PortableGroup::TypeId type_id,
       const PortableGroup::Properties & props
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 02ed8e5d823..abfcdcf8219 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -170,8 +170,11 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
         {
           // Resolve the name using the stringified form of the name
           factory_object =
-            this->naming_context_->resolve_str (str_name.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+            this->naming_context_->resolve_str (
+                ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                               str_name.in ())
+                ACE_ENV_ARG_PARAMETER
+              );
           ACE_TRY_CHECK_EX (InnerBlock);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -181,7 +184,8 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Narrow
       Web_Server::Iterator_Factory_var factory =
-        Web_Server::Iterator_Factory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
+        Web_Server::Iterator_Factory::_narrow (factory_object.in () 
+                                               ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (OuterBlock);
 
@@ -198,8 +202,11 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
       // Convert the stringified name back as CosNaming::Name and print
       // them out.
       CosNaming::Name *nam =
-        this->naming_context_->to_name (str_name.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->to_name (
+            ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                            str_name.in ())
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_TRY_CHECK_EX (OuterBlock);
 
       // Declare a CosNaming::Name variable and assign length to it.
@@ -223,9 +230,13 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::String_var obj_name = get_name ();
 
       CORBA::String_var url_string =
-        this->naming_context_->to_url (address.in (),
-                                       obj_name.in()
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->to_url (
+            ACE_const_cast (const CosNaming::NamingContextExt::Address,
+                            address.in ()),
+            ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                            obj_name.in ())
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_TRY_CHECK_EX (OuterBlock);
 
       if (this->view_ == 0)
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 88e2b054e22..1778ca54995 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -393,8 +393,11 @@ Client::test_delete_property (const char *property_name
     {
       CORBA::String_var property_name_var (property_name);
 
-      this->propsetdef_->delete_property (property_name_var.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+      this->propsetdef_->delete_property (
+          ACE_const_cast (CosPropertyService::PropertyName,
+                          property_name_var.in ())
+          ACE_ENV_ARG_PARAMETER
+        );
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index e4fa0e39cba..ee71d20c050 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -81,7 +81,8 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
 
           CosTrading::OfferId_var offer_id =
             reg->_cxx_export (offer_obj,
-                              TT_Info::INTERFACE_NAMES[1],
+                              ACE_const_cast (const CosTrading::ServiceTypeName,
+                                              TT_Info::INTERFACE_NAMES[1]),
                               this->props_plotters_[i]
                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -95,7 +96,8 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
-                                       TT_Info::INTERFACE_NAMES[2],
+                                       ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                       TT_Info::INTERFACE_NAMES[2]),
                                        this->props_printers_[i]
                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -109,7 +111,8 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
-                                       TT_Info::INTERFACE_NAMES[3],
+                                       ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                       TT_Info::INTERFACE_NAMES[3]),
                                        this->props_fs_[i]
                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK
@@ -178,7 +181,9 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (ACE_const_cast (const CosTrading::LinkName,
+                                                    link_name_seq[i].in ())
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (int j = 0; j < NUM_OFFERS; j++)
@@ -227,7 +232,9 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
+              this->register_->withdraw (ACE_const_cast (const CosTrading::OfferId,
+                                                         offer_id_seq[i].in ())
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -265,7 +272,9 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
+                this->register_->describe (ACE_const_cast (const CosTrading::OfferId,
+                                                           offer_id_seq[i].in ())
+                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (this->verbose_)
@@ -325,7 +334,8 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
 
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->modify (offer_id_seq[i],
+              this->register_->modify (ACE_const_cast (const CosTrading::OfferId,
+                                                       offer_id_seq[i].in ()),
                                        del_list,
                                        modify_list
                                        ACE_ENV_ARG_PARAMETER);
@@ -361,20 +371,26 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       this->register_->
-        withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
-                                   constraint
+        withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                   TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER]),
+                                   ACE_const_cast (const CosTrading::Constraint,
+                                                   constraint)
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
-        withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
-                                   constraint
+        withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                   TT_Info::INTERFACE_NAMES[TT_Info::PRINTER]),
+                                   ACE_const_cast (const CosTrading::Constraint,
+                                                   constraint)
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
-        withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
-                                   constraint
+        withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                   TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM]),
+                                   ACE_const_cast (const CosTrading::Constraint,
+                                                   constraint)
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 8e367d0f0d8..0f8ab540b42 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -83,7 +83,9 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
+        link_if->describe_link (ACE_const_cast (const CosTrading::LinkName,
+                                                link_name_seq[0u].in ())
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
@@ -181,9 +183,12 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies
           CosTrading::OfferIterator_out offer_iterator_out (offer_iterator_ptr);
           CosTrading::PolicyNameSeq_out limits_applied_out (limits_applied_ptr);
 
-          this->lookup_->query (TT_Info::QUERIES[i][0],
-                                TT_Info::QUERIES[i][1],
-                                TT_Info::QUERIES[i][2],
+          this->lookup_->query (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                TT_Info::QUERIES[i][0]),
+                                ACE_const_cast (const CosTrading::Constraint,
+                                                TT_Info::QUERIES[i][1]),
+                                ACE_const_cast (const CosTrading::Lookup::Preference,
+                                                TT_Info::QUERIES[i][2]),
                                 policies.policy_seq (),
                                 desired_props,
                                 8,
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 2a60d2a9798..bd46a35e014 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -39,7 +39,9 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER);
+          this->repos_->remove_type (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                     TT_Info::INTERFACE_NAMES[i])
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosTrading::UnknownServiceType, excp)
@@ -114,7 +116,9 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (ACE_const_cast (const CosTrading::LinkName,
+                                                    link_name_seq[i].in ())
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
@@ -161,8 +165,10 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
     {
       ACE_TRY
         {
-          repos->add_type (TT_Info::INTERFACE_NAMES[i],
-                           this->type_structs_[i].if_name,
+          repos->add_type (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                           TT_Info::INTERFACE_NAMES[i]),
+                           ACE_const_cast (const CosTradingRepos::ServiceTypeRepository::Identifier,
+                                           this->type_structs_[i].if_name.in ()),
                            this->type_structs_[i].props,
                            this->type_structs_[i].super_types
                            ACE_ENV_ARG_PARAMETER);
@@ -253,7 +259,8 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
+            this->repos_->describe_type (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                         TT_Info::INTERFACE_NAMES[i])
                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -287,7 +294,8 @@ TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
+            this->repos_->fully_describe_type (ACE_const_cast (const CosTrading::ServiceTypeName,
+                                                               TT_Info::INTERFACE_NAMES[i])
                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index c28feb6e4f3..fef5f10f4b8 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -14,7 +14,7 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
 }
 
 template <class T> CORBA::Any*
-TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
+TAO_Simple_Dynamic_Property<T>::evalDP (const CosTrading::PropertyName,
                                         CORBA::TypeCode_ptr,
                                         const CORBA::Any&
                                         ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 28cf7b442dd..8204458c646 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -32,7 +32,7 @@ public:
 
   TAO_Simple_Dynamic_Property (const T& dp);
 
-  virtual CORBA::Any* evalDP (const char* /* name */,
+  virtual CORBA::Any* evalDP (const CosTrading::PropertyName /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */
                               ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 09e993346be..55ce89f483e 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -125,15 +125,15 @@ Param_Test_i::test_unbounded_string (const char *s1,
 // the in string. For the inout, we append the same string to itself and send
 // it back
 char *
-Param_Test_i::test_bounded_string (const char *s1,
-                                   char *&s2,
-                                   CORBA::String_out s3
+Param_Test_i::test_bounded_string (const Param_Test::short_string s1,
+                                   Param_Test::short_string &s2,
+                                   Param_Test::short_string_out s3
                                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  char *retstr = CORBA::string_dup (s1);
+  Param_Test::short_string retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
-  char *tmp = CORBA::string_alloc (2*ACE_OS::strlen (s2));
+  Param_Test::short_string tmp = CORBA::string_alloc (2*ACE_OS::strlen (s2));
   ACE_OS::sprintf (tmp, "%s%s", s2, s2);
   CORBA::string_free (s2);
   s2 = tmp;
@@ -167,9 +167,9 @@ Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
 // the in string. For the inout, we append the same string to itself and send
 // it back
 CORBA::WChar *
-Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
-                                    CORBA::WChar *&ws2,
-                                    CORBA::WString_out ws3
+Param_Test_i::test_bounded_wstring (const Param_Test::short_wstring ws1,
+                                    Param_Test::short_wstring &ws2,
+                                    Param_Test::short_wstring_out ws3
                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 219f2b2c1ea..0a86f115ceb 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -81,9 +81,9 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded strings
 
-  virtual char *test_bounded_string (const char *s1,
-                                     char *&s2,
-                                     CORBA::String_out s3
+  virtual char *test_bounded_string (const Param_Test::short_string s1,
+                                     Param_Test::short_string &s2,
+                                     Param_Test::short_string_out s3
                                      ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded strings
@@ -95,9 +95,9 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded wstrings
 
-  virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1,
-                                              CORBA::WChar *&ws2,
-                                              CORBA::WString_out ws3
+  virtual CORBA::WChar *test_bounded_wstring (const Param_Test::short_wstring ws1,
+                                              Param_Test::short_wstring &ws2,
+                                              Param_Test::short_wstring_out ws3
                                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded wstrings