ChangeLogTag: Tue Nov 25 12:10:24 2003 Dale Wilson <wilson_d@ociweb.com>

11 files changed, 64 insertions, 48 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 345e508976f..9d888ef97cc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Tue Nov 25 12:10:24 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+          fix fuzz warnings.
+
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica.idl:
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp:
+        * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp:
+          Change to PortableGroup names.
+
 Tue Nov 25 11:22:22 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/orbsvcs/FT_CORBA.idl:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 375ed19a342..10373e1c466 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -455,7 +455,7 @@ TAO::FT_ReplicationManager::get_fault_notifier (
   if (CORBA::is_nil (this->fault_notifier_.in ()))
   {
     ACE_THROW_RETURN ( FT::InterfaceNotFound () , FT::FaultNotifier::_nil ());
-  }     
+  }
   return FT::FaultNotifier::_duplicate (this->fault_notifier_.in ());
 }
 
@@ -693,9 +693,9 @@ TAO::FT_ReplicationManager::add_member (
     // our own object group collection
     // @@ TODO: if this fails, we're out of synch with the OGM
     // @@ unified object group management will fix this someday.
-    group->add_member ( 
-      the_location, 
-      member 
+    group->add_member (
+      the_location,
+      member
       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (CORBA::Object::_nil ());
     result = group->reference ();
@@ -858,9 +858,9 @@ TAO::FT_ReplicationManager::create_object (
 
   TAO::PG_Object_Group * objectGroup
     = TAO::PG_Object_Group::create (
-      this->orb_.in (), 
+      this->orb_.in (),
       obj.in (),
-      type_id, 
+      type_id,
       the_criteria
       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 979b399044f..0592eb3f38e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -58,7 +58,7 @@ TAO::PG_Object_Group::MemberInfo::~MemberInfo ()
 }
 
 TAO::PG_Object_Group::PG_Object_Group (
-  CORBA::ORB_ptr orb,  
+  CORBA::ORB_ptr orb,
   TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
   CORBA::Object_ptr empty_group,
   const PortableGroup::TagGroupTaggedComponent & tagged_component,
@@ -125,11 +125,11 @@ TAO::PG_Object_Group * TAO::PG_Object_Group::create (
   ACE_NEW_THROW_EX (
     objectGroup,
     TAO::PG_Object_Group (
-      orb, 
+      orb,
       iorm,
       empty_group,
       tagged_component,
-      type_id, 
+      type_id,
       the_criteria),
     CORBA::NO_MEMORY());
   return objectGroup;
@@ -226,8 +226,8 @@ const PortableGroup::Location & TAO::PG_Object_Group::primary_location() const
   return this->primary_location_;
 }
 
-void TAO::PG_Object_Group::add_member ( 
-    const PortableGroup::Location & the_location, 
+void TAO::PG_Object_Group::add_member (
+    const PortableGroup::Location & the_location,
     CORBA::Object_ptr member
     ACE_ENV_ARG_PARAMETER)
   ACE_THROW_SPEC ( (CORBA::SystemException,
@@ -380,7 +380,7 @@ void TAO::PG_Object_Group::remove_member (
   {
     if (this->members_.current_size() > 0)
     {
-      this->reference_ = 
+      this->reference_ =
         this->iorm_->remove_profiles (this->reference_.in (), info->member_.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 7a4c511e45c..11b9b1a0613 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -124,7 +124,7 @@ namespace TAO
       const char * type_id,
       PortableGroup::Criteria the_criteria
       ACE_ENV_ARG_DECL);
-    
+
     /// Destructor
     ~PG_Object_Group ();
 
@@ -187,14 +187,14 @@ namespace TAO
      * @param the_location the location for the new member
      * @param member_ior_string the IOR for the new memeber (expressed as a string.)
      */
-    void add_member ( 
-        const PortableGroup::Location & the_location, 
+    void add_member (
+        const PortableGroup::Location & the_location,
         CORBA::Object_ptr member
         ACE_ENV_ARG_PARAMETER)
       ACE_THROW_SPEC ( (CORBA::SystemException,
                        PortableGroup::ObjectNotAdded));
-      
-      
+
+
     int set_primary_member (
       TAO_IOP::TAO_IOR_Property * prop,
       const PortableGroup::Location & the_location
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 5372248bbab..79da867d91a 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -269,14 +269,14 @@ int FT_ReplicaFactory_i::idle (int & result)
 
 
 
-int FT_ReplicaFactory_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
+int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   int result = 0;
 
   // ugly but effective
   TAO_debug_level++;
 
-  this->orb_ = orb;
+  this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
@@ -601,8 +601,8 @@ void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * rep
 
 CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     const char * type_id,
-    const FT::Criteria & the_criteria,
-    FT::GenericFactory::FactoryCreationId_out factory_creation_id
+    const PortableGroup::Criteria & the_criteria,
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -696,7 +696,7 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name)
 }
 
 void FT_ReplicaFactory_i::delete_object (
-    const FT::GenericFactory::FactoryCreationId & factory_creation_id
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index d90cdeefcbc..ddc5b97a04d 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -113,8 +113,8 @@ public:
   // CORBA interface GenericFactory methods
   virtual CORBA::Object_ptr create_object (
     const char * type_id,
-    const FT::Criteria & the_criteria,
-    FT::GenericFactory::FactoryCreationId_out factory_creation_id
+    const PortableGroup::Criteria & the_criteria,
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
     ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((
@@ -127,7 +127,7 @@ public:
   ));
 
   virtual void delete_object (
-    const FT::GenericFactory::FactoryCreationId & factory_creation_id
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
     ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((
@@ -257,7 +257,7 @@ private:
   StringVec roles_;
 
   /**
-   * the FT::Location within the domain
+   * the PortableGroup::Location within the domain
    */
   const char * location_;
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
index ba1e71e62df..b9d41ed7429 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
@@ -96,7 +96,7 @@ module FT_TEST
     attribute long counter;
   };
 
-  interface ReplicaFactory : ::FT::GenericFactory, ::FT::PullMonitorable
+  interface ReplicaFactory : ::PortableGroup::GenericFactory, ::FT::PullMonitorable
   {
     /**
      * die a clean death.
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 5218bdfd467..7baf5ff8e75 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -287,27 +287,27 @@ int ReplicationManagerFaultConsumerAdapter::init (
         value <<= domain_id;
         encoder.add(::FT::FT_DOMAIN_ID, value);
 
-        FT::Location object_location;
+        PortableGroup::Location object_location;
         object_location.length(2);
         object_location[0].id = CORBA::string_dup("test");
         object_location[1].id = CORBA::string_dup("Location_A");
         value <<= object_location;
         encoder.add(::FT::FT_LOCATION, value);
 
-        FT::TypeId_var object_type = CORBA::string_dup (
+        PortableGroup::TypeId_var object_type = CORBA::string_dup (
           "IDL:org.omg/CosNaming/NamingContextExt:1.0");
         value <<= object_type;
         encoder.add(::FT::FT_TYPE_ID, value);
 
-        FT::ObjectGroupId group_id =
-          ACE_static_cast (FT::ObjectGroupId, 6191982);
+        PortableGroup::ObjectGroupId group_id =
+          ACE_static_cast (PortableGroup::ObjectGroupId, 6191982);
         value <<= group_id;
         encoder.add(::FT::FT_GROUP_ID, value);
 
         // allocate and populate the criteria
-        FT::Criteria_var criteria;
+        PortableGroup::Criteria_var criteria;
         ACE_NEW_NORETURN (criteria,
-          FT::Criteria);
+          PortableGroup::Criteria);
         if (criteria.ptr() == 0)
         {
           ACE_ERROR_RETURN ((
@@ -319,7 +319,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
         else
         {
           encoder.encode(criteria);
-          FT::GenericFactory::FactoryCreationId_var factory_creation_id;
+          PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
 
           this->factory_->create_object (
             type_id.in(),
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 300ca63e8c8..7513c587977 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -179,13 +179,13 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         value <<= domain_id;
         encoder.add(::FT::FT_DOMAIN_ID, value);
 
-        FT::Location object_location;
+        PortableGroup::Location object_location;
         object_location.length(1);
         object_location[0].id = CORBA::string_dup("Test location");
         value <<= object_location;
         encoder.add(::FT::FT_LOCATION, value);
 
-        FT::TypeId object_type = CORBA::string_dup("dummy_type");
+        PortableGroup::TypeId object_type = CORBA::string_dup("dummy_type");
         value <<= object_type;
         encoder.add(::FT::FT_TYPE_ID, value);
 
@@ -194,9 +194,9 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         encoder.add(::FT::FT_GROUP_ID, value);
 
         // allocate and populate the criteria
-        FT::Criteria_var criteria;
+        PortableGroup::Criteria_var criteria;
         ACE_NEW_NORETURN (criteria,
-          FT::Criteria);
+          PortableGroup::Criteria);
         if (criteria.ptr() == 0)
         {
           ACE_ERROR((LM_ERROR,
@@ -207,7 +207,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         else
         {
           encoder.encode(criteria);
-          FT::GenericFactory::FactoryCreationId_var factory_creation_id;
+          PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
 
           ACE_DEBUG((LM_DEBUG,
             "Call create_object with type: %s\n", type_id.in()
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index dcdf0e0a5fa..4254cbe73ff 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -243,24 +243,24 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         value <<= domain_id;
         encoder.add(::FT::FT_DOMAIN_ID, value);
 
-        FT::Location object_location;
+        PortableGroup::Location object_location;
         object_location.length(1);
         object_location[0].id = CORBA::string_dup("Test location");
         value <<= object_location;
         encoder.add(::FT::FT_LOCATION, value);
 
-        FT::TypeId object_type = 0;
+        PortableGroup::TypeId object_type = 0;
         value <<= object_type;
         encoder.add(::FT::FT_TYPE_ID, value);
 
-        FT::ObjectGroupId group_id = 0;
+        PortableGroup::ObjectGroupId group_id = 0;
         value <<= group_id;
         encoder.add(::FT::FT_GROUP_ID, value);
 
         // allocate and populate the criteria
-        FT::Criteria_var criteria;
+        PortableGroup::Criteria_var criteria;
         ACE_NEW_NORETURN (criteria,
-          FT::Criteria);
+          PortableGroup::Criteria);
         if (criteria.ptr() == 0)
         {
           ACE_ERROR((LM_ERROR,
@@ -271,7 +271,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         else
         {
           encoder.encode(criteria);
-          FT::GenericFactory::FactoryCreationId_var factory_creation_id;
+          PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
 
           this->factory_->create_object (
             type_id.in(),
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 35fd0954596..233474efd6b 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -171,9 +171,9 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
         encoder.add (PortableGroup::role_criterion, value);
 
         // allocate and populate the criteria
-        FT::Criteria_var criteria;
+        PortableGroup::Criteria_var criteria;
         ACE_NEW_NORETURN (criteria,
-          FT::Criteria);
+          PortableGroup::Criteria);
         if (criteria.ptr() == 0)
         {
           ACE_ERROR((LM_ERROR,
@@ -184,7 +184,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
         else
         {
           encoder.encode(criteria);
-          FT::GenericFactory::FactoryCreationId_var factory_creation_id;
+          PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
 
           info.the_factory->create_object (
             type_id,