ChangeLogTag: Wed Aug 18 13:33:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 40 insertions, 27 deletions

diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.cpp
index 7cb8901339b..e963636cf55 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.cpp
@@ -8,7 +8,8 @@ ACE_RCSID (ORT,
            ObjectReferenceTemplate_Adapter_Factory_Impl,
            "$Id$")
 
-TAO_ObjectReferenceTemplate_Adapter_Factory_Impl::~TAO_ObjectReferenceTemplate_Adapter_Factory_Impl (void)
+TAO_ObjectReferenceTemplate_Adapter_Factory_Impl::
+  ~TAO_ObjectReferenceTemplate_Adapter_Factory_Impl (void)
 {
 }
 
@@ -17,13 +18,13 @@ TAO_ObjectReferenceTemplate_Adapter_Factory_Impl::create (
     ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ObjectReferenceTemplate_Adapter_Impl * new_objectreferencetemplate_adapter;
-  ACE_NEW_THROW_EX (new_objectreferencetemplate_adapter,
+  TAO_ObjectReferenceTemplate_Adapter_Impl * new_ort_adapter;
+  ACE_NEW_THROW_EX (new_ort_adapter,
                     TAO_ObjectReferenceTemplate_Adapter_Impl,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  return new_objectreferencetemplate_adapter;
+  return new_ort_adapter;
 }
 
 void
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.h
index b46f34fcb5a..b2d778cdfb4 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    ObjectReferenceTemplate_Adapter_Factory.h
+ *  @file    ObjectReferenceTemplate_Adapter_Factory_Impl.h
  *
  *  $Id$
  *
@@ -16,13 +16,14 @@
 
 #include /**/ "ace/pre.h"
 
+#include "ace/Service_Config.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ort_export.h"
 #include "tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h"
-#include "ace/Service_Config.h"
 
 /**
  * @class TAO_ObjectReferenceTemplate_Adapter_Factory_Impl
@@ -39,11 +40,13 @@ class TAO_ORT_Export TAO_ObjectReferenceTemplate_Adapter_Factory_Impl
 public:
   virtual ~TAO_ObjectReferenceTemplate_Adapter_Factory_Impl (void);
 
+  /// Create an adapter
   virtual TAO_ObjectReferenceTemplate_Adapter * create (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Destroy an adapter that is created by this factory
   virtual void destroy (
       TAO_ObjectReferenceTemplate_Adapter * adapter
       ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.cpp
index 9343d39138a..779690cedd5 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.cpp
@@ -16,11 +16,13 @@ ACE_RCSID (ORT,
 #endif /* ! __ACE_INLINE__ */
 
 
-TAO_ObjectReferenceTemplate_Adapter_Impl::TAO_ObjectReferenceTemplate_Adapter_Impl()
+TAO_ObjectReferenceTemplate_Adapter_Impl::
+  TAO_ObjectReferenceTemplate_Adapter_Impl()
 {
 }
 
-TAO_ObjectReferenceTemplate_Adapter_Impl::~TAO_ObjectReferenceTemplate_Adapter_Impl (void)
+TAO_ObjectReferenceTemplate_Adapter_Impl::
+  ~TAO_ObjectReferenceTemplate_Adapter_Impl (void)
 {
 }
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.h
index 040f8d4871a..b16111205f4 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.h
@@ -36,10 +36,9 @@
 class TAO_POA;
 
 /**
- * @class TAO_ObjectReferenceTemplate_Adapter
+ * @class TAO_ObjectReferenceTemplate_Adapter_Impl
  *
- * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate
- *        interface.
+ * @brief Implementation of the TAO_ObjectReferenceTemplate_Adapter
  */
 class TAO_ORT_Export TAO_ObjectReferenceTemplate_Adapter_Impl
   : public TAO_ObjectReferenceTemplate_Adapter
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 87a389315f9..fef2a36e039 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -4,12 +4,10 @@
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
 
-
 ACE_RCSID (ORT,
            ObjectReferenceTemplate_i,
            "$Id$")
 
-
 #if !defined (__ACE_INLINE__)
 # include "ObjectReferenceTemplate_i.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/ORTRework.txt b/TAO/tao/PortableServer/ORTRework.txt
index 7ab71066bfa..42f9b208eee 100644
--- a/TAO/tao/PortableServer/ORTRework.txt
+++ b/TAO/tao/PortableServer/ORTRework.txt
@@ -1,3 +1,11 @@
+Wed Aug 18 13:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.h:
+          Removed some unneeded friends but had to make invoke_key_to_object
+          public because we now need it from the ORT library, friend doesn't
+          work anymore because it moved to a default servant we don't know
+          anything about in this library, any other ideas?
+
 Wed Aug 18 12:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/IORInterceptor/IORInterceptor.pidl:
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.cpp
index 4bf34ef5aec..544d512b6e7 100755
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.cpp
@@ -3,8 +3,9 @@
 #include "tao/PortableServer/ObjectReferenceTemplate_Adapter.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(tao, ObjectReferenceTemplate_Adapter, "$Id$")
-
+ACE_RCSID(PortableServer,
+          ObjectReferenceTemplate_Adapter,
+          "$Id$")
 
 TAO_ObjectReferenceTemplate_Adapter::~TAO_ObjectReferenceTemplate_Adapter (void)
 {
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h
index f388ed026e0..5564e9d9136 100755
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h
@@ -47,7 +47,8 @@ namespace PortableInterceptor
  * Class that offers an interface to the POA to load and manipulate
  * ORT library.
  */
-class TAO_PortableServer_Export TAO_ObjectReferenceTemplate_Adapter : public ACE_Service_Object
+class TAO_PortableServer_Export TAO_ObjectReferenceTemplate_Adapter
+  : public ACE_Service_Object
 {
 public:
 
@@ -62,8 +63,9 @@ public:
                         ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Set a different ort_factory to be used.
-  virtual int set_obj_ref_factory (PortableInterceptor::ObjectReferenceFactory *current_factory
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+  virtual int set_obj_ref_factory (
+      PortableInterceptor::ObjectReferenceFactory *current_factory
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Set the underlying POA pointer.
   /**
@@ -76,10 +78,12 @@ public:
   virtual void poa (TAO_POA * poa) = 0;
 
   /// Accessor methods to ObjectReferenceTemplate template
-  virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void) = 0;
+  virtual PortableInterceptor::ObjectReferenceTemplate *
+      get_adapter_template (void) = 0;
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  virtual PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void) = 0;
+  virtual PortableInterceptor::ObjectReferenceFactory *
+      get_obj_ref_factory (void) = 0;
 
   /**
    * @name PortableInterceptor::ObjectReferenceFactory Methods
@@ -99,7 +103,8 @@ public:
 };
 
 typedef
-ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> TAO_ObjectReferenceTemplate_Array;
+ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*>
+    TAO_ObjectReferenceTemplate_Array;
 
 #include /**/ "ace/post.h"
 #endif /* TAO_OBJECTREFERENCETEMPLATE_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 9d45d1db9a1..258f9cc11f6 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -160,7 +160,6 @@ public:
   friend class TAO_POA_Current_Impl;
   friend class TAO_POA_Manager;
   friend class TAO_RT_Collocation_Resolver;
-  friend class TAO_ObjectReferenceTemplate_Adapter_Factory;
 
   typedef ACE_CString String;
 
@@ -555,6 +554,8 @@ public:
 
   static const char *objectreferencetemplate_adapter_factory_name (void);
 
+  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
+
 protected:
 
   /// Template method for creating new POA's of this type.
@@ -667,11 +668,6 @@ protected:
   //@}
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-// @johnny hacke
-public:
-  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
   /// Wrapper for the ORB's key_to_object that will alter the object pointer
   /// if the ImplRepo is used.
   CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,