Remove CIAO/DAnCE here because they are migrated to their own repositories

17 files changed, 0 insertions, 1209 deletions

diff --git a/DAnCE/tools/System_Health/.gitignore b/DAnCE/tools/System_Health/.gitignore
deleted file mode 100644
index a5111f920ab..00000000000
--- a/DAnCE/tools/System_Health/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/SHS_DataModelC.cpp
-/SHS_DataModelC.h
-/SHS_DataModelS.h
-/SystemHealth_stub_export.h
diff --git a/DAnCE/tools/System_Health/Daemon/.gitignore b/DAnCE/tools/System_Health/Daemon/.gitignore
deleted file mode 100644
index 14cc975b264..00000000000
--- a/DAnCE/tools/System_Health/Daemon/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/dance_shs_daemon
-/SHS_Daemon_stub_export.h
-/SHS_DaemonC.cpp
-/SHS_DaemonC.h
-/SHS_DaemonC.inl
-/SHS_DaemonS.cpp
-/SHS_DaemonS.h
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
deleted file mode 100644
index 3f7d6805fe9..00000000000
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "tao/Utils/ORB_Destroyer.h"
-#include "tao/Utils/PolicyList_Destroyer.h"
-#include "orbsvcs/CosNamingC.h"
-#include "dance/Logger/Log_Macros.h"
-#include "dance/Logger/Logger_Service.h"
-#include "dance/DAnCE_Utility.h"
-
-#include "SHS_Daemon_Impl.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DANCE_DISABLE_TRACE ();
-
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service * dlf =
-        ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-
-      DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO
-                    ACE_TEXT("SHS_Deamon - initializing ORB\n")));
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO
-            ACE_TEXT("SHS_Deamon - initializing module instance\n")));
-
-
-      TAO::Utils::ORB_Destroyer safe_orb (orb);
-
-      CORBA::Object_var tmp = orb->resolve_initial_references ("NameService");
-      CosNaming::NamingContext_var domain_nc =
-        CosNaming::NamingContext::_narrow (tmp);
-
-      if (CORBA::is_nil (domain_nc.in ()))
-        {
-          ACE_ERROR ((LM_EMERGENCY,
-            "SHS_Daemon - Unable to register with the"\
-            " CORBA Naming Service\n"));
-          return -1;
-        }
-
-      CORBA::Object_var poa_obj
-        = orb->resolve_initial_references ("RootPOA");
-
-      PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (poa_obj.in ());
-
-      PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      PortableServer::POA_var persistent_poa;
-      TAO::Utils::PolicyList_Destroyer policies (2);
-      policies.length (2);
-      try
-        {
-          DANCE_DEBUG (DANCE_LOG_TRACE, (LM_TRACE,
-            DLINFO ACE_TEXT("SHS_Deamon - ")
-            ACE_TEXT("before creating the \"SHS\" POA.\n")));
-
-          policies[0] = poa->create_id_assignment_policy (
-            PortableServer::USER_ID);
-          policies[1] = poa->create_lifespan_policy (
-            PortableServer::PERSISTENT);
-          persistent_poa = poa->create_POA ("SHS",
-                                            mgr.in(),
-                                            policies);
-        }
-      catch (const PortableServer::POA::AdapterAlreadyExists &)
-        {
-          persistent_poa = poa->find_POA ("Managers", 0);
-        }
-
-      DAnCE::SHS_Daemon_i *shs_daemon (0);
-
-      ACE_NEW_RETURN (shs_daemon,
-                      DAnCE::SHS_Daemon_i (orb.in ()),
-                      0);
-
-      PortableServer::ServantBase_var safe_servant (shs_daemon);
-      PortableServer::ObjectId_var oid =
-        PortableServer::string_to_ObjectId ("SHS_Daemon");
-      persistent_poa->activate_object_with_id (oid, shs_daemon);
-
-      CORBA::Object_var shs_obj = persistent_poa->id_to_reference (oid.in ());
-      CORBA::String_var shs_ior = orb->object_to_string (shs_obj.in ());
-
-      DAnCE::Utility::write_IOR (ACE_TEXT ("SHS_Daemon.ior"),
-                                 shs_ior.in ());
-
-
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = "DAnCE.SystemHealthDaemon";
-
-      domain_nc->rebind (name, shs_obj.in ());
-
-      mgr->activate ();
-      orb->run ();
-
-      DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO
-                       ACE_TEXT("SHS_Daemon - destroying ORB\n")));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("SHS_Daemon");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
-        (LM_ERROR, "SHS_Daemon - Error: Unknown exception.\n"));
-      retval = -1;
-    }
-
-  return retval;
-}
-
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl
deleted file mode 100644
index c78746b093e..00000000000
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef System_Health_Daemon
-#define System_Health_Daemon
-
-#include "System_Health/SHS_DataModel.idl"
-
-module DAnCE
-{
-  module SHS
-  {
-    /**
-     * simple interface to receive system health updates.
-     */
-    interface SHS_Daemon
-    {
-      void update (in Status_Update update);
-      oneway void shutdown ();
-    };
-  };
-};
-
-#endif // System_Health_Daemon
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc
deleted file mode 100644
index 439c4dac37e..00000000000
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc
+++ /dev/null
@@ -1,55 +0,0 @@
-project (DAnCE_SHS_Daemon_idl) : install, dance_shs_stub, gen_ostream {
-  custom_only = 1
-  idlflags     += -Wb,stub_export_macro=SHS_Daemon_STUB_Export \
-                  -Wb,stub_export_include=SHS_Daemon_stub_export.h \
-                  -Gxhst 
-
-  IDL_Files {
-    SHS_Daemon.idl
-  }
-
-  specific {
-    install_dir = tools/System_Health/Daemon
-  }
-}
-
-project (DAnCE_SHS_Daemon_stub) : install, dance_lib, dance_output, gen_ostream, \
-        dance_shs_stub {
-  after += DAnCE_SHS_Daemon_idl
-  dynamicflags += SHS_Daemon_STUB_BUILD_DLL  
-  IDL_Files {
-  }
-
-  Source_Files {
-    SHS_DaemonC.cpp
-  }
-
-  Header_Files {
-    SHS_DaemonC.h
-  }
-
-  specific {
-    install_dir = tools/System_Health/Daemon
-  }
-}
-
-project (DAnCE_SHS_Daemon) : taoserver, dance_deployment_stub, dance_logger, dance_exe, \
-  dance_shs_daemon, utils, dance_stub, naming {
- 
-  exename = dance_shs_daemon
-  dynamicflags += SHS_Daemon_SKEL_BUILD_DLL 
-
-  IDL_Files {
-  }
-
-  Source_Files {
-   SHS_DaemonS.cpp
-   SHS_Daemon.cpp
-   SHS_Daemon_Impl.cpp
-  }
- 
-  Header_Files {
-   SHS_DaemonS.h
-   SHS_Daemon_Impl.h
-  }
-}
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
deleted file mode 100644
index 03ec916dc57..00000000000
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1756
-
-#include "SHS_Daemon_Impl.h"
-
-#include "dance/Logger/Log_Macros.h"
-
-#include <sstream>
-
-namespace DAnCE
-{
-  // Implementation skeleton constructor
-  SHS_Daemon_i::SHS_Daemon_i (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-  {
-    DANCE_TRACE ("SHS_Daemon_i::constructor");
-  }
-
-  // Implementation skeleton destructor
-  SHS_Daemon_i::~SHS_Daemon_i (void)
-  {
-    DANCE_TRACE ("SHS_Daemon_i::destructor");
-  }
-
-  void
-  SHS_Daemon_i::update (const ::DAnCE::SHS::Status_Update & update)
-  {
-    DANCE_TRACE ("SHS_Daemon_i::update");
-
-    DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_DEBUG, DLINFO
-                     ACE_TEXT ("SHS_Daemon_i::update - ")
-                     ACE_TEXT ("Received status update from <%C>\n"),
-                     update.id.in ()));
-
-    std::stringstream str;
-
-    str << "Instance with ID <" << update.id.in () << "> "
-        << "and type <" << update.type.in () << ">: ";
-
-    switch (update.new_status)
-      {
-      case ::DAnCE::SHS::INST_INSTALLED:
-        str << "INSTALLED.";
-        break;
-
-      case ::DAnCE::SHS::INST_ACTIVE:
-        str << "ACTIVE.";
-        break;
-
-      case ::DAnCE::SHS::INST_PASSIVE:
-        str << "PASSIVE.";
-        break;
-
-      case ::DAnCE::SHS::INST_ERROR:
-        str << "ERROR.";
-        break;
-
-      case ::DAnCE::SHS::INST_DEFUNCT:
-        str << "DEFUNCT.";
-        break;
-      }
-
-    std::cerr << str.str () << std::endl;
-  }
-
-  void SHS_Daemon_i::shutdown (void)
-  {
-    DANCE_TRACE ("SHS_Daemon_i::shutdown");
-
-    this->orb_->shutdown ();
-  }
-
-}
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h
deleted file mode 100644
index 45ef2911f28..00000000000
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1698
-
-#ifndef SHS_DAEMONI_SPRPP7_H_
-#define SHS_DAEMONI_SPRPP7_H_
-
-#include "SHS_DaemonS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace DAnCE
-{
-  class SHS_Daemon_i
-    : public virtual POA_DAnCE::SHS::SHS_Daemon
-  {
-  public:
-    // Constructor
-    SHS_Daemon_i (CORBA::ORB_ptr orb);
-
-    // Destructor
-    virtual ~SHS_Daemon_i (void);
-
-    virtual
-      void update (
-                   const ::DAnCE::SHS::Status_Update & update);
-
-    virtual
-      void shutdown (void);
-
-  private:
-    CORBA::ORB_var orb_;
-  };
-}
-
-
-#endif /* SHS_DAEMONI_H_  */
diff --git a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h b/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h
deleted file mode 100644
index 73c1e50435e..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-// Definition for Win32 Export directives.
-// ------------------------------
-#ifndef DANCE_SHS_CORBA_TRANSPORT_EXPORT_H
-#define DANCE_SHS_CORBA_TRANSPORT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_SHS_CORBA_TRANSPORT_HAS_DLL)
-#  define DANCE_SHS_CORBA_TRANSPORT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_SHS_CORBA_TRANSPORT_HAS_DLL */
-
-#if !defined (DANCE_SHS_CORBA_TRANSPORT_HAS_DLL)
-#  define DANCE_SHS_CORBA_TRANSPORT_HAS_DLL 1
-#endif /* ! DANCE_SHS_CORBA_TRANSPORT_HAS_DLL */
-
-#if defined (DANCE_SHS_CORBA_TRANSPORT_HAS_DLL) && (DANCE_SHS_CORBA_TRANSPORT_HAS_DLL == 1)
-#  if defined (DANCE_SHS_CORBA_TRANSPORT_BUILD_DLL)
-#    define DAnCE_SHS_CORBA_Transport_Export ACE_Proper_Export_Flag
-#    define DANCE_SHS_CORBA_TRANSPORT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_SHS_CORBA_TRANSPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_SHS_CORBA_TRANSPORT_BUILD_DLL */
-#    define DAnCE_SHS_CORBA_Transport_Export ACE_Proper_Import_Flag
-#    define DANCE_SHS_CORBA_TRANSPORT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_SHS_CORBA_TRANSPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_SHS_CORBA_TRANSPORT_BUILD_DLL */
-#else /* DANCE_SHS_CORBA_TRANSPORT_HAS_DLL == 1 */
-#  define DAnCE_SHS_CORBA_Transport_Export
-#  define DANCE_SHS_CORBA_TRANSPORT_SINGLETON_DECLARATION(T)
-#  define DANCE_SHS_CORBA_TRANSPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_SHS_CORBA_TRANSPORT_HAS_DLL == 1 */
-
-// Set DANCE_SHS_CORBA_TRANSPORT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_SHS_CORBA_TRANSPORT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_SHS_CORBA_TRANSPORT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_SHS_CORBA_TRANSPORT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_SHS_CORBA_TRANSPORT_NTRACE */
-
-#if (DANCE_SHS_CORBA_TRANSPORT_NTRACE == 1)
-#  define DANCE_SHS_CORBA_TRANSPORT_TRACE(X)
-#else /* (DANCE_SHS_CORBA_TRANSPORT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_SHS_CORBA_TRANSPORT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_SHS_CORBA_TRANSPORT_NTRACE == 1) */
-
-#endif /* DANCE_SHS_CORBA_TRANSPORT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h b/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h
deleted file mode 100644
index 1838f2af118..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-// Definition for Win32 Export directives.
-// ------------------------------
-#ifndef DANCE_SHS_INTERCEPTORS_EXPORT_H
-#define DANCE_SHS_INTERCEPTORS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_SHS_INTERCEPTORS_HAS_DLL)
-#  define DANCE_SHS_INTERCEPTORS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_SHS_INTERCEPTORS_HAS_DLL */
-
-#if !defined (DANCE_SHS_INTERCEPTORS_HAS_DLL)
-#  define DANCE_SHS_INTERCEPTORS_HAS_DLL 1
-#endif /* ! DANCE_SHS_INTERCEPTORS_HAS_DLL */
-
-#if defined (DANCE_SHS_INTERCEPTORS_HAS_DLL) && (DANCE_SHS_INTERCEPTORS_HAS_DLL == 1)
-#  if defined (DANCE_SHS_INTERCEPTORS_BUILD_DLL)
-#    define DAnCE_SHS_Interceptors_Export ACE_Proper_Export_Flag
-#    define DANCE_SHS_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_SHS_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_SHS_INTERCEPTORS_BUILD_DLL */
-#    define DAnCE_SHS_Interceptors_Export ACE_Proper_Import_Flag
-#    define DANCE_SHS_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_SHS_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_SHS_INTERCEPTORS_BUILD_DLL */
-#else /* DANCE_SHS_INTERCEPTORS_HAS_DLL == 1 */
-#  define DAnCE_SHS_Interceptors_Export
-#  define DANCE_SHS_INTERCEPTORS_SINGLETON_DECLARATION(T)
-#  define DANCE_SHS_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_SHS_INTERCEPTORS_HAS_DLL == 1 */
-
-// Set DANCE_SHS_INTERCEPTORS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_SHS_INTERCEPTORS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_SHS_INTERCEPTORS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_SHS_INTERCEPTORS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_SHS_INTERCEPTORS_NTRACE */
-
-#if (DANCE_SHS_INTERCEPTORS_NTRACE == 1)
-#  define DANCE_SHS_INTERCEPTORS_TRACE(X)
-#else /* (DANCE_SHS_INTERCEPTORS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_SHS_INTERCEPTORS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_SHS_INTERCEPTORS_NTRACE == 1) */
-
-#endif /* DANCE_SHS_INTERCEPTORS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
deleted file mode 100644
index ed545410710..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include "SHS_CORBA_Transport.h"
-#include "orbsvcs/CosNamingC.h"
-#include "dance/DAnCE_PropertiesC.h"
-#include "dance/Logger/Log_Macros.h"
-#include "dance/LocalityManager/Scheduler/Plugin_Manager.h"
-
-namespace DAnCE
-{
-  namespace SHS
-  {
-    SHS_CORBA_Transport::SHS_CORBA_Transport (void)
-    {
-      DANCE_TRACE ("SHS_CORBA_Transport::constructor");
-    }
-
-    SHS_CORBA_Transport::~SHS_CORBA_Transport (void)
-    {
-      DANCE_TRACE ("SHS_CORBA_Transport::destructor");
-    }
-
-    void
-    SHS_CORBA_Transport::configure (const Deployment::Properties &props)
-    {
-      DANCE_TRACE ("SHS_CORBA_Transport::configure");
-
-      CosNaming::NamingContext_var ctx;
-
-      for (CORBA::ULong i = 0; i < props.length (); ++i)
-        {
-          DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO
-                                                  ACE_TEXT ("SHS_CORBA_Transport::configure - ")
-                                                  ACE_TEXT ("Considering property <%C>\n"),
-                                                  props[i].name.in ()));
-
-          if ((ACE_OS::strcmp (props[i].name.in (),
-                               DAnCE::LOCALITY_NAMINGCONTEXT) == 0) ||
-              (ACE_OS::strcmp (props[i].name.in (),
-                               DAnCE::INSTANCE_NC) == 0))
-            {
-              DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_DEBUG, DLINFO
-                                                   ACE_TEXT ("SHS_CORBA_Transport::configure - ")
-                                                   ACE_TEXT ("Found property <%C>\n"),
-                                                   props[i].name.in ()));
-
-              CORBA::Object_var obj;
-
-              if (!(props[i].value >>= CORBA::Any::to_object (obj)))
-                {
-                  const char *val;
-                  props[i].value >>= CORBA::Any::to_string (val, 0);
-
-                  CORBA::ORB_var orb =
-                    PLUGIN_MANAGER::instance ()->get_orb ();
-                  obj = orb->string_to_object (val);
-                }
-
-              if (CORBA::is_nil (obj))
-                {
-                  DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_NOTICE, DLINFO
-                                                          ACE_TEXT ("Unable to extract an object reference from ")
-                                                          ACE_TEXT ("property <%C>\n"),
-                                                          props[i].name.in ()));
-                  return;
-                }
-
-              ctx = CosNaming::NamingContext::_narrow (obj.in ());
-              break;
-            }
-        }
-
-      if (CORBA::is_nil (ctx))
-        {
-          DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_NOTICE, DLINFO
-                                                  ACE_TEXT ("SHS_CORBA_Transport::configure - ")
-                                                  ACE_TEXT ("Failed to get a naming context\n")));
-          return;
-        }
-
-      try
-        {
-          CosNaming::Name name (1);
-          name.length (1);
-          name[0].id = "DAnCE.SystemHealthDaemon";
-
-          CORBA::Object_var obj = ctx->resolve (name);
-
-          this->shs_daemon_ = DAnCE::SHS::SHS_Daemon::_narrow (obj.in ());
-
-          if (CORBA::is_nil (this->shs_daemon_))
-            DANCE_ERROR (DANCE_LOG_ERROR, (LM_NOTICE, DLINFO
-                                           ACE_TEXT ("SHS_CORBA_Transport::configure - ")
-                                           ACE_TEXT ("Unable to resolve SHS Daemon\n")));
-        }
-      catch (const CORBA::Exception &ex)
-        {
-          DANCE_ERROR (DANCE_LOG_ERROR, (LM_NOTICE, DLINFO
-                                         ACE_TEXT ("SHS_CORBA_Transport::configure - ")
-                                         ACE_TEXT ("Unable to resolve SHS Daemon: %C\n"),
-                                         ex._info ().c_str ()));
-        }
-      catch (...)
-        {
-          DANCE_ERROR (DANCE_LOG_ERROR,
-                       (LM_NOTICE, DLINFO
-                        ACE_TEXT ("SHS_CORBA_Transport::configure - ")
-                        ACE_TEXT ("Unable to resolve SHS Daemon: Unknown ")
-                        ACE_TEXT ("C++ exception\n")));
-        }
-    }
-
-    void
-    SHS_CORBA_Transport::push_event (const Status_Update &update)
-    {
-      DANCE_TRACE ("SHS_CORBA_Transport::push_event");
-
-      try
-        {
-          if (!CORBA::is_nil (this->shs_daemon_))
-            {
-              this->shs_daemon_->update (update);
-            }
-          else
-            DANCE_DEBUG (DANCE_LOG_ERROR,
-                         (LM_TRACE, DLINFO
-                          ACE_TEXT ("SHS_CORBA_Transport::push_event - ")
-                          ACE_TEXT ("Unable to publish SHS status update, ")
-                          ACE_TEXT (" nil daemon ref\n")));
-
-        }
-      catch (const CORBA::Exception &ex)
-        {
-          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO
-                                         ACE_TEXT ("SHS_CORBA_Transport::push_event - ")
-                                         ACE_TEXT ("Caught CORBA Exception: <%C>\n"),
-                                         ex._info ().c_str ()));
-        }
-      catch (...)
-        {
-          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO
-                                         ACE_TEXT ("SHS_CORBA_Transport::push_event - ")
-                                         ACE_TEXT ("Caught C++ Exception\n")));
-        }
-    }
-  }
-}
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h
deleted file mode 100644
index ca610983509..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file SHS_CORBA_Transport.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef SHS_CORBA_TRANSPORT_H
-#define SHS_CORBA_TRANSPORT_H
-
-#include "System_Health/Interceptors/SHS_Transport.h"
-#include "System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h"
-#include "System_Health/Daemon/SHS_DaemonC.h"
-
-namespace DAnCE
-{
-  namespace SHS
-  {
-    class DAnCE_SHS_CORBA_Transport_Export SHS_CORBA_Transport :
-      public virtual SHS_Transport
-    {
-    public:
-      SHS_CORBA_Transport (void);
-
-      virtual ~SHS_CORBA_Transport (void);
-
-      virtual void configure (const Deployment::Properties &);
-
-      virtual void push_event (const Status_Update &update);
-    private:
-      DAnCE::SHS::SHS_Daemon_var shs_daemon_;
-    };
-  }
-}
-#endif
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
deleted file mode 100644
index b0ad48a1551..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-#include "SHS_Interceptor.h"
-#include "dance/Deployment/Deployment_StartErrorC.h"
-#include "dance/DAnCE_PropertiesC.h"
-#include "dance/DAnCE_Utility.h"
-#include "dance/Logger/Log_Macros.h"
-#include "System_Health/SHS_DataModelC.h"
-#include "System_Health/Interceptors/SHS_CORBA_Transport.h"
-
-namespace DAnCE
-{
-  // Implementation skeleton constructor
-  SHS_Interceptor::SHS_Interceptor (void)
-  {
-  }
-
-  // Implementation skeleton destructor
-  SHS_Interceptor::~SHS_Interceptor (void)
-  {
-  }
-
-  void
-  SHS_Interceptor::configure (const ::Deployment::Properties &props )
-  {
-    DAnCE::SHS::SHS_Transport *tmp (0);
-
-    ACE_NEW_THROW_EX (tmp,
-                      SHS::SHS_CORBA_Transport (),
-                      CORBA::NO_MEMORY ());
-
-    this->shs_transport_.reset (tmp);
-
-    this->shs_transport_->configure (props);
-  }
-
-  void
-  SHS_Interceptor::post_install (const ::Deployment::DeploymentPlan &plan,
-                                 ::CORBA::ULong index,
-                                 const ::CORBA::Any &reference,
-                                 const ::CORBA::Any &exception)
-  {
-    ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
-
-    update.id = plan.instance[index].name.in ();
-    update.type =
-      DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
-    CORBA::ULong idx (0);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
-        update.new_status = DAnCE::SHS::INST_ERROR;
-        update.instance_info.length (idx + 1);
-        update.instance_info[idx].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[idx].value <<= CORBA::Any::from_string (result.c_str (), 0);
-
-        ++idx;
-      }
-    else
-      {
-        update.new_status = DAnCE::SHS::INST_INSTALLED;
-      }
-
-    update.instance_info.length (idx + 1);
-    update.instance_info[idx].name = ::DAnCE::SHS::Constants::SHS_INSTANCE_REF;
-    update.instance_info[idx].value = reference;
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-
-  void
-  SHS_Interceptor::post_connect (const ::Deployment::DeploymentPlan &plan,
-                                 ::CORBA::ULong connection,
-                                 const ::CORBA::Any &exception)
-  {
-    ::DAnCE::SHS::Status_Update update;
-    const ::Deployment::PlanConnectionDescription &pcd = plan.connection[connection];
-    update.id = pcd.name.in ();
-    update.type = DAnCE::SHS::Constants::SHS_CONNECTION;
-    CORBA::ULong info_idx (0);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception, result);
-
-        update.new_status = DAnCE::SHS::INST_ERROR;
-        update.instance_info.length (info_idx + 1);
-        update.instance_info[info_idx].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[info_idx].value <<= CORBA::Any::from_string (result.c_str (), 0);
-        ++info_idx;
-      }
-    else
-      {
-        update.new_status = DAnCE::SHS::INST_ACTIVE;
-      }
-
-    for (CORBA::ULong i = 0; i < pcd.internalEndpoint.length (); ++i)
-      {
-        std::string id (plan.instance[pcd.internalEndpoint[i].instanceRef].name.in ());
-        id += ':';
-        id += pcd.internalEndpoint[i].portName.in ();
-
-        update.instance_info.length (info_idx + 1);
-
-        if (pcd.internalEndpoint[i].provider)
-          {
-            update.instance_info[info_idx].name = DAnCE::SHS::Constants::SHS_CONN_PROVIDER;
-          }
-        else
-          {
-            update.instance_info[info_idx].name = DAnCE::SHS::Constants::SHS_CONN_RECIPIENT;
-          }
-
-        update.instance_info[info_idx].value <<= CORBA::Any::from_string (id.c_str (), 0);
-        ++info_idx;
-      }
-
-    for (CORBA::ULong i = 0; i < pcd.externalEndpoint.length (); ++i)
-      {
-        update.instance_info.length (info_idx + 1);
-        update.instance_info[info_idx].name = DAnCE::SHS::Constants::SHS_CONN_EXTERNAL_ENDPOINT;
-        update.instance_info[info_idx].value <<= pcd.externalEndpoint[i];
-        ++info_idx;
-      }
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-
-  void
-  SHS_Interceptor::post_configured (const ::Deployment::DeploymentPlan & plan,
-                                    ::CORBA::ULong index,
-                                    const ::CORBA::Any &exception )
-  {
-    ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
-
-    update.id = plan.instance[index].name.in ();
-    update.type =
-      DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
-
-        update.new_status = DAnCE::SHS::INST_ERROR;
-        update.instance_info.length (1);
-        update.instance_info[0].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[0].value <<= CORBA::Any::from_string (result.c_str (), 0);
-      }
-    else
-      {
-        update.new_status = DAnCE::SHS::INST_PASSIVE;
-      }
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-
-
-  void
-  SHS_Interceptor::post_activate (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong index,
-                                  const ::CORBA::Any & exception)
-  {
-    ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
-
-    update.id = plan.instance[index].name.in ();
-    update.type =
-      DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
-
-        update.new_status = DAnCE::SHS::INST_ERROR;
-        update.instance_info.length (1);
-        update.instance_info[0].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[0].value <<= CORBA::Any::from_string (result.c_str (), 0);
-      }
-    else
-      {
-        update.new_status = DAnCE::SHS::INST_ACTIVE;
-      }
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-
-
-  void
-  SHS_Interceptor::post_passivate (const ::Deployment::DeploymentPlan & plan,
-                                   ::CORBA::ULong index,
-                                   const ::CORBA::Any & exception)
-  {
-    ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
-
-    update.id = plan.instance[index].name.in ();
-    update.type =
-      DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
-
-        update.new_status = DAnCE::SHS::INST_ERROR;
-        update.instance_info.length (1);
-        update.instance_info[0].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[0].value <<= CORBA::Any::from_string (result.c_str (), 0);
-      }
-    else
-      {
-        update.new_status = DAnCE::SHS::INST_PASSIVE;
-      }
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-
-
-  void
-  SHS_Interceptor::post_remove (const ::Deployment::DeploymentPlan & plan,
-                                ::CORBA::ULong index,
-                                const ::CORBA::Any & exception)
-  {
-    ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
-
-    update.id = plan.instance[index].name.in ();
-    update.type =
-      DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
-
-        update.new_status = DAnCE::SHS::INST_ERROR;
-        update.instance_info.length (1);
-        update.instance_info[0].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[0].value <<= CORBA::Any::from_string (result.c_str (), 0);
-      }
-    else
-      {
-        update.new_status = DAnCE::SHS::INST_DEFUNCT;
-      }
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-
-  void
-  SHS_Interceptor::unexpected_event (const ::Deployment::DeploymentPlan & plan,
-                                     ::CORBA::ULong index,
-                                     const ::CORBA::Any & exception,
-                                     const char *error)
-  {
-    ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
-
-    update.id = plan.instance[index].name.in ();
-    update.type =
-      DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
-
-    update.new_status = DAnCE::SHS::INST_ERROR;
-    CORBA::ULong pos (0);
-
-    if (exception.type() != ::CORBA::_tc_null)
-      {
-        std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
-
-        update.instance_info.length (pos + 1);
-        update.instance_info[pos].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[pos].value <<= CORBA::Any::from_string (result.c_str (), 0);
-        ++pos;
-      }
-
-    if (error)
-      {
-        update.instance_info.length (pos + 1);
-        update.instance_info[pos].name = ::DAnCE::SHS::Constants::SHS_DIAGNOSTIC;
-        update.instance_info[pos].value <<= CORBA::Any::from_string (error, 0);
-        ++pos;
-      }
-
-    if (this->shs_transport_.get ())
-      this->shs_transport_->push_event (update);
-  }
-}
-
-extern "C"
-{
-  ::DAnCE::DeploymentInterceptor_ptr
-  create_DAnCE_SHS_Interceptor (void)
-  {
-    return new DAnCE::SHS_Interceptor ();
-  }
-}
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
deleted file mode 100644
index a0e1bdcaf3c..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @file SHS_Interceptor.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- *
- * Interceptors which implement a Best Effort error handling mechanism.
- */
-
-#ifndef DEPLOYMENT_INTERCEPTORS_H
-#define DEPLOYMENT_INTERCEPTORS_H
-
-#include "dance/DAnCE_DeploymentInterceptors_Base_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "tao/LocalObject.h"
-#include "DAnCE_SHS_Interceptors_export.h"
-
-#include "System_Health/Interceptors/SHS_Transport.h"
-
-namespace DAnCE
-{
-  class DAnCE_SHS_Interceptors_Export SHS_Interceptor
-    : public virtual DAnCE::DeploymentInterceptor_Base
-  {
-  public:
-    // Constructor
-
-    SHS_Interceptor (void);
-
-    // Destructor
-    virtual ~SHS_Interceptor (void);
-
-    virtual
-      void post_install (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong index,
-                                  const ::CORBA::Any & reference,
-                                  const ::CORBA::Any & exception_thrown);
-
-    virtual
-      void post_connect (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong connectionRef,
-                                  const ::CORBA::Any & exceptionThrown);
-
-
-    virtual
-      void post_configured (const ::Deployment::DeploymentPlan & plan,
-                                     ::CORBA::ULong instanceRef,
-                                     const ::CORBA::Any & exception_thrown);
-
-    virtual
-      void post_activate (const ::Deployment::DeploymentPlan & plan,
-                                   ::CORBA::ULong instanceRef,
-                                   const ::CORBA::Any & exception_thrown);
-
-    virtual
-      void post_passivate (const ::Deployment::DeploymentPlan & plan,
-                                    ::CORBA::ULong instanceRef,
-                                    const ::CORBA::Any & exception_thrown);
-
-    virtual
-      void post_remove (const ::Deployment::DeploymentPlan & plan,
-                                 ::CORBA::ULong instanceRef,
-                                 const ::CORBA::Any & exception_thrown);
-    virtual
-      void configure(const Deployment::Properties&);
-
-    virtual
-      void unexpected_event (const ::Deployment::DeploymentPlan & plan,
-                             ::CORBA::ULong index,
-                             const ::CORBA::Any & exception_thrown,
-                             const char *error);
-
-  private:
-    auto_ptr <DAnCE::SHS::SHS_Transport> shs_transport_;
-  };
-}
-
-extern "C"
-{
-  ::DAnCE::DeploymentInterceptor_ptr
-  DAnCE_SHS_Interceptors_Export create_DAnCE_SHS_Interceptor (void);
-}
-
-#endif
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
deleted file mode 100644
index c4529dc9bc5..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
+++ /dev/null
@@ -1,37 +0,0 @@
-project (DAnCE_SHS_CORBA_Transport) : install, dance_lib, dance_output, dance_logger, \
-        dance_shs_daemon, naming, dance_deployment_scheduler {
-  
-   dynamicflags += DANCE_SHS_CORBA_TRANSPORT_BUILD_DLL
-
-   Source_Files {
-     SHS_CORBA_Transport.cpp
-   }
-
-   Header_Files {
-     SHS_Transport.h
-     SHS_CORBA_Transport.h   
-   }
-
-   specific {
-     install_dir = tools/System_Health/Interceptors
-   }
-}
-
-project (DAnCE_SHS_Interceptors) : install, dance_skel, dance_lib, dance_output, dance_logger, \
-        dance_shs_daemon, naming {
-   dynamicflags += DANCE_SHS_INTERCEPTORS_BUILD_DLL
-   after += DAnCE_SHS_CORBA_Transport
-   libs += DAnCE_SHS_CORBA_Transport
-
-   Source_Files {
-     SHS_Interceptor.cpp
-   }
-
-   Header_Files {
-     SHS_Interceptor.h
-   }
-
-   specific {
-     install_dir = tools/System_Health/Interceptors
-   }
-}
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
deleted file mode 100644
index 0afe322defa..00000000000
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file SHS_Transport.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- *
- * Abstraction for selecting the transport that SHS updates go over.
- */
-
-#ifndef SHS_TRANSPORT_H
-#define SHS_TRANSPORT_H
-
-#include /**/ "ace/pre.h"
-
-#include "dance/Deployment/Deployment_DeploymentPlanC.h"
-#include "System_Health/SHS_DataModelC.h"
-
-namespace DAnCE
-{
-  namespace SHS
-  {
-    class SHS_Transport
-    {
-    public:
-      virtual ~SHS_Transport (void) {}
-
-      virtual void configure (const Deployment::Properties &) = 0;
-
-      virtual void push_event (const Status_Update &update) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif
diff --git a/DAnCE/tools/System_Health/SHS_DataModel.idl b/DAnCE/tools/System_Health/SHS_DataModel.idl
deleted file mode 100644
index 135cc491358..00000000000
--- a/DAnCE/tools/System_Health/SHS_DataModel.idl
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef SHS_DataModel_IDL
-#define SHS_DataModel_IDL
-
-#include "dance/Deployment/Deployment_Base.idl"
-
-module DAnCE
-{
-  module SHS
-  {
-    module Constants
-    {
-      /// Diagnostic message
-      const string SHS_DIAGNOSTIC = "edu.vanderbilt.dre.DAnCE.SHS.Diagnostic";
-      /// Process ID
-      const string SHS_PID = "edu.vanderbilt.dre.DAnCE.SHS.PID";
-      /// Process or thread priority
-      const string SHS_PRIORITY = "edu.vanderbilt.dre.DAnCE.SHS.Priority";
-      /// Process affinity mask
-      const string SHS_AFFINITY = "edu.vanderbilt.dre.DAnCE.SHS.Affinity";
-      /// Number of threads configured with the reactor
-      const string SHS_TPOOL = "edu.vanderbilt.dre.DAnCE.SHS.ThreadPool";
-      /// IDs of hosted instances
-      const string SHS_HOSTED_INSTANCES = "edu.vanderbilt.dre.DAnCE.SHS.HostedInstances";
-
-      /********** INSTANCE META DATA **********/
-      /// Memory footprint of the instance
-      const string SHS_MEM_FP = "edu.vanderbilt.dre.DAnCE.SHS.MemoryFootprint";
-      /// Reference to instance (Appropriate reference type)
-      const string SHS_INSTANCE_REF = "edu.vanderbilt.dre.DAnCE.SHS.InstanceReference";
-      /// Sequence of properties found in the deployment plan.
-
-      /********** CONNECTION META DATA **********/
-      /// Instance type indicating a connection status update
-      const string SHS_CONNECTION = "edu.vanderbilt.dre.DAnCE.SHS.Connection";
-      /// ID of 'provider' instance, if present (string, format component_id:port_name)
-      const string SHS_CONN_PROVIDER = "edu.vanderbilt.dre.DAnCE.SHS.Connection.Provider";
-      /// ID of non-'provider' instance, if present (string, format component_id:port_name)
-      const string SHS_CONN_RECIPIENT =  "edu.vanderbilt.dre.DAnCE.SHS.Connection.Recipient";
-      /// Connection type (appropriate port kind, e.g. CCMComponentPortKind)
-      const string SHS_CONN_PORT_KIND = "edu.vanderbilt.dre.DAnCE.SHS.Connection.Kind";
-      /// External endpoint (::Deployment::ExternalReferenceEndpoint)
-      const string SHS_CONN_EXTERNAL_ENDPOINT = "edu.vanderbilt.dre.DAnCE.SHS.Connection.ExternalEndpoint";
-    };
-
-    /// Enumberation describing liveness status of event
-    enum Instance_Status
-    {
-      /**
-       * The instance has been loaded into memory
-       */
-      INST_INSTALLED,
-      /**
-       * The process or element is actively executing
-       */
-      INST_ACTIVE,
-      /**
-       * The process or element is loaded in memory but not active.
-       */
-      INST_PASSIVE,
-      /**
-       * The process or element encountered an error condition
-       */
-      INST_ERROR,
-      /**
-       * The process or element is now defunct
-       */
-      INST_DEFUNCT
-    };
-
-    struct Status_Update
-    {
-      /// Name assigned to instance
-      string id;
-
-      /// Instance type
-      string type;
-
-      /// New status of instance
-      Instance_Status new_status;
-
-      /// Additional information about instance
-      ::Deployment::Properties instance_info;
-    };
-  };
-};
-
-#endif
diff --git a/DAnCE/tools/System_Health/System_Health.mpc b/DAnCE/tools/System_Health/System_Health.mpc
deleted file mode 100644
index 9ecc100ffa6..00000000000
--- a/DAnCE/tools/System_Health/System_Health.mpc
+++ /dev/null
@@ -1,36 +0,0 @@
-project (DAnCE_System_Health) : install, dance_deployment_stub, dance_output, gen_ostream {
-  custom_only = 1
-  idlflags     += -Wb,stub_export_macro=SystemHealth_STUB_Export \
-                  -Wb,stub_export_include=SystemHealth_stub_export.h \
-                  -SS -Sci -Gxhst
-
-  IDL_Files {
-    SHS_DataModel.idl
-  }
-
-  specific {
-    install_dir = tools/System_Health
-  }
-}
-
-project (DAnCE_System_Health_stub) : install, dance_lib, dance_output, gen_ostream, \
-        dance_deployment_stub {
-  after += DAnCE_System_Health
-  dynamicflags += SystemHealth_STUB_BUILD_DLL  
-  includes += $(DANCE_ROOT)/tools
-  IDL_Files {
-  }
-
-  Source_Files {
-    SHS_DataModelC.cpp
-  }
-
-  Header_Files {
-    SHS_DataModelC.h
-    SystemHealth_stub_export.h
-  }
-
-  specific {
-    install_dir = tools/System_Health
-  }
-}