Fri Dec 2 11:25:48 2005 William Otte <wotte@dre.vanderbilt.edu>

9 files changed, 17 insertions, 1326 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 08c7b487b48..5420b15ed51 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,20 @@
+Fri Dec  2 11:25:48 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+	* DAnCE/RepositoryManager/RepositoryManager.idl
+	* DAnCE/RepositoryManager/RepositoryManager.mpc
+	* DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+	* DAnCE/RepositoryManager/RepositoryManager_Impl.h
+	* DAnCE/RepositoryManager/Repository_Manager.cpp
+	* DAnCE/RepositoryManager/Repository_Manager_conf.h
+	* DAnCE/RepositoryManager/Update_Plan.cpp
+	* DAnCE/RepositoryManager/Update_Plan.h
+
+	Removed the deprecated RepositoryManager implementation. 
+	
+	* NEWS
+	
+	Updated the NEWS file to reflect this. 
+
 Thu Dec  1 10:16:46 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* tools/Config_Handlers/Basic_Deployment_Data.hpp
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl
deleted file mode 100644
index 1fc19b0d1be..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "Deployment.idl"
-
-module CIAO
-{
-  interface RepositoryManagerDaemon : Deployment::RepositoryManager
-  {
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
deleted file mode 100644
index 340efeb7322..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(Repository_Manager): ciao_server_dnc,ciao_deployment_svnt, ciao_deployment_stub, taoexe, xerces, exceptions {
-  exename = executor
-  after += Config_Handlers ExecutionManager_stub NodeManager_stub
-  includes += $(CIAO_ROOT)/tools
-  libs     += Config_Handlers NodeManager_stub
-  libs     += ExecutionManager_stub CIAO_DnC_Server
-  after    += Config_Handlers
-  requires += dummy_label
-
-  IDL_Files {
-    RepositoryManager.idl
-  }
-
-  Source_Files {
-    RepositoryManagerC.cpp
-    RepositoryManagerS.cpp
-    Update_Plan.cpp
-    Repository_Manager.cpp
-    RepositoryManager_Impl.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
deleted file mode 100644
index da85e59cf55..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/* -*- C++  -*- */
-// $Id$
-
-#include "RepositoryManager_Impl.h"
-#include "Repository_Manager_conf.h"
-#include "Old_Config_Handlers/TPD_Handler.h"
-#include "Old_Config_Handlers/DnC_Dump.h"
-
-CIAO::RepositoryManager_Impl::RepositoryManager_Impl
-   (CORBA::ORB_ptr orb,
-    PortableServer::POA_ptr poa)
-  : orb_ (CORBA::ORB::_duplicate  (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    pc_table_ (MAX_PACKAGES)
-{
-}
-
-CIAO::RepositoryManager_Impl::RepositoryManager_Impl ()
-  : pc_table_ (MAX_PACKAGES)
-{
-}
-
-CIAO::RepositoryManager_Impl::~RepositoryManager_Impl ()
-{
-}
-
-void
-CIAO::RepositoryManager_Impl::
-installPackage (const char* installation_name,
-                const char* location
-                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NameExists,
-                   Deployment::PackageError))
-{
-  try
-    {
-      xercesc::XMLPlatformUtils::Initialize();
-    }
-  catch (const XMLException& xml_e)
-    {
-      char* message = XMLString::transcode (xml_e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
-      return;
-    }
-  try
-    {
-      CIAO::Config_Handler::Config_Error_Handler tpd_err_handler;
-      CIAO::Config_Handler::Config_Error_Handler pc_err_handler;
-      auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils::
-                                       create_parser ());
-      tpd_parser->setErrorHandler(&tpd_err_handler);
-      DOMDocument* tpd_doc = tpd_parser->parseURI (location);
-
-      if (tpd_err_handler.getErrors())
-        {
-          throw Deployment::PackageError ();
-        }
-
-      CIAO::Config_Handler::TPD_Handler top_pc_handler
-        (tpd_doc,
-         DOMNodeFilter::SHOW_ELEMENT |
-         DOMNodeFilter::SHOW_TEXT);
-      ACE_TString package_location = top_pc_handler.
-          process_TopLevelPackageDescription ();
-
-      auto_ptr<DOMBuilder> pc_parser (CIAO::Config_Handler::Utils::
-                                      create_parser ());
-      pc_parser->setErrorHandler(&pc_err_handler);
-      DOMDocument* pc_doc = pc_parser->parseURI (package_location.c_str());
-
-      if (pc_err_handler.getErrors())
-        {
-          throw Deployment::PackageError ();
-        }
-
-      CIAO::Config_Handler::PC_Handler pc_handler (pc_doc,
-                                                   DOMNodeFilter::SHOW_ELEMENT |
-                                                   DOMNodeFilter::SHOW_TEXT);
-      Deployment::PackageConfiguration pc;
-      pc_handler.process_PackageConfiguration (pc);
-      //Deployment::DnC_Dump::dump (pc);
-      this->pc_table_.bind (installation_name, (pc));
-      //Deployment::DnC_Dump::dump (*(&pc));
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      return;
-    }
-  catch (const DOMException& e)
-    {
-      const unsigned int maxChars = 2047;
-      XMLCh errText[maxChars + 1];
-
-      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \
-                  \n",location));
-      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
-      if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars))
-        {
-          char* message = XMLString::transcode (errText);
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
-        }
-      ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
-      return;
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      return;
-    }
-}
-
-void
-CIAO::RepositoryManager_Impl::
-createPackage (const char*,
-               const Deployment::PackageConfiguration&,
-               const char*,
-               CORBA::Boolean
-               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NameExists,
-                   Deployment::PackageError))
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-Deployment::PackageConfiguration*
-CIAO::RepositoryManager_Impl::findPackageByName (const char* name
-                                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NoSuchName))
-{
-  Deployment::PackageConfiguration pc;
-  if (pc_table_.find (name, pc) == 0)
-    {
-      //Deployment::PackageConfiguration* dup_pc = pc;
-      //Deployment::DnC_Dump::dump (*pc);
-      //return dup_pc;
-      Deployment::PackageConfiguration_var pc_var = 0;
-      ACE_NEW_THROW_EX (pc_var,
-                        Deployment::PackageConfiguration (pc),
-                        CORBA::NO_MEMORY ());
-      //Deployment::DnC_Dump::dump (*pc_var);
-      return pc_var._retn ();
-    }
-  else
-    {
-      ACE_THROW_RETURN (Deployment::NoSuchName (), 0);
-    }
-}
-
-Deployment::PackageConfiguration*
-CIAO::RepositoryManager_Impl::
-findPackageByUUID (const char*
-                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NoSuchName))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-CORBA::StringSeq*
-CIAO::RepositoryManager_Impl::
-findNamesByType (const char*
-                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-CORBA::StringSeq*
-CIAO::RepositoryManager_Impl::
-getAllNames (ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-CORBA::StringSeq*
-CIAO::RepositoryManager_Impl::
-getAllTypes (ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-void
-CIAO::RepositoryManager_Impl::
-deletePackage (const char*
-               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NoSuchName))
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-void
-CIAO::RepositoryManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (1 ACE_ENV_SINGLE_ARG_PARAMETER);
-}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
deleted file mode 100644
index cfb9e4f715b..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*=======================================================================
- *
- * @file RepositoryManager_Impl.h
- *
- * $Id$
- *
- * @brief This file contains implementation for
- * Deployment::RepositoryManager interface.
- *
- * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- *
- *======================================================================*/
-
-#ifndef REPOSITORYMANAGER_IMPL_H
-#define REPOSITORYMANAGER_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "RepositoryManagerS.h"
-#include "ace/Get_Opt.h"
-#include "RepositoryManager_Impl.h"
-#include "ace/Synch.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <xercesc/parsers/AbstractDOMParser.hpp>
-#include "CIAO/DAnCE/Old_Config_Handlers/Config_Handler_export.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/PC_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Utils.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMAttr;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMNodeList;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::XercesDOMParser;
-using xercesc::AbstractDOMParser;
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- *
- * @class ReposityManager_Impl
- *
- * @brief This class implements the RepositoryManager. RepositoryManager
- * assists the execution process after the planning stage.
- *
- */
-namespace CIAO
-{
-  class RepositoryManager_Impl
-    : public virtual POA_CIAO::RepositoryManagerDaemon
-    {
-
-    public:
-
-      RepositoryManager_Impl ();
-
-      /// Constructor.
-      RepositoryManager_Impl (CORBA::ORB_ptr orb,
-                              PortableServer::POA_ptr poa
-                              ACE_ENV_ARG_DECL);
-
-      virtual void installPackage (const char* installation_name,
-                                   const char* location
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::NameExists,
-                         Deployment::PackageError));
-
-      virtual void createPackage (const char* installation_name,
-                                  const Deployment::PackageConfiguration& pc,
-                                  const char* base_location,
-                                  CORBA::Boolean replace
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::NameExists,
-                         Deployment::PackageError));
-
-      virtual Deployment::PackageConfiguration*
-        findPackageByName (const char* name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           Deployment::NoSuchName));
-
-      virtual Deployment::PackageConfiguration*
-        findPackageByUUID (const char* name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           Deployment::NoSuchName));
-
-      virtual CORBA::StringSeq*
-        findNamesByType (const char* type
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::StringSeq*
-        getAllNames (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::StringSeq*
-        getAllTypes (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual void
-        deletePackage (const char* name
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           Deployment::NoSuchName));
-
-      virtual void
-        shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-    protected:
-
-      ~RepositoryManager_Impl ();
-      // destructor
-
-      typedef ACE_Hash_Map_Manager_Ex<const char *,
-        Deployment::PackageConfiguration,
-        ACE_Hash<const char *>, ACE_Equal_To<const char *>,
-        TAO_SYNCH_MUTEX> pc_table;
-
-      typedef pc_table::iterator pc_iterator;
-      // Cached ORB pointer
-      CORBA::ORB_var orb_;
-
-      // Cached POA pointer
-      PortableServer::POA_var poa_;
-
-      pc_table pc_table_;
-    };
-}
-
-#include /**/ "ace/post.h"
-#endif /* REPOSITORYMANAGER_IMPL_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
deleted file mode 100644
index 8aa41d076fa..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-// $Id$
-
-#include "RepositoryManager_Impl.h"
-#include "Update_Plan.h"
-#include "ExecutionManager/ExecutionManagerC.h"
-#include "Config_Handlers/DnC_Dump.h"
-#include "NodeManager/NodeManagerC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/streams.h"
-#include "ace/Auto_Ptr.h"
-using namespace std;
-
-const char * exec_ior = "file://exec_mgr.ior";
-const char * node_daemon_ior = 0;
-
-static void
-usage (const ACE_TCHAR* program)
-{
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Usage: %s -p <URI> -d <URI> -k <EX_IOR> \
-                         -t <NODE_MANAGER_IOR> \n")
-              ACE_TEXT (" <URI>: URI identifying the package\n"),
-              program));
-}
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  // Initialize orb
-  CORBA::ORB_var orb =
-    CORBA::ORB_init (argc,
-                      argv,
-                      ""
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // top level package URL
-  char* package_url = 0;
-
-  // deployment plan URL
-  char* plan_url = 0;
-
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:d:k:t:"));
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-          case 'p':
-            package_url = get_opt.opt_arg ();
-            break;
-          case 'd':
-            plan_url = get_opt.opt_arg ();
-            break;
-          case 'k':
-            exec_ior = get_opt.opt_arg ();
-            break;
-          case 't':
-            node_daemon_ior = get_opt.opt_arg ();
-            break;
-          default:
-            usage(argv[0]);
-            return -1;
-        }
-    }
-
-  if (package_url == 0) {
-    usage(argv[0]);
-    return -1;
-  }
-
-  if (plan_url == 0) {
-    usage(argv[0]);
-    return -1;
-  }
-
-  try
-    {
-      xercesc::XMLPlatformUtils::Initialize();
-    }
-
-  catch (const XMLException& xml_e)
-    {
-      char* message = XMLString::transcode (xml_e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
-      return 1;
-    }
-  try
-    {
-      // get a reference to the parser.
-      auto_ptr<DOMBuilder> plan_parser (
-          CIAO::Config_Handler::Utils::create_parser ()
-        );
-        
-      CIAO::Config_Handler::Config_Error_Handler handler;
-      plan_parser->setErrorHandler(&handler);
-
-      auto_ptr<DOMBuilder> tpd_parser (
-          CIAO::Config_Handler::Utils::create_parser ()
-        );
-
-      CIAO::Config_Handler::Config_Error_Handler tpd_handler;
-      tpd_parser->setErrorHandler(&tpd_handler);
-
-      // use the parser to parse the deployment plan URL and create
-      // a DOM document.
-      DOMDocument* plan_doc = plan_parser->parseURI (plan_url);
-      
-      if (handler.getErrors())
-        {
-          return 1;
-        }
-
-      //DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
-
-      //ACE_UNUSED_ARG (tpd_doc);
-
-      if (tpd_handler.getErrors())
-        {
-          return 1;
-        }
-
-      if (plan_doc == NULL)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \
-                      May be the URL is wrong!!\n"));
-          throw CIAO::Null_Dom_Document ();
-        }
-
-      // free up DOMBuilder. DOMBuilder also deletes the DOMDocument memory.
-      //auto_ptr<DOMBuilder> cleanup_parser (parser);
-
-      // call the Deployment Plan handler to parse the XML descriptor.
-      CIAO::Config_Handler::Plan_Handler plan_handler (
-          plan_doc,
-          DOMNodeFilter::SHOW_ELEMENT | DOMNodeFilter::SHOW_TEXT
-        );
-        
-      Deployment::DeploymentPlan plan;
-      plan_handler.process_plan (plan);
-
-      // call the PackageConfiguration handler to parse the XML descriptor.
-      Deployment::PackageConfiguration* pc;
-
-      CIAO::RepositoryManager_Impl *rep_impl = 0;
-      ACE_NEW_RETURN (rep_impl,
-                      CIAO::RepositoryManager_Impl (),
-                      -1);
-      PortableServer::ServantBase_var owner_transfer (rep_impl);
-
-      rep_impl->installPackage ("PC", package_url);
-      pc = rep_impl->findPackageByName ("PC");
-      //Deployment::DnC_Dump::dump (*pc);
-
-      CIAO::REF_MAP ref_map;
-      CIAO::REF_MAP primary_ref_map;
-
-      // traverse the PackageConfiguration IDL data structure and
-      // update the deployment plan IDL data structure.
-      CIAO::traverse_package (pc, plan, ref_map, primary_ref_map);
-
-      //Deployment::DnC_Dump::dump (plan);
-
-      // Pass the parsed plan to the Execution Manager to start the
-      // Deployment Process.
-
-      CORBA::Object_var obj = orb->string_to_object (exec_ior
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CIAO::ExecutionManagerDaemon_var exec_mgr =
-        CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (exec_mgr.in ()))
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Executor: nil Execution Manager reference, \
-                       narrow failed\n"));
-          return 1;
-
-        }
-
-      CIAO::NodeManager_var node_mgr;
-      if (node_daemon_ior != 0)
-      {
-        CORBA::Object_var node_mgr_obj = 
-          orb->string_to_object (node_daemon_ior
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        node_mgr =
-          CIAO::NodeManager::_narrow (node_mgr_obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (CORBA::is_nil (node_mgr.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "Executor: nil Node Manager reference, \
-                        narrow failed\n"));
-            return 1;
-          }
-      }
-
-      ACE_DEBUG ((LM_DEBUG, "Executor: Obtained Execution Manager ref \n"));
-      Deployment::DomainApplicationManager_var dapp_mgr =
-        exec_mgr->preparePlan (plan, 1);
-
-      if (CORBA::is_nil (dapp_mgr.in ()))
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Executor:preparePlan call failed:nil \
-                       DomainApplicationManager reference\n"));
-          return 1;
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "Executor: Obtained DomainApplication Manager ref \n"));
-
-      // Create a dummy set of properties and start the
-      // Launching of applications
-      Deployment::Properties_var properties;
-      ACE_NEW_RETURN (properties,
-                      Deployment::Properties,
-                      1);
-      ACE_DEBUG ((LM_DEBUG, "Executor: start Launch application....."));
-
-      // Do not start the Application immediately
-      int start = 0;
-      dapp_mgr->startLaunch (properties.in (), start);
-      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-
-      // Call finish Launch to complete the connections
-      ACE_DEBUG ((LM_DEBUG, "Executor: finish Launch application....."));
-      dapp_mgr->finishLaunch (start);
-      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-
-      // Call start to activate components
-      ACE_DEBUG ((LM_DEBUG, "Executor: start activating components..."));
-      dapp_mgr->start ();
-      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "Executor: Application Deployed successfully \n"));
-      ACE_DEBUG ((LM_DEBUG, "Press <Enter> to tear down application \n"));
-
-      char dummy [256];
-      cin.getline (dummy, 256);
-      // Tear down the assembly
-
-      ACE_DEBUG ((LM_DEBUG, "Executor: destroy the application....."));
-      dapp_mgr->destroyApplication ();
-      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "Executor: destroy the manager....."));
-      exec_mgr->destroyManager (dapp_mgr.in ());
-      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-
-      if (node_daemon_ior != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n"));
-          exec_mgr->shutdown (); // shut down execution manager.
-          ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-
-          ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n"));
-          node_mgr->shutdown (); // shut down the node manager.
-          ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-        }
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      return -1;
-    }
-  catch (const DOMException& e)
-    {
-      const unsigned int maxChars = 2047;
-      XMLCh errText[maxChars + 1];
-
-      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \
-                  \n",plan_url));
-      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
-      if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars))
-        {
-          char* message = XMLString::transcode (errText);
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
-        }
-      //ACE_PRINT_EXCEPTION ("Caught DOM Exception: ");
-      ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
-      return -1;
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h
deleted file mode 100644
index c746f4d6a9c..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Repository_Manager_conf.h
- *
- * $Id$
- *
- * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef REPOSITORY_MANAGER_CONF_H
-#define REPOSITORY_MANAGER_CONF_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#ifndef MAX_PACKAGES_DEF
-/// The number of packages that need to be configured
-const long MAX_PACKAGES = 15;
-#endif  /* MAX_PACKAGES_DEF */
-
-#include /**/ "ace/post.h"
-
-#endif  /* REPOSITORY_MANAGER_CONF_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
deleted file mode 100644
index 9f7b77a7799..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-// $Id$
-
-#include "RepositoryManager_Impl.h"
-#include "Update_Plan.h"
-#include "DeploymentC.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/streams.h"
-
-ACE_RCSID (DAnCE,
-           RepositoryManager,
-           "$Id$")
-
-using namespace Deployment;
-
-namespace CIAO
-{
-  void
-  traverse_package (PackageConfiguration* &pc,
-                    DeploymentPlan &plan,
-                    REF_MAP &ref_map,
-                    REF_MAP &primary_ref_map)
-  {
-    // traverse the package configuration structure to get to the
-    // BasePackage which consists of assemblies.
-    //
-    REF_MAP plan_ref_map;
-    CORBA::ULong bp_len =
-      pc->basePackage.length ();
-
-    for (CORBA::ULong x = 0; x != bp_len; ++x)
-      {
-        CORBA::ULong impl_len =
-          pc->basePackage[x].implementation.length ();
-
-        for (CORBA::ULong y = 0;
-             y != impl_len;
-             ++y)
-          {
-            // traverse the .cpd file and get to the referenced .cid file
-            //
-            ComponentImplementationDescription cid =
-              pc->basePackage[x].implementation[y].referencedImplementation;
-            CORBA::ULong assembly_len = cid.assemblyImpl.length ();
-
-            for (CORBA::ULong z = 0;
-                 z != assembly_len;
-                 ++z)
-              {
-                // traverse the .cid file and get to each
-                // of the "assemblyImpl" tags.
-                //
-                ComponentAssemblyDescription assembly =
-                  cid.assemblyImpl[z];
-                //
-                // traverse the individual assembly.
-                //
-                traverse_assembly (assembly, plan, ref_map, primary_ref_map,
-                                   plan_ref_map);
-              }
-          }
-      }
-  }
-
-  void
-  traverse_assembly (ComponentAssemblyDescription &assembly,
-                     DeploymentPlan &plan,
-                     REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                     REF_MAP &plan_ref_map)
-  {
-    // traverse the assembly (ComponentAssemblyDescription) and
-    // processes the instances and the connection within the assembly.
-    //
-    CORBA::ULong ins_len = assembly.instance.length ();
-    for (CORBA::ULong k = 0; k < ins_len; ++k)
-      {
-        SubcomponentInstantiationDescription ins =
-          assembly.instance[k];
-        const char* in_name = ins.name;
-
-      CORBA::ULong plan_ins_len =
-        plan.instance.length ();
-
-      for (CORBA::ULong l = 0; l < plan_ins_len; ++l)
-        {
-          const char* plan_name = plan.instance[l].name;
-          if (ACE_OS::strcmp (plan_name, in_name) == 0)
-            {
-              traverse_assembly_instance (ins, plan, l,
-                                          ref_map, primary_ref_map,
-                                          plan_ref_map);
-            }
-        }
-      }
-
-    CORBA::ULong assembly_conn_len =
-      assembly.connection.length ();
-
-    for (CORBA::ULong m = 0; m < assembly_conn_len; ++m)
-      {
-        AssemblyConnectionDescription
-          assembly_connection = assembly.connection[m];
-        traverse_assembly_connection (assembly,
-                                      assembly_connection,
-                                      plan);
-      }
-  }
-
-  void
-  traverse_assembly_connection (ComponentAssemblyDescription
-                                &assembly,
-                                AssemblyConnectionDescription
-                                &assembly_connection,
-                                DeploymentPlan &plan)
-  {
-    // traverse the assembly connection and get information about the
-    // portName and the instances at each end of the connection.
-    // Also traverse the InterfaceDescriptions for each of those instances
-    // and populate the portKind information.
-    //
-    CORBA::ULong con_length (plan.connection.length ());
-    plan.connection.length (con_length + 1);
-    CORBA::ULong iepe_len = assembly_connection.internalEndpoint.length ();
-    for (CORBA::ULong n = 0; n < iepe_len; ++n)
-      {
-        CORBA::ULong iep_len (plan.connection[con_length].
-                              internalEndpoint.length ());
-      plan.connection[con_length].internalEndpoint
-        .length (iep_len + 1);
-      plan.connection[con_length].internalEndpoint
-        [iep_len].portName = assembly_connection.
-        internalEndpoint[n].portName;
-      CORBA::ULong ins_ref = assembly_connection.internalEndpoint[n].
-        instanceRef;
-      const char* ins_name = assembly.instance[ins_ref].name;
-      CORBA::ULong plan_ins_len = plan.instance.length ();
-      for (CORBA::ULong w = 0; w < plan_ins_len; ++w)
-        {
-          const char* pl_name = plan.instance[w].name;
-          if (ACE_OS::strcmp (pl_name, ins_name) == 0)
-            {
-              plan.connection[con_length].internalEndpoint
-                [iep_len].instanceRef = w;
-              break;
-            }
-        }
-      traverse_interface (assembly.instance[ins_ref],
-                          plan.connection[con_length].
-                          internalEndpoint[iep_len]);
-      }
-  }
-
-  void
-  traverse_interface (SubcomponentInstantiationDescription
-                      &instance,
-                      PlanSubcomponentPortEndpoint
-                      &pspe)
-  {
-    // traverse the InterfaceDescription of the instance and get information
-    // about the portkind of the port.
-    //
-    CORBA::ULong pack_len = instance.package.length ();
-    for (CORBA::ULong m = 0; m < pack_len; ++m)
-      {
-        ComponentPackageDescription
-          package = instance.package[m];
-
-        ComponentInterfaceDescription
-          cid = package.realizes;
-
-        CORBA::ULong port_len = cid.port.length ();
-
-        for (CORBA::ULong n = 0; n < port_len; ++n)
-          {
-            const char* main_port_name = cid.port[n].name;
-            const char* port_name = pspe.portName;
-            if (ACE_OS::strcmp (main_port_name, port_name) == 0)
-              {
-                pspe.kind = cid.port[n].kind;
-              }
-          }
-      }
-  }
-
-  void
-  traverse_assembly_instance (
-                              SubcomponentInstantiationDescription
-                              &instance,
-                              DeploymentPlan &plan, int l,
-                              REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                              REF_MAP &plan_ref_map)
-  {
-    // Each instance has a package.
-    //   Each package has an implementation and their correspoding artifacts.
-    // Traverse this information and populate the artifact and the
-    // implementation information within the DeploymentPlan.
-    //
-    ART_REF_MAP art_ref_map;
-
-    update_config_property (instance, plan.instance[l]);
-
-    CORBA::ULong pack_len = instance.package.length ();
-    for (CORBA::ULong m = 0; m < pack_len; ++m)
-      {
-        ComponentPackageDescription
-          package = instance.package[m];
-        CORBA::ULong pack_impl_len = package.implementation.length ();
-
-        for (CORBA::ULong n = 0; n < pack_impl_len; ++n)
-          {
-            PackagedComponentImplementation
-              impl = package.implementation[n];
-            CORBA::ULong impl_length (plan.implementation.length ());
-            plan.implementation.length (impl_length + 1);
-            plan.implementation[impl_length].name = plan.instance[l].name;
-            plan.instance[l].implementationRef = impl_length;
-            CORBA::ULong mono_impl_len =
-              impl.referencedImplementation.monolithicImpl.length ();
-
-            for (CORBA::ULong p = 0; p < mono_impl_len; ++p)
-              {
-                MonolithicImplementationDescription
-                  mid = impl.referencedImplementation.monolithicImpl[p];
-
-                update_artifacts (mid, plan, plan.instance[l],
-                                  ref_map, primary_ref_map, art_ref_map,
-                                  plan_ref_map,
-                                  plan.implementation[impl_length]);
-              }
-            update_impl_config_property (impl, plan.implementation[impl_length],
-                                         plan.instance[l]);
-          }
-      }
-  }
-
-  void
-  update_artifacts (MonolithicImplementationDescription &mid,
-                    DeploymentPlan &plan,
-                    InstanceDeploymentDescription &instance,
-                    REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                    ART_REF_MAP &art_ref_map,
-                    REF_MAP &plan_ref_map,
-                    MonolithicDeploymentDescription &mdd)
-  {
-    ref_map.unbind_all ();
-    primary_ref_map.unbind_all ();
-    art_ref_map.unbind_all ();
-    CORBA::ULong prim_art_len = mid.primaryArtifact.length ();
-    for (CORBA::ULong q = 0; q < prim_art_len; ++q)
-      {
-        ImplementationArtifactDescription
-          pack_iad = mid.primaryArtifact[q].referencedArtifact;
-        ACE_TString artifact_name = (const char*)mid.primaryArtifact[q].name;
-        int arti_len;
-        int plan_arti_len;
-        CORBA::ULong art_length (plan.artifact.length ());
-
-        if (ref_map.find (artifact_name, arti_len) != 0)
-          {
-            if (plan_ref_map.find (artifact_name, plan_arti_len) != 0)
-              {
-                plan.artifact.length (art_length + 1);
-                plan.artifact[art_length].name = mid.primaryArtifact[q].name;
-                plan.artifact[art_length].node = instance.node;
-                ref_map.bind (artifact_name, art_length);
-                plan_ref_map.bind (artifact_name, art_length);
-                primary_ref_map.bind (artifact_name, art_length);
-                CORBA::ULong art_ref_len (mdd.artifactRef.length ());
-                mdd.artifactRef.length (art_ref_len + 1);
-                mdd.artifactRef[art_ref_len] = art_length;
-                update_artifact_location (pack_iad,
-                                          plan.artifact[art_length]);
-                update_artifact_property (pack_iad,
-                                          plan.artifact[art_length]);
-              }
-            else
-              {
-                art_length = plan_arti_len;
-                ref_map.bind (artifact_name, art_length);
-                primary_ref_map.bind (artifact_name, art_length);
-                CORBA::ULong art_ref_len (mdd.artifactRef.length ());
-                mdd.artifactRef.length (art_ref_len + 1);
-                mdd.artifactRef[art_ref_len] = art_length;
-                update_artifact_location (pack_iad,
-                                          plan.artifact[art_length]);
-                update_artifact_property (pack_iad,
-                                          plan.artifact[art_length]);
-              }
-          }
-        update_common_artifact_and_art_ref (pack_iad,
-                                            primary_ref_map, ref_map,
-                                            art_ref_map, plan_ref_map, mdd,
-                                            plan, instance);
-      }
-  }
-
-  void
-  update_common_artifact_and_art_ref (
-                                      ImplementationArtifactDescription
-                                      &pack_iad,
-                                      REF_MAP &primary_ref_map,
-                                      REF_MAP &ref_map,
-                                      ART_REF_MAP &art_ref_map,
-                                      REF_MAP &plan_ref_map,
-                                      MonolithicDeploymentDescription &mid,
-                                      DeploymentPlan &plan,
-                                      InstanceDeploymentDescription
-                                      &instance)
-  {
-    int plan_arti_len;
-    int arti_len;
-    CORBA::ULong new_art_length;
-    CORBA::ULong deps_len = pack_iad.dependsOn.length ();
-    for (CORBA::ULong g = 0; g < deps_len; ++g)
-      {
-        ACE_TString dep_name =
-          (const char*)pack_iad.dependsOn[g].name;
-
-        if (ref_map.find (dep_name, arti_len) == 0)
-          {
-            if (primary_ref_map.find (dep_name, arti_len) != 0)
-              {
-                if (art_ref_map.find (arti_len, arti_len) != 0)
-                  {
-                    update_impl_art_ref (mid, arti_len);
-                    art_ref_map.bind (arti_len, arti_len);
-                  }
-              }
-          }
-        else
-          {
-            ImplementationArtifactDescription
-              depends_iad = pack_iad.dependsOn[g].
-              referencedArtifact;
-            if (plan_ref_map.find (dep_name, plan_arti_len) != 0)
-              {
-                new_art_length = plan.artifact.length ();
-                plan.artifact.length (new_art_length + 1);
-                plan.artifact[new_art_length].name =
-                  pack_iad.dependsOn[g].name;
-                plan.artifact[new_art_length].node = instance.node;
-                update_artifact_location (depends_iad,
-                                          plan.artifact
-                                          [new_art_length]);
-                ref_map.bind (
-                              (const char*)plan.artifact[new_art_length].name,
-                              new_art_length);
-                plan_ref_map.bind (
-                              (const char*)plan.artifact[new_art_length].name,
-                              new_art_length);
-                update_impl_art_ref (mid, new_art_length);
-                art_ref_map.bind (new_art_length, new_art_length);
-              }
-            else
-              {
-                new_art_length = plan_arti_len;
-                ref_map.bind (
-                              (const char*)plan.artifact[new_art_length].name,
-                              new_art_length);
-                update_impl_art_ref (mid, new_art_length);
-                art_ref_map.bind (new_art_length, new_art_length);
-              }
-          }
-      }
-  }
-
-  void
-  update_config_property (SubcomponentInstantiationDescription &sub_instance,
-                          InstanceDeploymentDescription &instance)
-  {
-    CORBA::ULong pro_len =
-    sub_instance.configProperty.length ();
-
-    for (CORBA::ULong x = 0; x < pro_len; ++x)
-      {
-        CORBA::ULong ins_pro_len (instance.configProperty. length ());
-        instance.configProperty.length (ins_pro_len + 1);
-        instance.configProperty[ins_pro_len]
-          = sub_instance.configProperty[x];
-      }
-  }
-
-  void
-  update_impl_config_property (PackagedComponentImplementation
-                               &impl,
-                               MonolithicDeploymentDescription
-                               &mid,
-
-                                  InstanceDeploymentDescription
-                               &instance)
-  {
-    int update_flag;
-    CORBA::ULong pro_len =
-    impl.referencedImplementation.configProperty.length ();
-
-    for (CORBA::ULong x = 0; x < pro_len; ++x)
-      {
-        update_flag = 1;
-        CORBA::ULong impl_pro_len (mid.execParameter.length ());
-        mid.execParameter.length (impl_pro_len + 1);
-        mid.execParameter[impl_pro_len]
-          = impl.referencedImplementation.configProperty[x];
-        const char* property_name = 
-          impl.referencedImplementation.configProperty[x].name;
-        CORBA::ULong ins_pro_len (instance.configProperty. length ());
-        for (CORBA::ULong y = 0; y < ins_pro_len; ++y)
-          {
-            const char* ins_pro_name = instance.configProperty[y].name;
-            if (ACE_OS::strcmp (ins_pro_name, property_name) == 0)
-              {
-                update_flag = 0;
-                break;
-              }
-          }
-        if (update_flag == 1)
-          {
-            instance.configProperty.length (ins_pro_len + 1);
-            instance.configProperty[ins_pro_len]
-              = impl.referencedImplementation.configProperty[x];
-          }
-      }
-  }
-
-  void
-  update_impl_art_ref (MonolithicDeploymentDescription &mid,
-                       int arti_len)
-  {
-    CORBA::ULong new_art_ref_len (mid.artifactRef.length ());
-    mid.artifactRef.length (new_art_ref_len + 1);
-    mid.artifactRef[new_art_ref_len] = arti_len;
-  }
-
-  void
-  update_artifact_location (ImplementationArtifactDescription
-                            &pack_iad,
-                            ArtifactDeploymentDescription
-                            &plan_artifact)
-  {
-    CORBA::ULong loc_len = pack_iad.location.length ();
-    for (CORBA::ULong e = 0; e < loc_len; ++e)
-      {
-        CORBA::ULong art_loc_len (plan_artifact.location.length ());
-        plan_artifact.location.length (art_loc_len + 1);
-        plan_artifact.location[art_loc_len] = pack_iad.location[e];
-      }
-  }
-
-  void
-  update_artifact_property (ImplementationArtifactDescription
-                            &pack_iad,
-                            ArtifactDeploymentDescription
-                            &plan_artifact)
-  {
-    CORBA::ULong para_len = pack_iad.execParameter.length ();
-    for (CORBA::ULong f = 0; f < para_len; ++f)
-      {
-        CORBA::ULong art_pro_len (plan_artifact.execParameter.length ());
-        plan_artifact.execParameter.length (art_pro_len + 1);
-        plan_artifact.execParameter[art_pro_len] = pack_iad.execParameter[f];
-      }
-  }
-}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
deleted file mode 100644
index 9c3125092fd..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*=======================================================================
- *
- * @file Update_Plan.h
- *
- * $Id$
- *
- * @brief This file contains declarations for helper functions
- * used in updating the deployment plan data structure from
- * PackageConfiguration data structure.
- *
- * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- *
- *======================================================================*/
-
-#ifndef CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H
-#define CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace Deployment
-{
-  struct SubcomponentInstantiationDescription;
-  struct DeploymentPlan;
-  struct ComponentAssemblyDescription;
-  struct SubcomponentInstantiationDescription;
-  struct AssemblyConnectionDescription;
-}
-
-namespace CIAO
-{
-  class Null_Dom_Document { };
-  // exception thrown when we have a null dom document.
-
-  typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-  typedef ACE_Hash_Map_Manager<int, int, ACE_Null_Mutex> ART_REF_MAP;
-
-  void
-  traverse_assembly_instance (Deployment::
-                              SubcomponentInstantiationDescription &instance,
-                              Deployment::DeploymentPlan &plan,
-                              int l,
-                              REF_MAP &ref_map,
-                              REF_MAP &primary_ref_map,
-                              REF_MAP &plan_ref_map);
-
-  void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly,
-                          Deployment::DeploymentPlan &plan,
-                          REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                          REF_MAP &plan_ref_map);
-
-  void traverse_interface (Deployment::SubcomponentInstantiationDescription
-                           &instance,
-                           Deployment::PlanSubcomponentPortEndpoint
-                           &pspe);
-
-  void traverse_assembly_connection (Deployment::ComponentAssemblyDescription
-                                     &assembly,
-                                     Deployment::AssemblyConnectionDescription
-                                     &assembly_connection,
-                                     Deployment::DeploymentPlan &plan);
-
-  void traverse_package (Deployment::PackageConfiguration* &pc,
-                         Deployment::DeploymentPlan &plan,
-                         REF_MAP &ref_map, REF_MAP &primary_ref_map);
-
-  void update_artifacts (Deployment::MonolithicImplementationDescription &mid,
-                         Deployment::DeploymentPlan &plan,
-                         Deployment::InstanceDeploymentDescription &instance,
-                         REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                         ART_REF_MAP &art_ref_map,
-                         REF_MAP &plan_ref_map,
-                         Deployment::MonolithicDeploymentDescription &mdd);
-
-  void update_artifact_location (Deployment::ImplementationArtifactDescription
-                                 &pack_iad,
-                                 Deployment::ArtifactDeploymentDescription
-                                 &plan_artifact);
-
-  void update_artifact_property (Deployment::ImplementationArtifactDescription
-                                 &pack_iad,
-                                 Deployment::ArtifactDeploymentDescription
-                                 &plan_artifact);
-
-  void update_impl_art_ref (Deployment::MonolithicDeploymentDescription
-                            &mid, int art_len);
-
-  void update_impl_config_property (Deployment::
-                                    PackagedComponentImplementation &impl,
-                                    Deployment::
-                                    MonolithicDeploymentDescription &mid,
-                                    Deployment::
-                                    InstanceDeploymentDescription
-                                    &instance);
-
-  void update_config_property (Deployment::
-                               SubcomponentInstantiationDescription
-                               &sub_instance,
-                               Deployment::
-                               InstanceDeploymentDescription
-                               &instance);
-
-  void update_common_artifact_and_art_ref (Deployment::
-                                           ImplementationArtifactDescription &pack_iad,
-                                           REF_MAP &primary_ref_map,
-                                           REF_MAP &ref_map,
-                                           ART_REF_MAP &art_ref_map,
-                                           REF_MAP &plan_ref_map,
-                                           Deployment::MonolithicDeploymentDescription
-                                           &mid,
-                                           Deployment::DeploymentPlan &plan,
-                                           Deployment::
-                                           InstanceDeploymentDescription
-                                           &instance);
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H*/