ChangeLogTag:Tue Oct 28 12:02:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

1 files changed, 128 insertions, 102 deletions

diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index ac490226e11..9e3c619a5fa 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -15,28 +15,33 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_POLICYS_H_
 #define _TAO_IDL_ORIG_POLICYS_H_
 
 #include /**/ "ace/pre.h"
+
 #include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Collocation_Proxy_Broker.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
-#include "tao/PortableServer/Collocated_Object.h"
-#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
-#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -50,12 +55,14 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
-TAO_NAMESPACE  POA_CORBA
+namespace POA_CORBA
 {
+  
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
   
   class Policy;
   typedef Policy *Policy_ptr;
@@ -71,6 +78,11 @@ TAO_NAMESPACE  POA_CORBA
     Policy (void);
   
   public:
+    // Useful for template programming.
+    typedef ::CORBA::Policy _stub_type;
+    typedef ::CORBA::Policy_ptr _stub_ptr_type;
+    typedef ::CORBA::Policy_var _stub_var_type;
+    
     Policy (const Policy& rhs);
     virtual ~Policy (void);
     
@@ -124,7 +136,7 @@ TAO_NAMESPACE  POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -141,7 +153,7 @@ TAO_NAMESPACE  POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -158,7 +170,7 @@ TAO_NAMESPACE  POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -173,48 +185,45 @@ TAO_NAMESPACE  POA_CORBA
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-  };  
+  };
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
+  class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
     _TAO_Policy_Strategized_Proxy_Broker (void);
     
     virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
     
-    virtual ::CORBA::_TAO_Policy_Proxy_Impl &select_proxy (
-      ::CORBA::Policy *object
-      ACE_ENV_ARG_DECL
-    );
-  
-  private:
-    // Helper methods that takes care to create the proxy
-    // as soon as their use is necessary.
-    void create_proxy (
-      int collocation_strategy
-      ACE_ENV_ARG_DECL
-    );
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
     
-    // Caches the proxy implementations. The proxy implementation
-    // are totally stateless, and those can be shared by all the
-    // instances of a given IDL interface type.
-    ::CORBA::_TAO_Policy_Proxy_Impl
-    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
     
-    TAO_SYNCH_MUTEX mutex_;
-    // This funxtion is used to get an handle to the unique instance
-    // of the Strategized Proxy Broker that is available for a given
-    // interface.
-  
-  public:
-    static _TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void);
+    static _TAO_Policy_Strategized_Proxy_Broker *
+    the_TAO_Policy_Strategized_Proxy_Broker (void);
   };
   
   //
@@ -223,65 +232,74 @@ TAO_NAMESPACE  POA_CORBA
   
   
   ///////////////////////////////////////////////////////////////////////
-  //                    ThruPOA  Impl. Declaration
+  //                    ThruPOA Proxy Impl. Declaration
   //
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl : 
-    public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
-    public virtual TAO_ThruPOA_Object_Proxy_Impl
-  {
-  public:
-    _TAO_Policy_ThruPOA_Proxy_Impl (void);
-    
-    virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual CORBA::PolicyType policy_type (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual ::CORBA::Policy_ptr copy (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void destroy (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
+  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl
+{
+public:
+  _TAO_Policy_ThruPOA_Proxy_Impl (void);
   
-  //
-  //                ThruPOA  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
+  virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
+  
+  // TAO_IDL - Generated from
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  _get_policy_type (
+      TAO_Abstract_ServantBase *servant,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  // TAO_IDL - Generated from
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  copy (
+      TAO_Abstract_ServantBase *servant,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  // TAO_IDL - Generated from
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  destroy (
+      TAO_Abstract_ServantBase *servant,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+};
+
+//
+//                ThruPOA  Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl : 
-  public virtual CORBA::_TAO_Policy_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
 {
 public:
   _TAO_Policy_Direct_Proxy_Impl (void);
@@ -289,10 +307,13 @@ public:
   virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual CORBA::PolicyType policy_type (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  _get_policy_type (
+      TAO_Abstract_ServantBase *servant,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -300,10 +321,13 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual ::CORBA::Policy_ptr copy (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  copy (
+      TAO_Abstract_ServantBase *servant,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -311,16 +335,19 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  // C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void destroy (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  destroy (
+      TAO_Abstract_ServantBase *servant,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));};
-
+    ));
+};
 
 //
 //                Direct  Proxy Impl. Declaration
@@ -329,13 +356,12 @@ public:
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
-}
-TAO_NAMESPACE_CLOSE // module CORBA
+} // module CORBA
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:946
 
 #include "PolicyS_T.h"