ChangeLogTag: Tue Oct 14 11:33:13 2003 Dale Wilson <wilson_d@ociweb.com>

5 files changed, 64 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f00cf58664f..031a17570a3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Oct 14 11:33:13 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+          Add stub implementation for get_factory_registry
+
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp:
+        * orbsvcs/tests/FT_App/run_test_registry.pl:
+          fix tabs and spaces warning from previous check in
+
+        These changes were made in the oci_haft branch.
+
 Tue Oct 14 10:22:13 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/orbsvcs/FT_ReplicationManager.idl:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 44090424748..1eb0d72643f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -469,6 +469,19 @@ TAO::FT_ReplicationManager::get_fault_notifier (
   return FT::FaultNotifier::_duplicate (this->fault_notifier_.in());
 }
 
+
+/// TAO-specific find factory registry
+::PortableGroup::FactoryRegistry_ptr
+TAO::FT_ReplicationManager::get_factory_registry (
+  const PortableGroup::Criteria & selection_criteria
+  ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ::PortableGroup::FactoryRegistry_var registry = ::PortableGroup::FactoryRegistry::_nil();
+  int todo_implement_factory_registry;
+  return registry;
+}
+
 /// TAO-specific shutdown operation.
 void TAO::FT_ReplicationManager::shutdown (
   ACE_ENV_SINGLE_ARG_DECL)
@@ -793,6 +806,7 @@ TAO::FT_ReplicationManager::delete_object (
   ACE_CHECK;
 }
 
+#if 0
 // Returns a dummy IOGR for unit tests
 CORBA::Object_ptr
 TAO::FT_ReplicationManager::create_test_iogr (ACE_ENV_SINGLE_ARG_DECL)
@@ -888,6 +902,7 @@ TAO::FT_ReplicationManager::create_test_iogr (ACE_ENV_SINGLE_ARG_DECL)
 
   return this->test_iogr_._retn();
 }
+#endif
 
 int TAO::FT_ReplicationManager::readIORFile (
   const char * filename,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 07fb3e51a48..fe921137607 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -74,7 +74,7 @@ namespace TAO
    * @param orbManager our ORB -- we keep var to it.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
 
   /**
    * Prepare to exit.
@@ -120,7 +120,7 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
         FT::FaultNotifier_ptr fault_notifier
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -128,7 +128,7 @@ namespace TAO
 
     /// Implementation of TAO-specific shutdown operation.
     void shutdown_i (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -146,7 +146,7 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     virtual void register_fault_notifier (
         FT::FaultNotifier_ptr fault_notifier
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -154,16 +154,25 @@ namespace TAO
 
     /// Returns the reference of the Fault Notifier.
     virtual FT::FaultNotifier_ptr get_fault_notifier (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , FT::InterfaceNotFound
       ));
 
+    /// TAO-specific find factory registry
+    virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry (
+        const PortableGroup::Criteria & selection_criteria
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
     /// TAO-specific shutdown operation.
     virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -181,20 +190,20 @@ namespace TAO
     /// Set the default properties to be used by all object groups.
     virtual void set_default_properties (
         const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
 
     /// Get the default properties used by all object groups.
     virtual PortableGroup::Properties * get_default_properties (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Remove default properties.
     virtual void remove_default_properties (
         const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -204,7 +213,7 @@ namespace TAO
     virtual void set_type_properties (
         const char * type_id,
         const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -216,14 +225,14 @@ namespace TAO
     */
     virtual PortableGroup::Properties * get_type_properties (
         const char * type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       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::Properties & props
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -237,7 +246,7 @@ namespace TAO
     virtual void set_properties_dynamically (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::InvalidProperty,
@@ -252,7 +261,7 @@ namespace TAO
     */
     virtual PortableGroup::Properties * get_properties (
         PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -273,7 +282,7 @@ namespace TAO
         const PortableGroup::Location & the_location,
         const char * type_id,
         const PortableGroup::Criteria & the_criteria
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberAlreadyPresent,
@@ -287,7 +296,7 @@ namespace TAO
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
         CORBA::Object_ptr member
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberAlreadyPresent,
@@ -303,7 +312,7 @@ namespace TAO
     virtual PortableGroup::ObjectGroup_ptr remove_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberNotFound));
@@ -311,27 +320,27 @@ namespace TAO
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::Locations * locations_of_members (
         PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::ObjectGroups * groups_at_location (
         const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the ObjectGroupId for the given ObjectGroup.
     virtual PortableGroup::ObjectGroupId get_object_group_id (
         PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
     /// ?
     virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
         PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -341,7 +350,7 @@ namespace TAO
    */
    virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -353,7 +362,7 @@ namespace TAO
     virtual CORBA::Object_ptr get_member_ref (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & loc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberNotFound));
@@ -362,7 +371,7 @@ namespace TAO
     virtual FT::ObjectGroup_ptr set_primary_member (
         FT::ObjectGroup_ptr object_group,
         const FT::Location & the_location
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -392,7 +401,7 @@ namespace TAO
         const PortableGroup::Criteria & the_criteria,
         PortableGroup::GenericFactory::FactoryCreationId_out
           factory_creation_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::NoFactory,
                       PortableGroup::ObjectNotCreated,
@@ -409,7 +418,7 @@ namespace TAO
     virtual void delete_object (
         const PortableGroup::GenericFactory::FactoryCreationId &
           factory_creation_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectNotFound));
 
@@ -417,15 +426,6 @@ namespace TAO
 
 
     ///////////////
-    // Testing
-
-    /**
-    * Creates and returns a dummy IOGR for unit testing
-    */
-    virtual CORBA::Object_ptr create_test_iogr (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    ///////////////
     // Data Members
   private:
 
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 f9b4908b08a..2fc40b6d43c 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -108,7 +108,7 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
     // Try using the -f argument as an IOR
     ACE_TRY_NEW_ENV
     {
-      CORBA::Object_var registry_obj = this->orb_->string_to_object (this->registry_filename_  ACE_ENV_ARG_PARAMETER); 
+      CORBA::Object_var registry_obj = this->orb_->string_to_object (this->registry_filename_  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->registry_ = PortableGroup::FactoryRegistry::_narrow(registry_obj  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_registry.pl b/TAO/orbsvcs/tests/FT_App/run_test_registry.pl
index ad445a967be..845ecfd7ea4 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_registry.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_registry.pl
@@ -53,7 +53,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #   IORs into an IOGR and either write the IOGR to a file or register it with
 #   the Naming Service.]
 #
-#		The object group creator is also told to unregister all factories that create humans.
+#   The object group creator is also told to unregister all factories that create humans.
 #   ***Test: It does so using the unregister_factory_by_type method.
 #
 #   Three clients are started, one at a time.  Each client is given a reference