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

4 files changed, 50 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d69cc102ecb..60cc9cdabb6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed Dec  3 14:37:41 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+          Fix fuzz from last checkin.
+
+        * orbsvcs/orbsvcs/FT_CORBA.idl:
+          Revert to the version with typedefs importing PortableGroup symbols into FT.
+          This avoids problems during the merge into the main branch.
+
 Wed Dec  3 14:08:12 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index f03a7bbc5be..d5969a02e3f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -54,11 +54,11 @@ namespace TAO
   *   members and set group properties.
   *
   *  TAO::PG_Properties_Support properties_support_;
-  *   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 
+  *   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_;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 6fc54fb6c3e..760ab04740c 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -203,7 +203,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_location (
   return 0;
 }
 
-// 
+//
 //TODO: Use TAO::PG_Property_Set to get property values from properties
 // instead of all these specific "get" functions.
 //
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index e8f0b60d804..144c2290bbe 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -62,10 +62,40 @@ module FT
   exception PrimaryNotSet {};
 
 #ifdef FT_USES_PORTABLE_GROUP
-
-  /**
-   * FTObjectGroupManager Interface adds primary support to PortableGroup::ObjectGroupManager
-   */
+  /////////////////////////////////////////
+  // The following typedefs "import"
+  // definitions from the PortableGroup module
+  // definitions into the FT module.
+  // This is an interim step during the process
+  // of having FT depend on the commmon
+  // of PortableGroup module rather than defining
+  // everything itself.
+
+  // this typedef trick doesn't work for exceptions, so they must
+  // use the PortableGroup:: prefix
+  typedef PortableGroup::_TypeId _TypeId;
+  typedef PortableGroup::ObjectGroup ObjectGroup;
+  typedef PortableGroup::Name Name;
+  typedef PortableGroup::Value Value;
+  typedef PortableGroup::Property Property;
+  typedef PortableGroup::Properties Properties;
+  typedef PortableGroup::Location Location;
+  typedef PortableGroup::Locations Locations;
+  typedef PortableGroup::Criteria Criteria;
+
+  typedef PortableGroup::FactoryInfo FactoryInfo;
+  typedef PortableGroup::FactoryInfos FactoryInfos;
+  typedef PortableGroup::MembershipStyleValue MembershipStyleValue;
+
+  typedef PortableGroup::FactoriesValue FactoriesValue;
+  typedef PortableGroup::InitialNumberMembersValue InitialNumberMembersValue;
+  typedef PortableGroup::MinimumNumberMembersValue MinimumNumberMembersValue;
+  typedef PortableGroup::PropertyManager PropertyManager;
+  typedef PortableGroup::ObjectGroupManager ObjectGroupManager;
+  typedef PortableGroup::GenericFactory GenericFactory;
+
+  // Specification of FTObjectGroupManager Interface
+  // which ReplicationManager Inherits
   interface FTObjectGroupManager : PortableGroup::ObjectGroupManager {
 
     ::PortableGroup::ObjectGroup set_primary_member(in ::PortableGroup::ObjectGroup object_group,