14 files changed, 0 insertions, 1289 deletions

diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
deleted file mode 100755
index f28ded4c372..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-// $Id$
-
-#include "Basic_Config_Manager.h"
-#include "ciao/CIAO_common.h"
-#include "ace/SString.h"
-#include "tao/SystemException.h"
-#include "tao/DiffServPolicy/DiffServPolicy.h"
-#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
-#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
-
-namespace CIAO
-{
-  namespace Deployment
-  {
-    void
-    Basic_Config_Manager::init (CORBA::ORB_ptr orb)
-    {
-      this->orb_ = CORBA::ORB::_duplicate (orb);
-    }
-
-    int
-    Basic_Config_Manager::pre_orb_initialize (void)
-    {
-      return 0;
-    }
-
-    int
-    Basic_Config_Manager::post_orb_initialize (CORBA::ORB_ptr)
-    {
-      return 0;
-    }
-
-    void
-    Basic_Config_Manager::init_resources
-    (const ServerResource &server_resource)
-    {
-      CIAO_DEBUG ((LM_DEBUG,"Basic_Config_Manager::init_resources\n"));
-
-      if (CORBA::is_nil (this->orb_.in()))
-        {
-          CIAO_ERROR ((LM_ERROR,
-                      "Basic_Config_Manager has not been properly initialized\n"));
-          throw CORBA::INTERNAL ();
-        }
-
-      const PolicySets &sets = server_resource.orb_config.policy_set;
-      for (CORBA::ULong i = 0; i < sets.length (); ++i)
-        {
-          CORBA::ULong np = sets[i].policies.length ();
-          if (np == 0)
-            continue;
-
-          CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np);
-          policy_list->length (np);
-          CORBA::ULong index = 0;
-          CORBA::ULong array_index = np;
-
-          // Create a list of policies
-          for (CORBA::ULong pc = 0; pc < np; ++pc)
-            {
-              CORBA::Policy_var temp_policy =
-                this->create_single_policy (sets[i].policies[pc]);
-
-              if (CORBA::is_nil (temp_policy.in ()))
-                {
-                  array_index = array_index - 1;
-                  policy_list->length (array_index);
-                }
-              else
-                {
-                  policy_list[index] = temp_policy;
-                  index = index + 1;
-                }
-            }
-
-          // Bind the policy list to the name.  The bind operation should
-          // surrender the ownership of the newly created PolicyList
-          // sequence to the map.
-          if (array_index != 0)
-            {
-              if (this->policy_map_.bind (sets[i].Id.in (),
-                                          policy_list) != 0)
-                {
-                  CIAO_ERROR ((LM_ERROR,
-                              "Error binding Policy_Set with name: %C\n",
-                              sets[i].Id.in ()));
-                  throw CORBA::INTERNAL ();
-                }
-              else
-                {
-                  CIAO_DEBUG ((LM_DEBUG,
-                              "Basic_Config_Manager::init_resource"
-                              " added policy set : %C with %d policies\n",
-                              sets[i].Id.in (), array_index));
-                }
-            }
-          else
-            {
-              CIAO_DEBUG ((LM_DEBUG,
-                          "Basic_Config_Manager::init_resource"
-                          " added policy set : %C with %d policies\n",
-                          sets[i].Id.in (), array_index));
-            }
-        }
-    }
-
-    bool
-    Basic_Config_Manager::policy_exists (const char *name)
-    {
-      if (name == 0)
-        {
-          CIAO_ERROR ((LM_ERROR,
-                      "Invalid name string found in "
-                      "Basic_Config_Manager::policy_exists\n"));
-          throw CORBA::INTERNAL ();
-        }
-
-      POLICY_MAP::ENTRY *entry = 0;
-
-      if (this->policy_map_.find (name, entry) != 0)
-        {
-          return false;
-        }
-
-      return true;
-    }
-
-    CORBA::PolicyList *
-    Basic_Config_Manager::find_policies_by_name (const char *name)
-    {
-      if (name == 0)
-        {
-          CIAO_DEBUG ((LM_DEBUG,
-                      "Invalid name string found in find_policies_by_name\n"));
-          throw CORBA::INTERNAL ();
-        }
-
-      POLICY_MAP::ENTRY *entry = 0;
-
-      CORBA::PolicyList_var retv;
-
-      if (this->policy_map_.find (name, entry) != 0)
-        {
-          CIAO_DEBUG ((LM_DEBUG,
-          "Unable to find a PolicyList named %C\n",
-                      name));
-          retv = 0;
-        }
-      else
-        {
-          retv = new CORBA::PolicyList (entry->int_id_.in ());
-        }
-      return retv._retn ();
-    }
-
-    CORBA::Policy_ptr
-    Basic_Config_Manager::create_single_policy
-    (const PolicyDef &policy_def)
-    {
-      CORBA::Policy_var retv;
-
-      switch (policy_def._d ())
-        {
-        case TAO::NETWORK_PRIORITY_TYPE:
-          {
-            const NWPriorityModelPolicyDef &nw_tmp
-              = policy_def.NWPriorityModelDef ();
-            retv = this->orb_->_create_policy (TAO::NETWORK_PRIORITY_TYPE);
-
-            TAO::NetworkPriorityPolicy_var nw_priority =
-              TAO::NetworkPriorityPolicy::_narrow (retv.in ());
-
-            nw_priority->network_priority_model (
-                                                 (TAO::NetworkPriorityModel) nw_tmp.nw_priority_model);
-
-            nw_priority->request_diffserv_codepoint (
-                                                     (TAO::DiffservCodepoint)  nw_tmp.request_dscp);
-
-            nw_priority->reply_diffserv_codepoint (
-                                                   (TAO::DiffservCodepoint)  nw_tmp.reply_dscp);
-
-            retv = nw_priority._retn ();
-
-            if (! CORBA::is_nil (retv.in ()))
-              CIAO_DEBUG ((LM_DEBUG,
-                          "NAConfigManager::Create NetworkPriority policy: %d\n",
-                          nw_tmp.nw_priority_model));
-          }
-          break;
-
-        case TAO::CLIENT_NETWORK_PRIORITY_TYPE:
-          {
-            const CNWPriorityModelPolicyDef &cnw_tmp
-              = policy_def.CNWPriorityModelDef ();
-            retv = this->orb_->_create_policy (TAO::CLIENT_NETWORK_PRIORITY_TYPE);
-
-            TAO::NetworkPriorityPolicy_var cnw_priority =
-              TAO::NetworkPriorityPolicy::_narrow (retv.in ());
-
-            cnw_priority->request_diffserv_codepoint (
-                                                      (TAO::DiffservCodepoint) cnw_tmp.request_dscp);
-
-            cnw_priority->reply_diffserv_codepoint (
-                                                    (TAO::DiffservCodepoint) cnw_tmp.reply_dscp);
-
-            retv = cnw_priority._retn ();
-
-            if (! CORBA::is_nil (retv.in ()))
-              CIAO_DEBUG ((LM_DEBUG,
-                          "NAConfigManager::Create NetworkPriority policy\n"));
-          }
-          break;
-
-        default:
-          retv = 0;
-        }
-
-      return retv._retn ();
-    }
-
-  }
-}
-
-using CIAO::Deployment::Config_Manager;
-using CIAO::Deployment::Basic_Config_Manager;
-
-extern "C" Basic_Config_Manager_Export Config_Manager *create_basic_config_manager (void);
-
-extern "C"
-{
-  Config_Manager *
-  create_basic_config_manager (void)
-  {
-    Basic_Config_Manager *config;
-    ACE_NEW_RETURN (config, Basic_Config_Manager, 0);
-    return config;
-  }
-}
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h
deleted file mode 100755
index 2a610f0b937..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Basic_Config_Manager.h
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-
-#ifndef CIAO_NACONFIG_MANAGER_H
-#define CIAO_NACONFIG_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Null_Mutex.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "ciao/ComponentServer/CIAO_ServerResourcesC.h"
-
-#include "Config_Manager.h"
-#include "Basic_Config_Manager_export.h"
-
-namespace CIAO
-{
-  namespace Deployment
-  {
-    /**
-     */
-    class Basic_Config_Manager_Export Basic_Config_Manager
-      : public Config_Manager
-    {
-    public:
-      virtual ~Basic_Config_Manager (void) {}
-
-      virtual int pre_orb_initialize (void);
-
-      virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
-      virtual void init (CORBA::ORB_ptr orb);
-
-      /// Initializing the NAResource_Config_Manager
-      virtual void init_resources (const ServerResource &info);
-
-      /// Query a policy set by name
-      virtual CORBA::PolicyList *find_policies_by_name (const char *name);
-
-      virtual bool policy_exists (const char *name);
-
-    private:
-      /// Cached an ORB reference.
-      CORBA::ORB_var orb_;
-
-      CORBA::Policy_ptr create_single_policy (const PolicyDef &policy_def);
-
-      /// Hash_Map stuff.
-      typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-        CORBA::PolicyList_var,
-        ACE_Hash<ACE_CString>,
-        ACE_Equal_To<ACE_CString>,
-        ACE_Null_Mutex> POLICY_MAP;
-
-        /// Internal TP names to id map.
-        POLICY_MAP policy_map_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_NACONFIG_MANAGER_H */
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.inl b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.inl
deleted file mode 100755
index 67203a91ff8..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.inl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-ACE_INLINE
-CIAO::NAResource_Config_Manager::NAResource_Config_Manager ()
-{
-}
-
-ACE_INLINE
-CIAO::NAResource_Config_Manager::~NAResource_Config_Manager ()
-{
-}
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager_export.h b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager_export.h
deleted file mode 100644
index 51cb9778168..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl Basic_Config_Manager
-// ------------------------------
-#ifndef BASIC_CONFIG_MANAGER_EXPORT_H
-#define BASIC_CONFIG_MANAGER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_CONFIG_MANAGER_HAS_DLL)
-#  define BASIC_CONFIG_MANAGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && BASIC_CONFIG_MANAGER_HAS_DLL */
-
-#if !defined (BASIC_CONFIG_MANAGER_HAS_DLL)
-#  define BASIC_CONFIG_MANAGER_HAS_DLL 1
-#endif /* ! BASIC_CONFIG_MANAGER_HAS_DLL */
-
-#if defined (BASIC_CONFIG_MANAGER_HAS_DLL) && (BASIC_CONFIG_MANAGER_HAS_DLL == 1)
-#  if defined (BASIC_CONFIG_MANAGER_BUILD_DLL)
-#    define Basic_Config_Manager_Export ACE_Proper_Export_Flag
-#    define BASIC_CONFIG_MANAGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define BASIC_CONFIG_MANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* BASIC_CONFIG_MANAGER_BUILD_DLL */
-#    define Basic_Config_Manager_Export ACE_Proper_Import_Flag
-#    define BASIC_CONFIG_MANAGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define BASIC_CONFIG_MANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* BASIC_CONFIG_MANAGER_BUILD_DLL */
-#else /* BASIC_CONFIG_MANAGER_HAS_DLL == 1 */
-#  define Basic_Config_Manager_Export
-#  define BASIC_CONFIG_MANAGER_SINGLETON_DECLARATION(T)
-#  define BASIC_CONFIG_MANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* BASIC_CONFIG_MANAGER_HAS_DLL == 1 */
-
-// Set BASIC_CONFIG_MANAGER_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (BASIC_CONFIG_MANAGER_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define BASIC_CONFIG_MANAGER_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define BASIC_CONFIG_MANAGER_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !BASIC_CONFIG_MANAGER_NTRACE */
-
-#if (BASIC_CONFIG_MANAGER_NTRACE == 1)
-#  define BASIC_CONFIG_MANAGER_TRACE(X)
-#else /* (BASIC_CONFIG_MANAGER_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define BASIC_CONFIG_MANAGER_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (BASIC_CONFIG_MANAGER_NTRACE == 1) */
-
-#endif /* BASIC_CONFIG_MANAGER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Configurator_export.h b/CIAO/ciao/ComponentServer/Configurators/Basic_Configurator_export.h
deleted file mode 100644
index 098b4c87f0d..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Configurator_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl Basic_Configurator
-// ------------------------------
-#ifndef BASIC_CONFIGURATOR_EXPORT_H
-#define BASIC_CONFIGURATOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_CONFIGURATOR_HAS_DLL)
-#  define BASIC_CONFIGURATOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && BASIC_CONFIGURATOR_HAS_DLL */
-
-#if !defined (BASIC_CONFIGURATOR_HAS_DLL)
-#  define BASIC_CONFIGURATOR_HAS_DLL 1
-#endif /* ! BASIC_CONFIGURATOR_HAS_DLL */
-
-#if defined (BASIC_CONFIGURATOR_HAS_DLL) && (BASIC_CONFIGURATOR_HAS_DLL == 1)
-#  if defined (BASIC_CONFIGURATOR_BUILD_DLL)
-#    define Basic_Configurator_Export ACE_Proper_Export_Flag
-#    define BASIC_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define BASIC_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* BASIC_CONFIGURATOR_BUILD_DLL */
-#    define Basic_Configurator_Export ACE_Proper_Import_Flag
-#    define BASIC_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define BASIC_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* BASIC_CONFIGURATOR_BUILD_DLL */
-#else /* BASIC_CONFIGURATOR_HAS_DLL == 1 */
-#  define Basic_Configurator_Export
-#  define BASIC_CONFIGURATOR_SINGLETON_DECLARATION(T)
-#  define BASIC_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* BASIC_CONFIGURATOR_HAS_DLL == 1 */
-
-// Set BASIC_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (BASIC_CONFIGURATOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define BASIC_CONFIGURATOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define BASIC_CONFIGURATOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !BASIC_CONFIGURATOR_NTRACE */
-
-#if (BASIC_CONFIGURATOR_NTRACE == 1)
-#  define BASIC_CONFIGURATOR_TRACE(X)
-#else /* (BASIC_CONFIGURATOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define BASIC_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (BASIC_CONFIGURATOR_NTRACE == 1) */
-
-#endif /* BASIC_CONFIGURATOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ciao/ComponentServer/Configurators/ComponentServer_Configurator_export.h b/CIAO/ciao/ComponentServer/Configurators/ComponentServer_Configurator_export.h
deleted file mode 100644
index 9793cd0ed44..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/ComponentServer_Configurator_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ComponentServer_Configurator
-// ------------------------------
-#ifndef COMPONENTSERVER_CONFIGURATOR_EXPORT_H
-#define COMPONENTSERVER_CONFIGURATOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (COMPONENTSERVER_CONFIGURATOR_HAS_DLL)
-#  define COMPONENTSERVER_CONFIGURATOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && COMPONENTSERVER_CONFIGURATOR_HAS_DLL */
-
-#if !defined (COMPONENTSERVER_CONFIGURATOR_HAS_DLL)
-#  define COMPONENTSERVER_CONFIGURATOR_HAS_DLL 1
-#endif /* ! COMPONENTSERVER_CONFIGURATOR_HAS_DLL */
-
-#if defined (COMPONENTSERVER_CONFIGURATOR_HAS_DLL) && (COMPONENTSERVER_CONFIGURATOR_HAS_DLL == 1)
-#  if defined (COMPONENTSERVER_CONFIGURATOR_BUILD_DLL)
-#    define ComponentServer_Configurator_Export ACE_Proper_Export_Flag
-#    define COMPONENTSERVER_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define COMPONENTSERVER_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* COMPONENTSERVER_CONFIGURATOR_BUILD_DLL */
-#    define ComponentServer_Configurator_Export ACE_Proper_Import_Flag
-#    define COMPONENTSERVER_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define COMPONENTSERVER_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* COMPONENTSERVER_CONFIGURATOR_BUILD_DLL */
-#else /* COMPONENTSERVER_CONFIGURATOR_HAS_DLL == 1 */
-#  define ComponentServer_Configurator_Export
-#  define COMPONENTSERVER_CONFIGURATOR_SINGLETON_DECLARATION(T)
-#  define COMPONENTSERVER_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* COMPONENTSERVER_CONFIGURATOR_HAS_DLL == 1 */
-
-// Set COMPONENTSERVER_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (COMPONENTSERVER_CONFIGURATOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define COMPONENTSERVER_CONFIGURATOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define COMPONENTSERVER_CONFIGURATOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !COMPONENTSERVER_CONFIGURATOR_NTRACE */
-
-#if (COMPONENTSERVER_CONFIGURATOR_NTRACE == 1)
-#  define COMPONENTSERVER_CONFIGURATOR_TRACE(X)
-#else /* (COMPONENTSERVER_CONFIGURATOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define COMPONENTSERVER_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (COMPONENTSERVER_CONFIGURATOR_NTRACE == 1) */
-
-#endif /* COMPONENTSERVER_CONFIGURATOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp b/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp
deleted file mode 100644
index bfab13b286d..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-#include "Config_Manager.h"
-
-namespace CIAO
-{
-  namespace Deployment
-  {
-    Config_Manager::~Config_Manager (void)
-    {
-    }
-  }
-}
diff --git a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h b/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h
deleted file mode 100755
index 762f605a8c4..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Config_Manager.h
- *
- *  $Id$
- */
-//=============================================================================
-
-#ifndef CIAO_CONFIG_MANAGER_H
-#define CIAO_CONFIG_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ciao/ComponentServer/CIAO_ServerResourcesC.h"
-
-namespace CIAO
-{
-  namespace Deployment
-  {
-    /**
-     */
-    class Config_Manager
-    {
-    public:
-      virtual ~Config_Manager (void) {};
-
-      virtual int pre_orb_initialize (void) = 0;
-
-      virtual int post_orb_initialize (CORBA::ORB_ptr o) = 0;
-
-      virtual void init_resources (const ServerResource &info) = 0;
-
-      virtual void init (CORBA::ORB_ptr orb) = 0;
-
-      virtual CORBA::PolicyList *find_policies_by_name (const char *name)= 0;
-
-      virtual bool policy_exists (const char *name) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_MANAGER_H */
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc b/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc
deleted file mode 100644
index de17a603bc6..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-project(CIAO_Basic_Configurator) : ccm_stub, ciao_componentserver_stub, ciao_lib {
-  dynamicflags += COMPONENTSERVER_CONFIGURATOR_BUILD_DLL
-  Source_Files {
-    Server_Configurator.cpp
-  }
-  Header_Files {
-    Server_Configurator.h
-  }
-}
-
-project(CIAO_Basic_Config_Manager) : ciao_lib, ciao_config_manager, ciao_componentserver_stub, \
-      diffservpolicy {
-  dynamicflags += BASIC_CONFIG_MANAGER_BUILD_DLL
-  Source_Files {
-    Basic_Config_Manager.cpp
-  }
-  Header_Files {
-    Basic_Config_Manager.h
-  }
-}
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/NA_Configurator_Export.h b/CIAO/ciao/ComponentServer/Configurators/NA_Configurator_Export.h
deleted file mode 100755
index 2e30fd59cc1..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/NA_Configurator_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_NA_Configurator
-// ------------------------------
-#ifndef CIAO_NA_CONFIGURATOR_EXPORT_H
-#define CIAO_NA_CONFIGURATOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_NA_CONFIGURATOR_HAS_DLL)
-#  define CIAO_NA_CONFIGURATOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAO_NA_CONFIGURATOR_HAS_DLL */
-
-#if !defined (CIAO_NA_CONFIGURATOR_HAS_DLL)
-#  define CIAO_NA_CONFIGURATOR_HAS_DLL 1
-#endif /* ! CIAO_NA_CONFIGURATOR_HAS_DLL */
-
-#if defined (CIAO_NA_CONFIGURATOR_HAS_DLL) && (CIAO_NA_CONFIGURATOR_HAS_DLL == 1)
-#  if defined (CIAO_NA_CONFIGURATOR_BUILD_DLL)
-#    define CIAO_NA_Configurator_Export ACE_Proper_Export_Flag
-#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_NA_CONFIGURATOR_BUILD_DLL */
-#    define CIAO_NA_Configurator_Export ACE_Proper_Import_Flag
-#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_NA_CONFIGURATOR_BUILD_DLL */
-#else /* CIAO_NA_CONFIGURATOR_HAS_DLL == 1 */
-#  define CIAO_NA_Configurator_Export
-#  define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARATION(T)
-#  define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_NA_CONFIGURATOR_HAS_DLL == 1 */
-
-// Set CIAO_NA_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_NA_CONFIGURATOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_NA_CONFIGURATOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_NA_CONFIGURATOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_NA_CONFIGURATOR_NTRACE */
-
-#if (CIAO_NA_CONFIGURATOR_NTRACE == 1)
-#  define CIAO_NA_CONFIGURATOR_TRACE(X)
-#else /* (CIAO_NA_CONFIGURATOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_NA_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_NA_CONFIGURATOR_NTRACE == 1) */
-
-#endif /* CIAO_NA_CONFIGURATOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp b/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp
deleted file mode 100644
index a6a46853fdf..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-#include "RTNodeApp_Configurator.h"
-#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
-
-CIAO::RTNodeApp_Configurator::~RTNodeApp_Configurator ()
-{
-}
-
-int
-CIAO::RTNodeApp_Configurator::pre_orb_initialize ()
-{
-  CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::pre_orb_init\n"));
-
-  return 0;
-}
-
-int
-CIAO::RTNodeApp_Configurator::post_orb_initialize (CORBA::ORB_ptr o)
-{
-  CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::post_orb_init\n"));
-
-  this->orb_ = CORBA::ORB::_duplicate (o);
-
-  CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB");
-
-  this->rtorb_ =
-    RTCORBA::RTORB::_narrow (object.in ());
-
-  this->config_manager_.init (this->rtorb_.in ());
-
-  return 0;
-}
-
-int
-CIAO::RTNodeApp_Configurator::init_resource_manager
-(const ::Deployment::Properties &properties)
-{
-
-  //  if (CIAO::debug_level () > 9)
-    CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager\n"));
-  // @@ Should we cache the properties that we consumed here?
-
-  for (CORBA::ULong i = 0; i < properties.length (); ++i)
-    {
-      //      if (CIAO::debug_level () > 9)
-      CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager processing property: %C\n",
-                  properties[i].name.in ()));
-
-      if (ACE_OS::strcmp ("CIAOServerResources", properties[i].name.in ()) == 0)
-        {
-          const CIAO::DAnCE::ServerResource *svr_resource = 0;
-          if (properties[i].value >>= svr_resource)
-            {
-              this->config_manager_.init_resources (*svr_resource);
-              //  Now we have the information to initialize the manager.
-            }
-          else
-            CIAO_ERROR_RETURN ((LM_ERROR,
-                               "ERROR: RTNodeApp_Configurator::init_resource_manager unable to extract CIAOServerResources\n"), -1);
-        }
-
-      // Ignore other stuff
-    }
-
-  return 0;
-}
-
-CORBA::PolicyList *
-CIAO::RTNodeApp_Configurator::find_container_policies
-(const ::Deployment::Properties &properties)
-{
-  CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_container_policies\n"));
-  // @@ Should we cache the properties that we consumed here?
-
-  for (CORBA::ULong i = 0; i < properties.length (); ++i)
-    {
-      CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_container_policies processing property: %C\n",
-                  properties[i].name.in ()));
-
-      if (ACE_OS::strcmp ("ContainerPolicySet", properties[i].name) == 0)
-        {
-          const char *policy_name = 0;
-          if (properties[i].value >>= policy_name)
-            {
-              return this->config_manager_.find_policies_by_name (policy_name);
-            }
-          else
-            CIAO_ERROR_RETURN ((LM_ERROR,
-                               "ERROR: RTNodeApp_Configurator::find_container_policies unable to extract ContainerPolicySet\n"), 0);
-        }
-    }
-
-  return 0;
-}
-
-
-extern "C" CIAO_RTNA_Configurator_Export CIAO::NodeApp_Configurator *create_nodeapp_configurator (void);
-
-CIAO::NodeApp_Configurator *
-create_nodeapp_configurator (void)
-{
-  CIAO::RTNodeApp_Configurator *config = 0;
-  ACE_NEW_RETURN (config, CIAO::RTNodeApp_Configurator, 0);
-  return config;
-}
diff --git a/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.h b/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.h
deleted file mode 100644
index fc2388b6aff..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-/**========================================================
- *
- * @file   RTNodeApp_Configurator.h
- *
- * @Brief  This file contains the implementation of
- *         the RTNodeApp_Configurator, a concrete NodeApp_Configurator for
- *         setting up real-time support for NodeApplication.
- *
- *
- * @author Nanbor Wang <nanbor@exothermic.txcorp.com>
- *========================================================*/
-
-#ifndef RTNODEAPP_CONFIGURATOR_H
-#define RTNODEAPP_CONFIGURATOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "NodeApp_Configurator.h"
-#include "RTNA_Configurator_Export.h"
-#include "tao/RTCORBA/RTCORBA.h"
-#include "RTConfig_Manager.h"
-
-namespace CIAO
-{
-  /**
-   * @class RTNodeApp_Configurator
-   *
-   * @brief This class implements a concrete NodeApp_Configurator for
-   * setting up the NodeApplication process for RT support.
-   **/
-  class CIAO_RTNA_Configurator_Export RTNodeApp_Configurator :
-    public NodeApp_Configurator
-  {
-  public:
-    /// Default destructor.
-    virtual ~RTNodeApp_Configurator (void);
-
-    /**
-     * @brief "pre_orb_initialize" is called before ORB_init.
-     */
-    virtual int pre_orb_initialize (void);
-
-    /**
-     * @brief "initialize" is called after NodeApplication get a hold
-     * at this object.
-     */
-    virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
-    /**
-     * @brief "init_resource_manager" is called by NodeApplication when
-     * it receives an "install" commands.
-     */
-    virtual int
-    init_resource_manager (const ::Deployment::Properties &properties);
-
-    /**
-     * @brief get a policyset by its name.
-     */
-    virtual CORBA::PolicyList *
-    find_container_policies (const ::Deployment::Properties &properties);
-
-  protected:
-    CORBA::ORB_var orb_;
-
-    RTCORBA::RTORB_var rtorb_;
-
-    RTResource_Config_Manager config_manager_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* RTNODEAPP_CONFIGURATOR_H */
diff --git a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp b/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp
deleted file mode 100755
index a3138f1a038..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-// $Id$
-
-#include "Server_Configurator.h"
-#include "ace/Log_Msg.h"
-#include "ciao/CIAO_common.h"
-#include "ciao/ComponentServer/CIAO_ServerResourcesC.h"
-
-namespace CIAO
-{
-  namespace Deployment
-  {
-
-    ComponentServer_Configurator::ComponentServer_Configurator (bool rt)
-      : rt_support_ (rt)
-    {
-    }
-
-    ComponentServer_Configurator::~ComponentServer_Configurator (void)
-    {
-      // Not much to do.
-    }
-
-    void
-    ComponentServer_Configurator::set_rt_support (void)
-    {
-      this->rt_support_ = true;
-    }
-
-    bool
-    ComponentServer_Configurator::rt_support (void)
-    {
-      return this->rt_support_;
-    }
-
-    bool
-    ComponentServer_Configurator::create_config_managers (void)
-    {
-      typedef CIAO::Deployment::Config_Manager * (*na_intelligent_designer)(void);
-      typedef CIAO::Deployment::Config_Manager * (*rtna_intelligent_designer)(void);
-      CIAO::Deployment::Config_Manager* ptr = 0;
-      CIAO::Deployment::Config_Manager* rt_ptr = 0;
-
-      int retval = this->config_dll_.open (/*ACE_DLL_PREFIX*/ ACE_TEXT ("CIAO_Basic_Config_Manager"),
-                                           ACE_DEFAULT_SHLIB_MODE,
-                                           0);
-
-      if (0 != retval)
-        {
-          CIAO_ERROR_RETURN ((LM_ERROR,
-                             CLINFO "ComponentServer_Configurator - Error loading CIAO_Basic_Config_manager DLL:  %p\n",
-                             "dll.open"),
-                             false);
-        }
-
-      // Cast the void* to non-pointer type first - it's not legal to
-      // cast a pointer-to-object directly to a pointer-to-function.
-      void *void_ptr =
-        this->config_dll_.symbol (ACE_TEXT ("create_basic_config_manager"));
-
-      ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (void_ptr);
-
-      // "id" is for na_intelligent-designer.
-      na_intelligent_designer config_id =
-        reinterpret_cast<na_intelligent_designer> (tmp);
-
-      if (0 == config_id)
-        {
-          CIAO_ERROR_RETURN ((LM_ERROR,
-                             CLINFO "ComponentServer_Configurator - Error loading CIAO_Basic_Configurator entrypoint: %p\n",
-                             "dll.symbol"),
-                             false);
-        }
-
-      ptr = config_id ();
-
-      if (0 == ptr)
-        {
-          CIAO_ERROR_RETURN ((LM_ERROR,
-                             CLINFO "ComponentServer_Configurator: Error creating ComponentServer_Configurator\n"),
-                             false);
-        }
-
-      this->na_config_manager_.reset (ptr);
-
-      if (this->rt_support_)
-        {
-          int rt_retval = this->config_dll_.open (ACE_DLL_PREFIX ACE_TEXT ("CIAO_RTNA_Configurator"),
-                                                  ACE_DEFAULT_SHLIB_MODE,
-                                                  false);
-
-          if (0 != rt_retval)
-            {
-              CIAO_ERROR_RETURN ((LM_ERROR,
-                                 "ComponentServer_Configurator - Error while loading CIAO_RTNA_Configurator: %p\n",
-                                 "dll.open"),
-                                 false);
-            }
-
-          // Cast the void* to non-pointer type first - it's not legal to
-          // cast a pointer-to-object directly to a pointer-to-function.
-          void *rt_void_ptr =
-            this->config_dll_.symbol (ACE_TEXT ("create_rt_config_manager"));
-          ptrdiff_t rt_tmp = reinterpret_cast<ptrdiff_t> (rt_void_ptr);
-
-          // "id" is for na_intelligent-designer.
-          rtna_intelligent_designer rt_config_id =
-            reinterpret_cast<rtna_intelligent_designer> (rt_tmp);
-
-          if (0 == rt_config_id)
-            {
-              CIAO_ERROR_RETURN ((LM_ERROR,
-                                 CLINFO "ComponentServer_Configurator: Error while using RTNA entrypoint: %p",
-                                 "dll.symbol"),
-                                 false);
-            }
-
-          rt_ptr = rt_config_id ();
-
-          if (0 == rt_ptr)
-            {
-              CIAO_ERROR_RETURN ((LM_ERROR,
-                                 CLINFO "ComponentServer_Configurator: Error creating RTComponentServer_Configurator\n"),
-                                 false);
-            }
-
-          this->rt_config_manager_.reset (rt_ptr);
-        }
-
-      return true;
-    }
-
-    int
-    ComponentServer_Configurator::pre_orb_initialize ()
-    {
-      CIAO_DEBUG ((LM_TRACE,CLINFO  "ComponentServer_Configurator::pre_orb_init\n"));
-
-      (*this->na_config_manager_.get ()).pre_orb_initialize ();
-      if (this->rt_support_)
-        {
-          (*this->rt_config_manager_.get ()).pre_orb_initialize ();
-        }
-
-      return 0;
-    }
-
-    int
-    ComponentServer_Configurator::post_orb_initialize (CORBA::ORB_ptr o)
-    {
-      CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Configurator::post_orb_init\n"));
-      this->orb_ = CORBA::ORB::_duplicate (o);
-
-      (*this->na_config_manager_.get ()).init (this->orb_.in ());
-      if (this->rt_support_)
-        {
-          (*this->rt_config_manager_.get ()).init (this->orb_.in ());
-        }
-
-      (*this->na_config_manager_.get ()).post_orb_initialize (this->orb_.in ());
-      if (this->rt_support_)
-        {
-          (*this->rt_config_manager_.get ()).post_orb_initialize (this->orb_.in ());
-        }
-
-      return 0;
-    }
-
-    int
-    ComponentServer_Configurator::init_resource_manager
-    (const ::Components::ConfigValues &properties)
-    {
-      for (CORBA::ULong i = 0; i < properties.length (); ++i)
-        {
-          if (ACE_OS::strcmp ("CIAOServerResources", properties[i]->name ()) == 0)
-            {
-              const ServerResource *svr_resource;
-              if (properties[i]->value () >>= svr_resource)
-                {
-                  (*this->na_config_manager_.get ()).
-                    init_resources (*svr_resource);
-
-                  if (this->rt_support_)
-                    {
-                      (*this->rt_config_manager_.get ()).
-                        init_resources (*svr_resource);
-                    }
-                }
-              else
-                {
-                  CIAO_ERROR_RETURN ((LM_ERROR,
-                                     CLINFO "ERROR: ComponentServer_Configurator::"
-                                     "init_resource_manager unable to extract"
-                                     "CIAOServerResources\n"), -1);
-                }
-            }
-        }
-
-      return 0;
-    }
-
-    CORBA::PolicyList *
-    ComponentServer_Configurator::find_container_policies
-    (const ::Components::ConfigValues &properties)
-    {
-      if (!this->na_config_manager_.get ())
-        return 0;
-
-      CORBA::PolicyList *configured_policies = 0;
-      CORBA::PolicyList *rt_configured_policies = 0;
-
-      for (CORBA::ULong i = 0; i < properties.length (); ++i)
-        {
-          if (ACE_OS::strcmp ("ContainerPolicySet", properties[i]->name ()) == 0)
-            {
-              const char *policy_name;
-              if (properties[i]->value () >>= policy_name)
-                {
-                  configured_policies = (*this->na_config_manager_.get ()).
-                    find_policies_by_name (policy_name);
-
-                  CORBA::ULong p_length = 0;
-                  if (configured_policies != 0)
-                    {
-                      p_length = configured_policies->length ();
-                    }
-
-                  if (this->rt_support_)
-                    {
-                      rt_configured_policies = (*this->rt_config_manager_.get ()).
-                        find_policies_by_name (policy_name);
-                    }
-
-                  CORBA::PolicyList_var temp_policies;
-                  CORBA::ULong rtp_length = 0;
-                  if (rt_configured_policies != 0)
-                    {
-                      rtp_length = rt_configured_policies->length ();
-                      temp_policies = rt_configured_policies;
-                    }
-                  else
-                    {
-                      return configured_policies;
-                    }
-
-                  CORBA::ULong final_length = p_length + rtp_length;
-                  temp_policies->length (final_length);
-
-                  for (CORBA::ULong i = 0; i < p_length; ++i)
-                    {
-                      temp_policies[i+rtp_length] =
-                        CORBA::Policy::_duplicate ((*configured_policies)[i]);
-                    }
-                  return temp_policies._retn ();
-                }
-              else
-                {
-                  CIAO_ERROR_RETURN ((LM_ERROR,
-                                     CLINFO "ERROR: ComponentServer_Configurator:"
-                                     "find_container_policies unable to extract"
-                                     "ContainerPolicySet\n"), 0);
-                }
-            }
-        }
-      return 0;
-    }
-
-    CORBA::PolicyList *
-    ComponentServer_Configurator::find_policies_by_name (const char *policy_name)
-    {
-      if (!this->na_config_manager_.get ())
-        return 0;
-
-      CORBA::PolicyList *configured_policies = 0;
-      CORBA::PolicyList *rt_configured_policies = 0;
-
-      configured_policies = (*this->na_config_manager_.get ()).
-        find_policies_by_name (policy_name);
-
-      CORBA::ULong p_length = 0;
-      if (configured_policies != 0)
-        {
-          p_length = configured_policies->length ();
-        }
-
-      if (this->rt_support_)
-        {
-          rt_configured_policies = (*this->rt_config_manager_.get ()).
-            find_policies_by_name (policy_name);
-        }
-
-      CORBA::PolicyList_var temp_policies;
-      CORBA::ULong rtp_length = 0;
-      if (rt_configured_policies != 0)
-        {
-          rtp_length = rt_configured_policies->length ();
-          temp_policies = rt_configured_policies;
-        }
-      else
-        {
-          return configured_policies;
-        }
-
-      CORBA::ULong final_length = p_length + rtp_length;
-      temp_policies->length (final_length);
-
-      for (CORBA::ULong i = 0; i < p_length; ++i)
-        {
-          temp_policies[i+rtp_length] =
-            CORBA::Policy::_duplicate ((*configured_policies)[i]);
-        }
-      return temp_policies._retn ();
-    }
-
-    bool
-    ComponentServer_Configurator::policy_exists (const char *policy_set_id)
-    {
-      if (!this->na_config_manager_.get ())
-        return 0;
-
-      bool result;
-      result = (*this->na_config_manager_.get ()).
-        policy_exists (policy_set_id);
-
-      if (result == false)
-        {
-          if (this->rt_support_)
-            {
-              result = (*this->rt_config_manager_.get ()).
-                policy_exists (policy_set_id);
-            }
-        }
-      return result;
-    }
-  }
-}
diff --git a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h b/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h
deleted file mode 100644
index c12e34522e2..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h
+++ /dev/null
@@ -1,123 +0,0 @@
-//$Id$
-/**========================================================
- *
- * @file   Server_Configurator.h
- *
- * @Brief  This file contains the implementation of
- *         the basic ComponentServer_Configurator interface, the one
- *         that does nothing more
- *
- * @author Nanbor Wang <nanbor@exothermic.txcorp.com>
- *========================================================*/
-
-#ifndef COMPONENTSERVER_CONFIGURATOR_H
-#define COMPONENTSERVER_CONFIGURATOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/DLL.h"
-#include "ace/Auto_Ptr.h"
-#include "ccm/CCM_StandardConfiguratorC.h"
-#include "ComponentServer_Configurator_export.h"
-#include "Config_Manager.h"
-
-namespace CIAO
-{
-  namespace Deployment
-  {
-    /**
-     *
-     * @class ComponentServer_Configurator
-     *
-     * @brief This class defines and implements the default
-     * ComponentServer_Configurator base class that's needed for configuring the
-     * ComponentServer application process.
-     **/
-    class ComponentServer_Configurator_Export ComponentServer_Configurator
-    {
-    public:
-
-      /// Default constructor.
-      ComponentServer_Configurator (bool rt = false);
-
-      /// Default destructor.
-      virtual ~ComponentServer_Configurator (void);
-
-      /**
-       * @brief "pre_orb_initialize" is called before ORB_init.
-       */
-      virtual int pre_orb_initialize (void);
-
-      /**
-       * @brief "post_orb_initialize" is called after ComponentServer
-       * get a hold at this object.
-       */
-      virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
-      /**
-       * @brief "init_resource_manager" is called by ComponentServer when
-       * it receives an "install" commands.
-       */
-      virtual int
-        init_resource_manager (const ::Components::ConfigValues &properties);
-
-      /**
-       * @brief get a policyset by its name.
-       */
-      virtual CORBA::PolicyList *
-        find_container_policies (const ::Components::ConfigValues &properties);
-
-      /// @@ Perhaps we also need a finalizer method here.  Perhaps we
-      /// even need to differentiate finalizer before ORB is destroyed
-      /// and the one after that.
-      bool rt_support (void);
-
-      void set_rt_support (void);
-
-      virtual bool create_config_managers (void);
-
-      bool policy_exists (const char *policy_set_id);
-
-      CORBA::PolicyList *
-        find_policies_by_name (const char *name);
-
-    protected:
-      bool rt_support_;
-
-      CORBA::ORB_var orb_;
-
-      auto_ptr<Config_Manager> rt_config_manager_;
-
-      auto_ptr<Config_Manager> na_config_manager_;
-
-      ACE_DLL config_dll_;
-    };
-  }
-}
-
-/**
- * For dynamically linkable concrete ComponentServer_Configurator
- * implementation, remember to create a factory method using "C"
- * calling convention in the CPP file as follow:
-
- extern "C" EXPORT_MACRO CIAO::ComponentServer_Configurator *create_nodeapp_configurator (void);
-
- CIAO::ComponentServer_Configurator *
- create_nodeapp_configurator (void)
- {
- concrete_ComponentServer_Configurator *config;
- ACE_NEW_RETURN (config, concrete_ComponentServer_Configurator, 0);
- return config;
- }
-
-*/
-
-
-#include /**/ "ace/post.h"
-#endif /* NODEAPP_CONFIGURATOR_H */
-