ChangeLogTag:Thu Sep 9 15:57:30 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

6 files changed, 19 insertions, 282 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index acaca4a4674..a26256a0f12 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,23 @@
+Thu Sep  9 15:57:30 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* tao/DLL_ORB.h:
+	* tao/DLL_ORB.inl:
+	* tao/DLL_ORB.cpp:
+
+	  Removed these files.  They have been deprecated for a few
+	  years.  See the `tests/DLL_ORB' test to get an idea of how to
+	  use DLL ORB functionality without explicitly linking the TAO
+	  library.  Thanks to Bala for the reminder.
+
+	* tao/Makefile.am (ORB_Core):
+	* tao/tao.mpc (Source_Files):
+
+	  Removed `DLL_ORB.cpp' from the source file list.
+
 Thu Sep  9 11:53:40 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_decl.cpp (version):
-        
+
           Fixed logic of method that computes the version to handle
           the case where the repository ID is set with 'typeid'
           with no valid version at the end of the string.
diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp
deleted file mode 100644
index 6873a3a5276..00000000000
--- a/TAO/tao/DLL_ORB.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/DLL_ORB.h"
-#include "tao/TAO_Singleton_Manager.h"
-#include "tao/Environment.h"
-#include "tao/debug.h"
-#include "tao/CORBA_methods.h"
-
-#include "ace/ARGV.h"
-#include "ace/Argv_Type_Converter.h"
-
-ACE_RCSID (tao,
-           DLL_ORB,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/DLL_ORB.inl"
-#endif  /* ! __ACE_INLINE__ */
-
-TAO_DLL_ORB::TAO_DLL_ORB (void)
-  : orb_ ()
-{
-  // Nothing
-}
-
-TAO_DLL_ORB::~TAO_DLL_ORB (void)
-{
-  // Nothing
-}
-
-int
-TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[])
-{
-  // This class is deprecated.  See the class documentation in
-  // DLL_ORB.h for details explaining why this is so.
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_WARNING,
-                  ACE_TEXT ("TAO (%P|%t) - The TAO_DLL_ORB class is ")
-                  ACE_TEXT ("deprecated.  See the class documentation\n")
-                  ACE_TEXT ("TAO (%P|%t) - `tao/DLL_ORB.h' for details ")
-                  ACE_TEXT ("explaining why this is so.\n")));
-    }
-
-  // Make sure TAO's singleton manager is initialized, and set to not
-  // register itself with the ACE_Object_Manager since it is under the
-  // control of the Service Configurator.
-  int register_with_object_manager = 0;
-
-  if (TAO_Singleton_Manager::instance ()->init (register_with_object_manager)
-        == -1)
-    {
-      return -1;  // No exceptions yet.
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      ACE_ARGV new_argv;
-
-      if (new_argv.add (ACE_TEXT ("dummy")) == -1
-          || new_argv.add (argv) == -1)
-        return -1;
-
-      int new_argc = new_argv.argc ();
-
-#if defined (ACE_HAS_WINCE) || defined (ACE_USES_WCHAR)
-      {
-          // Copy command line parameter from new_argv.
-          ACE_Argv_Type_Converter command_line(new_argc, new_argv.argv());
-
-          // Initialize the ORB.
-          this->orb_ = CORBA::ORB_init (command_line.get_argc(),
-                                        command_line.get_ASCII_argv(),
-                                        ""
-                                         ACE_ENV_ARG_PARAMETER);
-          // command_line will be destroyed here and new_argv will be updated if necessary
-      }
-#else
-      // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (new_argc,
-                                    new_argv.argv (),
-                                    ""
-                                     ACE_ENV_ARG_PARAMETER);
-#endif  // ACE_HAS_WINCE
-
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (this->orb_.in ()))
-        return -1;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_DLL_ORB::init");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-#if defined (ACE_HAS_THREADS)
-      // Become an Active Object so that the ORB
-      // will execute in a separate thread.
-      return this->activate ();
-#else
-      return 0;
-#endif /* ACE_HAS_THREADS */
-}
-
-int
-TAO_DLL_ORB::fini (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (TAO_Singleton_Manager::instance ()->fini () == -1)
-        return -1;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_DLL_ORB::fini");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-int
-TAO_DLL_ORB::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Run the ORB event loop in its own thread.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_DLL_ORB::svc");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-ACE_STATIC_SVC_DEFINE (TAO_DLL_ORB,
-                       ACE_TEXT ("DLL_ORB"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_DLL_ORB),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_DLL_ORB)
-
-
-
-// Template instantiations necessary for use when dynamically load the
-// TAO_DLL_ORB.
-
-#if 0
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_DLL_ORB>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_DLL_ORB>
-
-#endif
-
-#endif /*if 0*/
diff --git a/TAO/tao/DLL_ORB.h b/TAO/tao/DLL_ORB.h
deleted file mode 100644
index dc1f63b46eb..00000000000
--- a/TAO/tao/DLL_ORB.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     DLL_ORB.h
- *
- *  $Id$
- *
- *  Header file for the TAO_DLL_ORB helper class.
- *
- *
- *  @author  Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DLL_ORB_H
-#define TAO_DLL_ORB_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-
-#include "tao/ORB.h"
-/**
- * @class TAO_DLL_ORB
- *
- * @brief @e Deprecated helper class that initializes an ORB when an
- *        instance of this class is dynamically loaded.
- *
- * @deprecated This class is deprecated.  While it does demonstrate
- * how to initialize an ORB in a dynamically loaded object, the fact
- * that it is located in the TAO library forces the TAO library to be
- * linked to the application binary.  This prevents TAO from being
- * completely decoupled from an application when dynamic loading is
- * used, hence defeating the purpose of dynamically loading the
- * object!
- * @par
- * For an example of how to dynamically load an ORB (actually initialize
- * an ORB inside a dynamically loaded object) that is completely
- * decoupled from an application binary see the @c TAO/tests/DLL_ORB
- * test.
- */
-class TAO_Export TAO_DLL_ORB : public ACE_Task_Base
-{
-
-public:
-
-  /// Constructor
-  TAO_DLL_ORB (void);
-
-  /// Destructor
-  ~TAO_DLL_ORB (void);
-
-  /// Initializes ORB when dynamic linking occurs.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// Terminates ORB when dynamic unlinking occurs.
-  virtual int fini (void);
-
-  /// Run by a daemon thread to handle deferred processing.
-  virtual int svc (void);
-
-  /// Returns a duplicate reference to the ORB.
-  CORBA::ORB_ptr orb (void);
-
-private:
-
-  /// Reference to the ORB.
-  CORBA::ORB_var orb_;
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/DLL_ORB.inl"
-#endif  /* ! __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_ORB)
-ACE_FACTORY_DECLARE (TAO, TAO_DLL_ORB)
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_DLL_ORB_H */
diff --git a/TAO/tao/DLL_ORB.inl b/TAO/tao/DLL_ORB.inl
deleted file mode 100644
index b3240cf9ff9..00000000000
--- a/TAO/tao/DLL_ORB.inl
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE CORBA::ORB_ptr
-TAO_DLL_ORB::orb (void)
-{
-  return CORBA::ORB::_duplicate (this->orb_.in());
-}
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 5d4ed2e85d3..d437c48b57a 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1,3 +1,5 @@
+## $Id$
+##
 ##  Process this file with automake to create Makefile.in
 
 includedir = @includedir@/tao
@@ -58,7 +60,6 @@ ORB_Core = \
   Connection_Purging_Strategy.cpp \
   CurrentA.cpp \
   CurrentC.cpp \
-  DLL_ORB.cpp \
   DLL_Parser.cpp \
   Default_Collocation_Resolver.cpp \
   Default_Endpoint_Selector_Factory.cpp \
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 66906d8b16f..34819bd2bfd 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -230,7 +230,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       TAOA.cpp
       Object_Loader.cpp
       TAO_Singleton_Manager.cpp
-      DLL_ORB.cpp
       Adapter.cpp
       Services_Activate.cpp
       Service_Callbacks.cpp