6 files changed, 19 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 18be60c4b3c..3eb704df89b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Feb  6 10:05:41 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/LocalObject.cpp:
+        * tao/LocalObject.h:
+        * tao/Object.cpp:
+        * tao/Object.h:
+          Removed _get_implementation, it is deprecated with CORBA 2.2 and we
+          always just return 0.
+
+        * tao/Strategies/advanced_resource.cpp:
+          Added TAO_DEFAULT_REACTOR_TYPE which is ACE_TP_Reactor by default. This
+          way we can easily change the default reactor at the moment the
+          strategies library is used.
+
 Tue Feb  5 21:59:02 UTC 2008  Simon McQueen  <sm@prismtech.com>
 
         * tao/ORB_Core.h:
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 89e80ebba17..63f482cdba2 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -138,12 +138,6 @@ CORBA::LocalObject::_get_interface (void)
 {
   throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
-
-CORBA::ImplementationDef_ptr
-CORBA::LocalObject::_get_implementation (void)
-{
-  throw ::CORBA::NO_IMPLEMENT ();
-}
 #endif
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index e87bd7e55ef..fa0a38e041d 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -71,9 +71,6 @@ namespace CORBA
     virtual CORBA::Boolean _non_existent (void);
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
-    /// Throws CORBA::NO_IMPLEMENT.
-    virtual CORBA::ImplementationDef_ptr _get_implementation (void);
-
     /// Gets info about object from the Interface Repository.
     virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 330c87079d6..90e7e73c7f9 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -498,12 +498,6 @@ CORBA::Object::_get_interface (void)
   return this->proxy_broker ()->_get_interface (this);
 }
 
-CORBA::ImplementationDef_ptr
-CORBA::Object::_get_implementation (void)
-{
-  return 0;
-}
-
 CORBA::Object_ptr
 CORBA::Object::_get_component (void)
 {
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 1976c89d79c..4d4bc2be098 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -61,9 +61,6 @@ namespace CORBA
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
 
-  class ImplementationDef;
-  typedef ImplementationDef *ImplementationDef_ptr;
-
   class Context;
   typedef Context *Context_ptr;
 
@@ -156,10 +153,6 @@ namespace CORBA
     virtual CORBA::Boolean _non_existent (void);
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
-    /// This method is deprecated in the CORBA 2.2 spec, we just return 0
-    /// every time.
-    virtual CORBA::ImplementationDef_ptr _get_implementation (void);
-
     /// Get info about the object from the Interface Repository.
     virtual InterfaceDef_ptr _get_interface (void);
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 708c4605e04..0e55594a19c 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -37,6 +37,10 @@
 
 ACE_RCSID(Strategies, advanced_resource, "$Id$")
 
+#if !defined (TAO_DEFAULT_REACTOR_TYPE)
+#define TAO_DEFAULT_REACTOR_TYPE TAO_REACTOR_TP
+#endif /* !TAO_DEFAULT_REACTOR_TYPE */
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
@@ -67,7 +71,7 @@ TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 }
 
 TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
-  : reactor_type_ (TAO_REACTOR_TP),
+  : reactor_type_ (TAO_DEFAULT_REACTOR_TYPE),
     threadqueue_type_ (TAO_THREAD_QUEUE_NOT_SET),
     cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
     amh_response_handler_allocator_lock_type_ (TAO_ALLOCATOR_THREAD_LOCK),