ChangeLogTag: Wed Dec 3 14:08:12 2003 Dale Wilson <wilson_d@ociweb.com>

15 files changed, 135 insertions, 112 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dabbf38bcc1..d69cc102ecb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,28 @@
+Wed Dec  3 14:08:12 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder_Find.h:
+          Removed.  Renamed Properties_Decoder to Property_Set.
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h:
+          Added.  Renamed Properties_Decoder to Property_Set.
+
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+          Changes Properties_Decoder users to use new name.
+
 Wed Dec  3 12:57:45 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 5431b7d35c4..78c2562f218 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -20,7 +20,7 @@
 #include <tao/IORTable/IORTable.h>
 #include <tao/debug.h>
 #include <orbsvcs/PortableGroup/PG_Object_Group.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Decoder.h>
+#include <orbsvcs/PortableGroup/PG_Property_Set.h>
 #include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
 #include <orbsvcs/PortableGroup/PG_Property_Utils.h>
 #include <orbsvcs/PortableGroup/PG_conf.h>
@@ -964,7 +964,7 @@ TAO::FT_ReplicationManager::create_object (
   ////////////////////////////////
   // find the properties for this
   // type of object group
-  TAO_PG::Properties_Decoder * typeid_properties
+  TAO::PG_Property_Set * typeid_properties
     = this->properties_support_.find_typeid_properties (
       type_id
       ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 5989510fa7e..f03a7bbc5be 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -54,11 +54,12 @@ namespace TAO
   *   members and set group properties.
   *
   *  TAO::PG_Properties_Support properties_support_;
-  *   This object maintains sets of properties.  In particular it has
-  *   one default property set, and a collection of property sets indexed
-  *   by type_id.  The default property set acts as a parent to the type_id
-  *   property sets and the type_id property sets act as parents to the
-  *   property sets contained in PG_Object_Group.
+  *   This object maintains sets of properties(TAO::PG_Property_Set).  
+  *   In particular it has one default property set, and a collection of 
+  *   property sets indexed by type_id.  
+  *   The default property set acts as a parent to the type_id property 
+  *   sets and the type_id property sets act as parents to the property 
+  *   sets contained in PG_Object_Group.
   *
   *  FT::FaultNotifier_var fault_notifier_;
   *   This notification channel is "the" source of fault notifications.
@@ -320,8 +321,8 @@ namespace TAO
      * deleted by the application.  Objects created by the
      * infrastructure (replication manager) will be deleted by the
      * infrastructure.
-     * For infrastructure-controlled membership: After the member 
-     * is removed from the group the minumum number of members 
+     * For infrastructure-controlled membership: After the member
+     * is removed from the group the minumum number of members
      * parameter will be checked and new members will be created
      * as necessary (if possible.)
      */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 8e691ebb294..6fc54fb6c3e 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -204,7 +204,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_location (
 }
 
 // 
-//TODO: Use TAO_PG::Properties_Decoder to get property values from properties
+//TODO: Use TAO::PG_Property_Set to get property values from properties
 // instead of all these specific "get" functions.
 //
 
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 12f485b965d..12618b2bdea 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -14,7 +14,7 @@
 #include "Fault_Detector_i.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Decoder.h"
+#include "orbsvcs/PortableGroup/PG_Property_Set.h"
 
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
@@ -466,10 +466,10 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
   static const long timeT_per_uSec = 10L;
   static const long uSec_per_sec = 1000000L;
 
-  ::TAO_PG::Properties_Decoder decoder(property_set);
+  ::TAO::PG_Property_Set decoder(property_set);
 
   TimeBase::TimeT value = 0;
-  if( TAO_PG::find (decoder, FT::FT_FAULT_MONITORING_INTERVAL, value) )
+  if( TAO::find (decoder, FT::FT_FAULT_MONITORING_INTERVAL, value) )
   {
     // note: these should be unsigned long, but
     // ACE_Time_Value wants longs.
@@ -524,14 +524,14 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   ACE_UNUSED_ARG (type_id); //@@ use it
   InternalGuard guard (this->internals_);
 
-  ::TAO_PG::Properties_Decoder decoder (the_criteria);
+  ::TAO::PG_Property_Set decoder (the_criteria);
 
   // boolean, becomes true if a required parameter is missing
   int missingParameter = 0;
   const char * missingParameterName = 0;
 
   FT::FaultNotifier_ptr notifier;
-  if (! ::TAO_PG::find (decoder, ::FT::FT_NOTIFIER, notifier) )
+  if (! ::TAO::find (decoder, ::FT::FT_NOTIFIER, notifier) )
   {
     if (! CORBA::is_nil (this->notifier_.in ()))
     {
@@ -549,7 +549,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   }
 
   FT::PullMonitorable_ptr monitorable;
-  if (! ::TAO_PG::find (decoder, ::FT::FT_MONITORABLE, monitorable) )
+  if (! ::TAO::find (decoder, ::FT::FT_MONITORABLE, monitorable) )
   {
     ACE_ERROR ((LM_ERROR,
       "FaultDetectorFactory::create_object: Missing parameter %s\n",
@@ -562,7 +562,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   FT::FTDomainId domain_id = 0;
   // note the cast in the next line makes ANY >>= work.
   const char * domain_id_string = 0;
-  if (::TAO_PG::find (decoder, ::FT::FT_DOMAIN_ID, domain_id_string) )
+  if (::TAO::find (decoder, ::FT::FT_DOMAIN_ID, domain_id_string) )
   {
     // NOTE the assumption that we can assign a char * to a domain id
     domain_id = ACE_const_cast (char *, domain_id_string);
@@ -580,7 +580,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   }
 
   PortableGroup::Location * object_location = 0;
-  if (! ::TAO_PG::find (decoder, ::FT::FT_LOCATION, object_location) )
+  if (! ::TAO::find (decoder, ::FT::FT_LOCATION, object_location) )
   {
       object_location = & this->location_;
 
@@ -594,7 +594,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 
   PortableGroup::TypeId object_type = 0;
   const char * object_type_string;
-  if (::TAO_PG::find (decoder, ::FT::FT_TYPE_ID, object_type_string))
+  if (::TAO::find (decoder, ::FT::FT_TYPE_ID, object_type_string))
   {
     object_type = ACE_const_cast (char *, object_type_string);
   }
@@ -606,7 +606,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   }
 
   FT::ObjectGroupId group_id = 0;
-  if (! ::TAO_PG::find (decoder, ::FT::FT_GROUP_ID, group_id) )
+  if (! ::TAO::find (decoder, ::FT::FT_GROUP_ID, group_id) )
   {
     // Not required: missingParameter = 1;
   }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index fb0b6ca62dd..810f444574a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -17,10 +17,6 @@
 #include "PG_Object_Group.h"
 #include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h>
 
-//#include "PG_Properties_Encoder.h"
-//#include "PG_Properties_Decoder.h"
-
-
 ACE_RCSID (PortableGroup,
            PG_Group_Factory,
            "$Id$")
@@ -75,7 +71,7 @@ void TAO::PG_Group_Factory::init (
 TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    TAO_PG::Properties_Decoder * typeid_properties
+    TAO::PG_Property_Set * typeid_properties
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index f4990016e17..2068c254865 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -27,9 +27,9 @@
 
 //////////////////
 // Forward reference
-namespace TAO_PG
+namespace TAO
 {
-  class Properties_Decoder;
+  class PG_Property_Set;
 } // namespace TAO_PG
 
 
@@ -81,7 +81,7 @@ namespace TAO
     TAO::PG_Object_Group * create_group (
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
-        TAO_PG::Properties_Decoder * typeid_properties
+        TAO::PG_Property_Set * typeid_properties
         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::NoFactory,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 7a8d2584098..9d98700bbcc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -64,7 +64,7 @@ TAO::PG_Object_Group::PG_Object_Group (
   const PortableGroup::TagGroupTaggedComponent & tagged_component,
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
-  TAO_PG::Properties_Decoder * type_properties)
+  TAO::PG_Property_Set * type_properties)
   : internals_()
   , orb_ (CORBA::ORB::_duplicate (orb))
   , factory_registry_ (PortableGroup::FactoryRegistry::_duplicate (factory_registry))
@@ -519,7 +519,7 @@ CORBA::Object_ptr TAO::PG_Object_Group::get_member_reference (
 PortableGroup::MembershipStyleValue TAO::PG_Object_Group::get_membership_style () const
 {
   PortableGroup::MembershipStyleValue membership_style = 0;
-  if (! TAO_PG::find (properties_, PortableGroup::PG_MEMBERSHIP_STYLE, membership_style))
+  if (! TAO::find (properties_, PortableGroup::PG_MEMBERSHIP_STYLE, membership_style))
   {
     membership_style = TAO_PG_MEMBERSHIP_STYLE;
   }
@@ -530,7 +530,7 @@ PortableGroup::MembershipStyleValue TAO::PG_Object_Group::get_membership_style (
 PortableGroup::MinimumNumberMembersValue TAO::PG_Object_Group::get_minimum_number_members () const
 {
   PortableGroup::MinimumNumberMembersValue minimum_number_members = 0;
-  if (! TAO_PG::find (properties_, PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, minimum_number_members))
+  if (! TAO::find (properties_, PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, minimum_number_members))
   {
     minimum_number_members = TAO_PG_MINIMUM_NUMBER_MEMBERS;
   }
@@ -540,7 +540,7 @@ PortableGroup::MinimumNumberMembersValue TAO::PG_Object_Group::get_minimum_numbe
 PortableGroup::InitialNumberMembersValue TAO::PG_Object_Group::get_initial_number_members () const
 {
   PortableGroup::InitialNumberMembersValue initial_number_members = 0;
-  if (! TAO_PG::find (properties_, PortableGroup::PG_INITIAL_NUMBER_MEMBERS, initial_number_members))
+  if (! TAO::find (properties_, PortableGroup::PG_INITIAL_NUMBER_MEMBERS, initial_number_members))
   {
     initial_number_members = TAO_PG_INITIAL_NUMBER_MEMBERS;
   }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 31f8c2afa22..9b91b59d13b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -24,7 +24,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Properties_Decoder.h"
+#include "PG_Property_Set.h"
 
 //////////////////////////////////
 // Classes declared in this header
@@ -125,7 +125,7 @@ namespace TAO
       const PortableGroup::TagGroupTaggedComponent & tagged_component,
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
-      TAO_PG::Properties_Decoder * type_properties);
+      TAO::PG_Property_Set * type_properties);
 
 
     /// Destructor
@@ -366,7 +366,7 @@ namespace TAO
 
     // Miscellaneous properties passed to create_object when this group
     // was initially created.  To be used to create new members.
-    TAO_PG::Properties_Decoder properties_;
+    TAO::PG_Property_Set properties_;
 
     // Cached property information
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 9df10e2c48d..0cb75948b68 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -62,12 +62,12 @@ TAO::PG_Properties_Support::set_type_properties (
 {
   InternalGuard guard(this->internals_);
 
-  TAO_PG::Properties_Decoder * typeid_properties;
+  TAO::PG_Property_Set * typeid_properties;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     ACE_NEW_THROW_EX (
       typeid_properties,
-      TAO_PG::Properties_Decoder (overrides, & this->default_properties_),
+      TAO::PG_Property_Set (overrides, & this->default_properties_),
       CORBA::NO_MEMORY());
     this->properties_map_.bind (type_id, typeid_properties);
   }
@@ -87,7 +87,7 @@ TAO::PG_Properties_Support::get_type_properties (
 
   InternalGuard guard(this->internals_);
 
-  TAO_PG::Properties_Decoder * typeid_properties;
+  TAO::PG_Property_Set * typeid_properties;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     typeid_properties->export_properties (*result ACE_ENV_ARG_PARAMETER);
@@ -110,7 +110,7 @@ TAO::PG_Properties_Support::remove_type_properties (
 
   InternalGuard guard(this->internals_);
 
-  TAO_PG::Properties_Decoder * typeid_properties;
+  TAO::PG_Property_Set * typeid_properties;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     typeid_properties->remove (props ACE_ENV_ARG_PARAMETER);
@@ -119,7 +119,7 @@ TAO::PG_Properties_Support::remove_type_properties (
 }
 
 
-TAO_PG::Properties_Decoder *
+TAO::PG_Property_Set *
 TAO::PG_Properties_Support::find_typeid_properties (
     const char *type_id
     ACE_ENV_ARG_PARAMETER)
@@ -127,12 +127,12 @@ TAO::PG_Properties_Support::find_typeid_properties (
 {
   InternalGuard guard(this->internals_);
 
-  TAO_PG::Properties_Decoder * typeid_properties = 0;
+  TAO::PG_Property_Set * typeid_properties = 0;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     ACE_NEW_THROW_EX (
       typeid_properties,
-      TAO_PG::Properties_Decoder (& this->default_properties_),
+      TAO::PG_Property_Set (& this->default_properties_),
       CORBA::NO_MEMORY());
     this->properties_map_.bind (type_id, typeid_properties);
   }
@@ -144,24 +144,24 @@ TAO::PG_Properties_Support::find_typeid_properties (
 
   template class ACE_Hash_Map_Manager<
     ACE_CString,
-    ::TAO_PG::Properties_Decoder *,
+    ::TAO::PG_Property_Set *,
     TAO_SYNCH_MUTEX>;
 
   template class ACE_Hash_Map_Iterator<
     ACE_CString,
-    ::TAO_PG::Properties_Decoder *,
+    ::TAO::PG_Property_Set *,
     TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate ACE_Hash_Map_Manager<
     ACE_CString,
-    ::TAO_PG::Properties_Decoder *,
+    ::TAO::PG_Property_Set *,
     TAO_SYNCH_MUTEX>
 
 # pragma instantiate ACE_Hash_Map_Iterator<
     ACE_CString,
-    ::TAO_PG::Properties_Decoder *,
+    ::TAO::PG_Property_Set *,
     TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index bf18b3e0839..d2a27bf7ff7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -7,7 +7,7 @@
  *
  *  This file declares classes to help manage the PortableGroup::Properties
  *  It serves roughly the same purpose as PG_PropertiesManager, but takes a
- *  different approach that suits the needs of FT CORBA.  
+ *  different approach that suits the needs of FT CORBA.
  *  It would be possible to replace PG_PropertiesManager, or implement it in
  *  terms of PG_Properties_Support at some time in the future.
  *
@@ -17,21 +17,22 @@
 #ifndef TAO_PG_PROPERTIES_SUPPORT_H
 #define TAO_PG_PROPERTIES_SUPPORT_H
 
-#include "PG_Properties_Decoder.h"
+#include "PG_Property_Set.h"
 
 namespace TAO
 {
   /**
-   *  This Properties Support object manages Property Sets (that go by the name
-   *  of PG_Properties_Decoder for historical reasons.)  One set, default_properties_,
+   *  This Properties Support object manages Property Sets (TAO::PG_Property_Set).
+   *
+   *  One set, default_properties_,
    *  acts as a "global" default set of properties.
-   *  
-   *  The collection, properties_map_, contains a set of properties for each 
+   *
+   *  The collection, properties_map_, contains a set of properties for each
    *  PortableGroup::type_id.  The default set acts as a "parent" for each of
    *  these type_id sets.
    *
-   *  Expected use: When an object group is created that implements the interface 
-   *  identified by type_id, the corresponding typed_id propery set acts as a 
+   *  Expected use: When an object group is created that implements the interface
+   *  identified by type_id, the corresponding typed_id propery set acts as a
    *  parent to the Property set contained in the PG_Object_Group.
    *
    *  This heirarchy of property sets provides the correct property behavior.  A
@@ -49,11 +50,11 @@ namespace TAO
   {
     typedef ACE_Hash_Map_Manager<
       ACE_CString,
-      ::TAO_PG::Properties_Decoder *,
+      ::TAO::PG_Property_Set *,
       TAO_SYNCH_MUTEX> Properties_Map;
     typedef ACE_Hash_Map_Iterator<
       ACE_CString,
-      ::TAO_PG::Properties_Decoder *,
+      ::TAO::PG_Property_Set *,
       TAO_SYNCH_MUTEX> Properties_Map_Iterator;
 
   public:
@@ -63,7 +64,7 @@ namespace TAO
     /**
      * Update the default property set.
      *
-     * Properties that appear in props are replaced in or added to the default 
+     * Properties that appear in props are replaced in or added to the default
      * property set.  Properties that do not appear in props are unchanged.
      *
      * @param props the set of properties to update the defaults.
@@ -73,7 +74,7 @@ namespace TAO
     /**
      * Export the default properties in PortableGroup::Properties format.
      *
-     * This produces the properties in a format suitable for use across 
+     * This produces the properties in a format suitable for use across
      * a CORBA interface.
      * The caller owns the resulting Properties and must release it to avoid
      * resource leaks.
@@ -130,7 +131,7 @@ namespace TAO
      * resource leaks.
      *
      * Compare this method to find_typeid_properties which returns a pointer
-     * to the internal representation of the properties in TAO_PG::Properties_Decoder 
+     * to the internal representation of the properties in TAO::PG_Property_Set
      * format.  This is more efficient, but suitable only for internal use.
      *
      * @param type_id identifies the set of properties to be exported.
@@ -152,9 +153,9 @@ namespace TAO
      * should use the get_type_properties method.
      *
      * @param type_id identifies the set of properties to be found.
-     * @returns a pointer to a Properties_Decoder owned by this Properties_Support object.
+     * @returns a pointer to a Property_Set owned by this Properties_Support object.
      */
-    TAO_PG::Properties_Decoder *  TAO::PG_Properties_Support::find_typeid_properties (
+    TAO::PG_Property_Set *  TAO::PG_Properties_Support::find_typeid_properties (
         const char *type_id
         ACE_ENV_ARG_PARAMETER)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -184,7 +185,7 @@ namespace TAO
     typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
     /// The default property set.
-    TAO_PG::Properties_Decoder default_properties_;
+    TAO::PG_Property_Set default_properties_;
 
     /// A collection of property sets indexed by type_id.
     Properties_Map properties_map_;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index fc904d9cffe..7b49a90784d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 //=============================================================================
 /**
- *  @file    PG_Properties_Decoder.cpp
+ *  @file    PG_Property_Set.cpp
  *
  *  $Id$
  *
@@ -16,18 +16,18 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#include "PG_Properties_Decoder.h"
+#include "PG_Property_Set.h"
 
 //////////////////////
-// Properties_Decoder
+// PG_Property_Set
 
-TAO_PG::Properties_Decoder::Properties_Decoder()
+TAO::PG_Property_Set::PG_Property_Set()
   : defaults_ (0)
 {
 }
 
 
-TAO_PG::Properties_Decoder::Properties_Decoder (
+TAO::PG_Property_Set::PG_Property_Set (
   const PortableGroup::Properties & property_set
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -36,9 +36,9 @@ TAO_PG::Properties_Decoder::Properties_Decoder (
   this->decode (property_set ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_PG::Properties_Decoder::Properties_Decoder (
+TAO::PG_Property_Set::PG_Property_Set (
     const PortableGroup::Properties & property_set,
-    Properties_Decoder * defaults
+    PG_Property_Set * defaults
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (defaults)
@@ -47,18 +47,18 @@ TAO_PG::Properties_Decoder::Properties_Decoder (
 }
 
 
-TAO_PG::Properties_Decoder::Properties_Decoder (
-    Properties_Decoder * defaults)
+TAO::PG_Property_Set::PG_Property_Set (
+    PG_Property_Set * defaults)
   : defaults_ (defaults)
 {
 }
 
-TAO_PG::Properties_Decoder::~Properties_Decoder ()
+TAO::PG_Property_Set::~PG_Property_Set ()
 {
   this->clear ();
 }
 
-void TAO_PG::Properties_Decoder::decode (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL)
+void TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   InternalGuard guard(this->internals_);
@@ -97,7 +97,7 @@ void TAO_PG::Properties_Decoder::decode (const PortableGroup::Properties & prope
   }
 }
 
-void TAO_PG::Properties_Decoder::clear ()
+void TAO::PG_Property_Set::clear ()
 {
   InternalGuard guard(this->internals_);
   for (ValueMapIterator it = this->values_.begin ();
@@ -117,7 +117,7 @@ void TAO_PG::Properties_Decoder::clear ()
   this->values_.unbind_all ();
 }
 
-void TAO_PG::Properties_Decoder::remove (const PortableGroup::Properties & property_set)
+void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_set)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   InternalGuard guard(this->internals_);
@@ -145,7 +145,7 @@ void TAO_PG::Properties_Decoder::remove (const PortableGroup::Properties & prope
 
 
 
-void TAO_PG::Properties_Decoder::export_properties(PortableGroup::Properties & property_set) const
+void TAO::PG_Property_Set::export_properties(PortableGroup::Properties & property_set) const
 {
   ValueMap merged_values;
   this->merge_properties (merged_values);
@@ -175,9 +175,9 @@ void TAO_PG::Properties_Decoder::export_properties(PortableGroup::Properties & p
   ACE_ASSERT (pos == property_set.length ());
 }
 
-void TAO_PG::Properties_Decoder::merge_properties (ValueMap & merged_values) const
+void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const
 {
-  InternalGuard guard(ACE_const_cast (TAO_PG::Properties_Decoder *, this)->internals_);
+  InternalGuard guard(ACE_const_cast (TAO::PG_Property_Set *, this)->internals_);
   if (0 != this->defaults_)
   {
     this->defaults_->merge_properties (merged_values);
@@ -194,11 +194,11 @@ void TAO_PG::Properties_Decoder::merge_properties (ValueMap & merged_values) con
 
 
 
-int TAO_PG::Properties_Decoder::find (
+int TAO::PG_Property_Set::find (
   const ACE_CString & key,
   const PortableGroup::Value *& pValue) const
 {
-  InternalGuard guard(ACE_const_cast (TAO_PG::Properties_Decoder *, this)->internals_);
+  InternalGuard guard(ACE_const_cast (TAO::PG_Property_Set *, this)->internals_);
   int found = (0 == this->values_.find (key, pValue));
   if (! found)
   {
@@ -243,7 +243,7 @@ int TAO_PG::test_encode_decode ()
     encoder.encode (property_set);
   }
 
-  TAO_PG::Properties_Decoder decoder (property_set);
+  TAO::PG_Property_Set decoder (property_set);
 
   CORBA::Long longResult = 0;
   if (find (decoder, testLongKey, longResult) )
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 585ff516a86..b2220ba9f89 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 //=============================================================================
 /**
- *  @file    PG_Properties_Decoder.h
+ *  @file    PG_Property_Set.h
  *
  *  $Id$
  *
@@ -16,33 +16,33 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#ifndef TAO_PG_PROPERTIES_DECODER_H
-#define TAO_PG_PROPERTIES_DECODER_H
+#ifndef TAO_PG_PROPERTY_SET
+#define TAO_PG_PROPERTY_SET
 #include "portablegroup_export.h"
 #include <orbsvcs/PortableGroupS.h>
 #include <orbsvcs/CosNamingC.h>
 #include <ace/Hash_Map_Manager.h>
 #include <ace/SString.h>
 
-namespace TAO_PG
+namespace TAO
 {
 
   /**
-   * The Properties_Decoder captures the set of properties from a PortableGroup::Properties
+   * The PG_Property_Set captures the set of properties from a PortableGroup::Properties
    * structure in a more usable format (a hash map), and provides methods for
    * operating on these properties.
    *
    * It supports "chains" of property sets to implement default value semantics.
    * If a requested property is not found in this set, the default set(s) are searched.
    * Thus, any property found at this level overrides the defaults.
-   * 
+   *
    * See: PG_Properties_Support for more details on use of this object.
    *
-   * A Properties_Decoder may also be used for it's original purpose as a stand-alone
+   * A PG_Property_Set may also be used for it's original purpose as a stand-alone
    * helper class for extracting values from PortableGroup::Properties.
    */
 
-  class TAO_PortableGroup_Export Properties_Decoder
+  class TAO_PortableGroup_Export PG_Property_Set
   {
     typedef ACE_Hash_Map_Manager<
       ACE_CString,
@@ -58,13 +58,13 @@ namespace TAO_PG
     /**
      * constructor: empty set with no defaults.
      */
-    Properties_Decoder();
+    PG_Property_Set();
 
     /**
      * constructor
      * @param property_set the properties to be decoded
      */
-    Properties_Decoder (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL)
+    PG_Property_Set (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -72,7 +72,7 @@ namespace TAO_PG
      * @param property_set the properties to be decoded
      * @param defaults a propert set decoder that supplies default values.
      */
-    Properties_Decoder (const PortableGroup::Properties & property_set, Properties_Decoder * defaults ACE_ENV_ARG_DECL)
+    PG_Property_Set (const PortableGroup::Properties & property_set, PG_Property_Set * defaults ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -80,10 +80,10 @@ namespace TAO_PG
      * (note this is not a copy constructor)
      * @param defaults a propert set decoder that supplies default values.
      */
-    Properties_Decoder (Properties_Decoder * defaults);
+    PG_Property_Set (PG_Property_Set * defaults);
 
 
-    ~Properties_Decoder ();
+    ~PG_Property_Set ();
 
     /**
      * general purpose find. returns a pointer to an Any
@@ -137,8 +137,8 @@ namespace TAO_PG
     ////////////////////
     // Forbidden methods
   private:
-    Properties_Decoder(const Properties_Decoder & rhs);
-    Properties_Decoder & operator = (const Properties_Decoder & rhs);
+    PG_Property_Set(const PG_Property_Set & rhs);
+    PG_Property_Set & operator = (const PG_Property_Set & rhs);
 
     ///////////////
     // Data Members
@@ -155,7 +155,7 @@ namespace TAO_PG
      * these can be chained indefinitely.
      * @@ TODO: reference counted pointers would be a good idea here.
      */
-    Properties_Decoder * defaults_;
+    PG_Property_Set * defaults_;
   };
 
 #ifdef PG_PS_UNIT_TEST
@@ -168,10 +168,10 @@ namespace TAO_PG
    */
   int test_encode_decode();
 #endif // PG_PS_UNIT_TEST
-} //namespace TAO_PG
+} //namespace TAO
 
 ////////////////////////////////////
 // include templated helper function
-#include "PG_Properties_Decoder_Find.h"
+#include "PG_Property_Set_Find.h"
 
-#endif // TAO_PG_PROPERTIES_DECODER_H
+#endif // TAO_PG_PROPERTY_SET
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
index da8143a5b7e..8afe09346a2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder_Find.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 //=============================================================================
 /**
- *  @file    PG_Properties_Decoder.h
+ *  @file    PG_Property_Set.h
  *
  *  $Id$
  *
@@ -11,8 +11,8 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#ifndef TAO_PG_PROPERTIES_DECODER_FIND_H
-#define TAO_PG_PROPERTIES_DECODER_FIND_H
+#ifndef TAO_PG_PROPERTY_SET_FIND_H
+#define TAO_PG_PROPERTY_SET_FIND_H
 #include /**/ "ace/pre.h"
 #include <ace/ACE.h>
 
@@ -24,15 +24,15 @@
 
 #include "ace/Hash_Map_Manager.h"
 
-namespace TAO_PG
+namespace TAO
 {
   /**
-   * Find a value in a Properties::Properties_Decoder.
+   * Find a value in a TAO::PG_Property_Set.
    * This is a work-around for the lack of
    * templated methods.
    */
   template <typename TYPE>
-  int find (const Properties_Decoder & decoder, const ACE_CString & key, TYPE & value)
+  int find (const PG_Property_Set & decoder, const ACE_CString & key, TYPE & value)
   {
     int result = 0;
     PortableGroup::Value const * any;
@@ -43,6 +43,6 @@ namespace TAO_PG
     return result;
   }
 
-} //namespace TAO_PG
+} //namespace TAO
 
-#endif // TAO_PG_PROPERTIES_DECODER_FIND_H
+#endif // TAO_PG_PROPERTY_SET_FIND_H
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 2817f319c7a..6347e0cfdc9 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -16,7 +16,7 @@
 #include <orbsvcs/CosNamingC.h>
 #include <orbsvcs/PortableGroupC.h>
 #include <tao/PortableServer/ORB_Manager.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Decoder.h>
+#include <orbsvcs/PortableGroup/PG_Property_Set.h>
 
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
@@ -628,14 +628,14 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
   ACE_UNUSED_ARG (type_id);
   InternalGuard guard (this->internals_);
 
-  ::TAO_PG::Properties_Decoder decoder (the_criteria);
+  ::TAO::PG_Property_Set decoder (the_criteria);
 
   // boolean, becomes true if a required parameter is missing
   int missingParameter = 0;
   const char * missingParameterName = 0;
 
   CORBA::Long initialValue = 0;
-  if (! ::TAO_PG::find (decoder, criterion_initial_value, initialValue) )
+  if (! ::TAO::find (decoder, criterion_initial_value, initialValue) )
   {
     // not required.  Otherwise:
     // missingParameter = 1;
@@ -643,7 +643,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
   }
 
   const char * role = "replica";
-  if (! ::TAO_PG::find (decoder, PortableGroup::role_criterion, role) )
+  if (! ::TAO::find (decoder, PortableGroup::role_criterion, role) )
   {
     ACE_ERROR((LM_INFO,
       "Property \"%s\" not found?\n", PortableGroup::role_criterion