ChangeLogTag: Tue Nov 14 18:21:29 2000 Balachandran Natarajan <bala@cs.wustl.edu>

7 files changed, 8 insertions, 81 deletions

diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 39128d5aa0c..86b0246ce18 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -145,7 +145,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     svc_config_argc_ (0),
     svc_config_argv_ (0),
     refcount_ (1),
-    policy_factory_registry_ (this),  // @@ Should not have to pass "this!"
+    policy_factory_registry_ (),
 #if (TAO_HAS_INTERCEPTORS == 1)
     client_request_interceptors_ (),
     server_request_interceptors_ (),
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 17f11102cc7..cd58cf25b8f 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -638,18 +638,6 @@ public:
   // actually nill or not. This would be useful to accomodate new
   // enhanced definitions as defined by the service specification.
 
-  CORBA::Policy_ptr service_create_policy (CORBA::PolicyType policy,
-                                           const CORBA::Any &val,
-                                           CORBA::Environment &ACE_TRY_ENV);
-  // The create_policy () method that is delegated to the service
-  // layer. This method would call the loaded services to check
-  // whether they can create the policy object requested by the
-  // application.
-  // @@ This method should go away in favor of the policy factory
-  //    registration support provided by the Portable Interceptor
-  //    spec.
-
-
   void service_context_list (TAO_Stub *&stub,
                              IOP::ServiceContextList &service_list,
                              CORBA::Boolean retstart,
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 1645d1d01b4..b4583f371f8 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -89,36 +89,6 @@ TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj)
   return retval;
 }
 
-ACE_INLINE CORBA::Policy_ptr
-TAO_ORB_Core::service_create_policy (CORBA::PolicyType policy,
-                                     const CORBA::Any& val,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ This method should go away in favor of the policy factory
-  //    registration support provided by the Portable Interceptor
-  //    spec.
-  //        -Ossama
-
-  CORBA::Policy_ptr ret_policy = CORBA::Policy::_nil ();
-
-  // @@ We look at the services if they are loaded. But if more
-  // services offer this feature we may want to keep expanding the
-  // 'if' conditions with a check for whether a service returned a
-  // valid Policy object.
-  if (this->ft_service_.service_callback ())
-    {
-      ret_policy =
-        this->ft_service_.service_callback ()->service_create_policy (policy,
-                                                                      val,
-                                                                      ACE_TRY_ENV);
-    }
-  if (ret_policy)
-    return ret_policy;
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY),
-                    CORBA::Policy::_nil ());
-}
-
 ACE_INLINE void
 TAO_ORB_Core::service_context_list (
     TAO_Stub *&stub,
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index 87bce0e65db..9b9295ffdb3 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -3,14 +3,13 @@
 // $Id$
 
 #include "tao/PolicyFactory_Registry.h"
-#include "tao/ORB_Core.h"
+#include "tao/corbafwd.h"
 
 ACE_RCSID(tao, PolicyFactory_Registry, "$Id$")
 
 
-TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core),  // @@ Should go away (including orb_core arg)
-    factories_ ()
+TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
+  : factories_ ()
 {
 }
 
@@ -71,19 +70,9 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
     {
       /// Policy factory corresponding to given policy type does not
       /// exist in policy factory map.
-
-//       ACE_THROW_RETURN (
-//         CORBA::PolicyError (BAD_POLICY_TYPE),  // @@ Right exception?
-//         CORBA::Policy::_nil ());
-
-      // @@ This should go away once the FT team is done switching
-      //    over to policy factories.  Once that is done, uncomment
-      //    the above exception throw code.
-      // Call up the loaded services through the ORB_Core to see whether
-      // they can create the Policy object for the type we have.
-      return this->orb_core_->service_create_policy (type,
-                                                     value,
-                                                     ACE_TRY_ENV);
+      ACE_THROW_RETURN (
+                        CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),  // @@ Right exception?
+         CORBA::Policy::_nil ());
     }
 
   return policy_factory->create_policy (type,
diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h
index 6fb89653cdd..4a09690b7c1 100644
--- a/TAO/tao/PolicyFactory_Registry.h
+++ b/TAO/tao/PolicyFactory_Registry.h
@@ -51,7 +51,7 @@ public:
 
 public:
 
-  TAO_PolicyFactory_Registry (TAO_ORB_Core *orb_core);
+  TAO_PolicyFactory_Registry (void);
   ///< Constructor
 
   ~TAO_PolicyFactory_Registry (void);
@@ -75,11 +75,6 @@ public:
 
 private:
 
-  TAO_ORB_Core *orb_core_;
-  // @@ This should go away once the FT team is done switching to
-  //    policy factories.  This attribute is only meant to ease that
-  //    transition.
-
   TABLE factories_;
   ///< The table that maps policy type to policy factory.
 
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 34adee8dac7..ca75c4aef24 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -42,13 +42,6 @@ TAO_Service_Callbacks::reset_profile_flags (void)
   return;
 }
 
-CORBA::Policy_ptr
-TAO_Service_Callbacks::service_create_policy (CORBA::PolicyType /*policy */,
-                                              const CORBA::Any & /*val*/,
-                                              CORBA::Environment & /*ACE_TRY_ENV*/)
-{
-  return CORBA::Policy::_nil ();
-}
 
 void
 TAO_Service_Callbacks::service_context_list (TAO_Stub *& /*stub*/ ,
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 6149c2e9c8b..e6f0ebf6245 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -65,14 +65,6 @@ public:
   virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
   // Check whether <obj> is nil or not.
 
-  virtual CORBA::Policy_ptr service_create_policy (
-      CORBA::PolicyType policy,
-      const CORBA::Any &val,
-      CORBA::Environment &ACE_TRY_ENV);
-  // Create a CORBA::Policy object
-  // @@ This method should go away in favor of the policy factory
-  //    registration support provided by the Portable Interceptor
-  //    spec.
 
   virtual void service_context_list (TAO_Stub *&stub,
                                      IOP::ServiceContextList &service_list,