ChangeLogTag: Fri Feb 27 18:12:13 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

12 files changed, 236 insertions, 46 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 5da5c64db86..4ec1f11cff7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri Feb 27 18:12:13 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * DAnCE/Deployment/FaultCorrelationManager.idl
+        * DAnCE/Deployment/DAnCE_Core.mpc:
+        * DAnCE/Interfaces/FaultCorrelationManager.idl        
+        * DAnCE/Interfaces/Interfaces.mpc
+        * DAnCE/Interfaces/FaultCorrelationManager_svnt_export.h
+        * DAnCE/Interfaces/FaultCorrelationManager_stub_export.h
+
+          Moved idl file to Interfaces directory.
+
+        * DAnCE/tests/FaultCorrelation/proc_failure.mpc
+        * DAnCE/tests/FaultCorrelation/proc_failure.cpp
+        * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h
+        * DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc
+        * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
+        * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp
+        
+          Adjusted libraries and includes.
+        
 Fri Feb 27 15:40:10 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * DAnCE/tests/FaultCorrelation
diff --git a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
index 24d578fe2da..7287d1c3587 100644
--- a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
+++ b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
@@ -116,29 +116,3 @@ project(Deployment_svnt) : dance_deployment_stub, ciao_output, ciaolib_with_idl,
   }
 
 }
-
-project(FCM) : ciaolib_with_idl, ciao_output, valuetype, ifr_client, messaging, dance_lib, dance_logger, gen_ostream, lwft_client {
-  after += Deployment_svnt
-  libs += DAnCE_Deployment_svnt DAnCE_Deployment_stub
-  sharedname   =  FCM
-
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  dynamicflags += DEPLOYMENT_STUB_BUILD_DLL
-
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
-  idlflags     += -Wb,skel_export_macro=Deployment_stub_Export
-  idlflags     += -Wb,skel_export_include=Deployment_stub_export.h
-
-  
-  IDL_Files {
-    FaultCorrelationManager.idl
-  }
-
-  Source_Files {
-    FaultCorrelationManagerC.cpp
-    FaultCorrelationManagerS.cpp
-  }
-}
diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc
index 642de59dfc2..e18f54862de 100644
--- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc
+++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc
@@ -1,11 +1,10 @@
-project(FaultCorrelationManager_Module) : dance_lib, dance_deployment_svnt, dance_deployment_stub, naming_serv, lwft_client, utils {
+project(FaultCorrelationManager_Module) : dance_lib, dance_deployment_svnt, naming_serv, lwft_client, utils {
   sharedname = FaultCorrelationManager
-  libs += FCM
+  libs += DAnCE_FaultCorrelationManager_svnt
 
   dynamicflags = FAULTCORRELATIONMANAGER_BUILD_DLL FAULTCORRELATIONMANAGER_MODULE_BUILD_DLL
 
   Source_Files {
-    // FaultCorrelation_Task.cpp
     FaultCorrelationManager_Impl.cpp
     FaultCorrelationManager_Module.cpp
   }
diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
index bee76bd073e..eb30cf7ad7b 100644
--- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
+++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
@@ -52,7 +52,7 @@ namespace DAnCE
                      node) != 0)
       {
         DANCE_DEBUG ((LM_WARNING,
-                      "FCM::proc_failure (%C,%C): node '%C' not found.\n",
+                      "FCM::proc_failure (%C, %C): node '%C' not found.\n",
                       object_id,
                       node_id,
                       node_id));
@@ -64,7 +64,7 @@ namespace DAnCE
     if (component_id.length () == 0)
       {
         DANCE_DEBUG ((LM_WARNING,
-                      "FCM::proc_failure (%C,%C): "
+                      "FCM::proc_failure (%C, %C): "
                       "object_id '%C' on '%C' not found.\n",
                       object_id,
                       node_id,
@@ -78,7 +78,7 @@ namespace DAnCE
                          plan_id) != 0)
       {
         DANCE_DEBUG ((LM_WARNING,
-                      "FCM::proc_failure (%C,%C): "
+                      "FCM::proc_failure (%C, %C): "
                       "plan for component '%C' not found.\n",
                       object_id,
                       node_id,
@@ -93,6 +93,44 @@ namespace DAnCE
                   node_id,
                   component_id.c_str (),
                   plan_id.c_str ()));
+
+    try
+      {
+        Deployment::DomainApplicationManager_var dam;
+
+        if (dams_.find (plan_id.c_str (),
+                        dam) != 0)
+          {
+            DANCE_DEBUG ((LM_TRACE, 
+                          "FCM::proc_failure (%C, %C): "
+                          "could not resolce DAM for plan '%C'.\n",
+                          object_id,
+                          node_id,
+                          plan_id.c_str ()));
+          }
+
+        Deployment::Applications_var apps = dam->getApplications();
+
+        for (size_t i = 0; i < apps->length(); ++i)
+          {
+            dam->destroyApplication(apps[i]);
+          }
+
+        exec_mgr_->destroyManager (dam.in ());
+
+        DANCE_DEBUG ((LM_TRACE, 
+                      "FCM::proc_failure (%C, %C): "
+                      "plan '%C' was shutdown sucessfully.\n",
+                      object_id,
+                      node_id,
+                      plan_id.c_str ()));
+      }
+    catch (const CORBA::Exception & ex)
+      {
+        DANCE_DEBUG ((LM_ERROR,
+                      "FCM::proc_failure caught %n",
+                      ex._info ().c_str ()));
+      }
   }
 
   ::Deployment::DomainApplicationManager_ptr
@@ -103,7 +141,8 @@ namespace DAnCE
     Deployment::DomainApplicationManager_var dam =
       exec_mgr_->preparePlan (plan, resourceCommitment);
 
-    dams_.bind (plan.UUID.in(), dam.in ());
+    dams_.bind (plan.UUID.in(), 
+                Deployment::DomainApplicationManager::_duplicate (dam.in ()));
 
     this->process_deployment_plan (plan);
 
diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h
index d61db64a001..71042894ddd 100644
--- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h
+++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h
@@ -17,7 +17,7 @@
 #include "ace/Map_Manager.h"
 #include "tao/ORB.h"
 #include "FaultCorrelationManager_export.h"
-#include "Deployment/FaultCorrelationManagerS.h"
+#include "Interfaces/FaultCorrelationManagerS.h"
 #include "Deployment/Deployment_common.h"
 #include "Deployment/Deployment_ExecutionManagerC.h"
 //#include "Deployment/Deployment_DomainApplicationManagerC.h"
@@ -29,7 +29,7 @@ namespace DAnCE
    *         for component deployments.
    */
   class FAULTCORRELATIONMANAGER_Export FaultCorrelationManager_Impl : 
-    public virtual POA_FTDeployment::FaultCorrelationManager
+    public virtual POA_DAnCE::FaultCorrelationManager
   {
   public:
     // the fixed listener port is caused by the usage of CCM Object locator
diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp
index 7d776c05c48..469ba53dfcd 100644
--- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp
+++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp
@@ -26,7 +26,7 @@ const char * FCM_OID = "FaultCorrelationManager";
 
 namespace DAnCE
 {
-  namespace FaultCorrelationManager
+  namespace FCM
   {
     bool
     write_IOR (const ACE_TCHAR * ior_file_name, const char* ior)
@@ -270,7 +270,7 @@ FaultCorrelationManager_Module::create_object (CORBA::ORB_ptr orb,
               if (0 != this->options_.process_ns_file_)
                 {
                   CORBA::String_var ior = orb->object_to_string (naming_obj.in ());
-                  DAnCE::FaultCorrelationManager::write_IOR (this->options_.process_ns_file_, ior.in ());
+                  DAnCE::FCM::write_IOR (this->options_.process_ns_file_, ior.in ());
                 }
               plan_nc = CosNaming::NamingContext::_narrow (naming_obj.in ());
               if (CORBA::is_nil (plan_nc.in ()))
@@ -362,7 +362,7 @@ FaultCorrelationManager_Module::create_object (CORBA::ORB_ptr orb,
       // Writing ior to file
       DANCE_DEBUG ((LM_TRACE,  DLINFO "FaultCorrelationManager_Module::create_object - "
                     "Writing node IOR %C to file %C.\n", ior.in (), fcm_file.c_str ()));
-          if (!DAnCE::FaultCorrelationManager::write_IOR (fcm_file.c_str (), ior.in ()))
+          if (!DAnCE::FCM::write_IOR (fcm_file.c_str (), ior.in ()))
             DANCE_ERROR ((LM_ERROR, DLINFO "FaultCorrelationManager_Module::create_object - "
                           "Error: Unable to write IOR to file %C\n",
                           fcm_file.c_str ()));
diff --git a/CIAO/DAnCE/Deployment/FaultCorrelationManager.idl b/CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl
index f559c9f3823..4e911491017 100644
--- a/CIAO/DAnCE/Deployment/FaultCorrelationManager.idl
+++ b/CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl
@@ -4,10 +4,10 @@
 #define FAULTCORRELATIONMANAGER_IDL
 
 #include "orbsvcs/orbsvcs/LWFT/FaultNotification.idl"
-#include "Deployment_ExecutionManager.idl"
-
-module FTDeployment {
+#include "DAnCE/Deployment/Deployment_ExecutionManager.idl"
 
+module DAnCE 
+{
   interface FaultCorrelationManager : FLARE::FaultNotification, Deployment::ExecutionManager {
     void stop_failver_unit (in string fou_id);
   };
diff --git a/CIAO/DAnCE/Interfaces/FaultCorrelationManager_stub_export.h b/CIAO/DAnCE/Interfaces/FaultCorrelationManager_stub_export.h
new file mode 100644
index 00000000000..1d09e0fba96
--- /dev/null
+++ b/CIAO/DAnCE/Interfaces/FaultCorrelationManager_stub_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl FaultCorrelationManager_stub
+// ------------------------------
+#ifndef FAULTCORRELATIONMANAGER_STUB_EXPORT_H
+#define FAULTCORRELATIONMANAGER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FAULTCORRELATIONMANAGER_STUB_HAS_DLL)
+#  define FAULTCORRELATIONMANAGER_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FAULTCORRELATIONMANAGER_STUB_HAS_DLL */
+
+#if !defined (FAULTCORRELATIONMANAGER_STUB_HAS_DLL)
+#  define FAULTCORRELATIONMANAGER_STUB_HAS_DLL 1
+#endif /* ! FAULTCORRELATIONMANAGER_STUB_HAS_DLL */
+
+#if defined (FAULTCORRELATIONMANAGER_STUB_HAS_DLL) && (FAULTCORRELATIONMANAGER_STUB_HAS_DLL == 1)
+#  if defined (FAULTCORRELATIONMANAGER_STUB_BUILD_DLL)
+#    define FaultCorrelationManager_stub_Export ACE_Proper_Export_Flag
+#    define FAULTCORRELATIONMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define FAULTCORRELATIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* FAULTCORRELATIONMANAGER_STUB_BUILD_DLL */
+#    define FaultCorrelationManager_stub_Export ACE_Proper_Import_Flag
+#    define FAULTCORRELATIONMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define FAULTCORRELATIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* FAULTCORRELATIONMANAGER_STUB_BUILD_DLL */
+#else /* FAULTCORRELATIONMANAGER_STUB_HAS_DLL == 1 */
+#  define FaultCorrelationManager_stub_Export
+#  define FAULTCORRELATIONMANAGER_STUB_SINGLETON_DECLARATION(T)
+#  define FAULTCORRELATIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* FAULTCORRELATIONMANAGER_STUB_HAS_DLL == 1 */
+
+// Set FAULTCORRELATIONMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (FAULTCORRELATIONMANAGER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define FAULTCORRELATIONMANAGER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define FAULTCORRELATIONMANAGER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !FAULTCORRELATIONMANAGER_STUB_NTRACE */
+
+#if (FAULTCORRELATIONMANAGER_STUB_NTRACE == 1)
+#  define FAULTCORRELATIONMANAGER_STUB_TRACE(X)
+#else /* (FAULTCORRELATIONMANAGER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define FAULTCORRELATIONMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (FAULTCORRELATIONMANAGER_STUB_NTRACE == 1) */
+
+#endif /* FAULTCORRELATIONMANAGER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Interfaces/FaultCorrelationManager_svnt_export.h b/CIAO/DAnCE/Interfaces/FaultCorrelationManager_svnt_export.h
new file mode 100644
index 00000000000..332bba5be2d
--- /dev/null
+++ b/CIAO/DAnCE/Interfaces/FaultCorrelationManager_svnt_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl FaultCorrelationManager_svnt
+// ------------------------------
+#ifndef FAULTCORRELATIONMANAGER_SVNT_EXPORT_H
+#define FAULTCORRELATIONMANAGER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FAULTCORRELATIONMANAGER_SVNT_HAS_DLL)
+#  define FAULTCORRELATIONMANAGER_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FAULTCORRELATIONMANAGER_SVNT_HAS_DLL */
+
+#if !defined (FAULTCORRELATIONMANAGER_SVNT_HAS_DLL)
+#  define FAULTCORRELATIONMANAGER_SVNT_HAS_DLL 1
+#endif /* ! FAULTCORRELATIONMANAGER_SVNT_HAS_DLL */
+
+#if defined (FAULTCORRELATIONMANAGER_SVNT_HAS_DLL) && (FAULTCORRELATIONMANAGER_SVNT_HAS_DLL == 1)
+#  if defined (FAULTCORRELATIONMANAGER_SVNT_BUILD_DLL)
+#    define FaultCorrelationManager_svnt_Export ACE_Proper_Export_Flag
+#    define FAULTCORRELATIONMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define FAULTCORRELATIONMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* FAULTCORRELATIONMANAGER_SVNT_BUILD_DLL */
+#    define FaultCorrelationManager_svnt_Export ACE_Proper_Import_Flag
+#    define FAULTCORRELATIONMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define FAULTCORRELATIONMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* FAULTCORRELATIONMANAGER_SVNT_BUILD_DLL */
+#else /* FAULTCORRELATIONMANAGER_SVNT_HAS_DLL == 1 */
+#  define FaultCorrelationManager_svnt_Export
+#  define FAULTCORRELATIONMANAGER_SVNT_SINGLETON_DECLARATION(T)
+#  define FAULTCORRELATIONMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* FAULTCORRELATIONMANAGER_SVNT_HAS_DLL == 1 */
+
+// Set FAULTCORRELATIONMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (FAULTCORRELATIONMANAGER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define FAULTCORRELATIONMANAGER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define FAULTCORRELATIONMANAGER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !FAULTCORRELATIONMANAGER_SVNT_NTRACE */
+
+#if (FAULTCORRELATIONMANAGER_SVNT_NTRACE == 1)
+#  define FAULTCORRELATIONMANAGER_SVNT_TRACE(X)
+#else /* (FAULTCORRELATIONMANAGER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define FAULTCORRELATIONMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (FAULTCORRELATIONMANAGER_SVNT_NTRACE == 1) */
+
+#endif /* FAULTCORRELATIONMANAGER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Interfaces/Interfaces.mpc b/CIAO/DAnCE/Interfaces/Interfaces.mpc
index 9917cda96b3..9729275226c 100644
--- a/CIAO/DAnCE/Interfaces/Interfaces.mpc
+++ b/CIAO/DAnCE/Interfaces/Interfaces.mpc
@@ -61,3 +61,45 @@ project (DAnCE_NodeManager_svnt): dance_lib, messaging, dance_deployment_svnt, d
    NodeManagerDaemonS.cpp
   }
 }
+
+project (DAnCE_FaultCorrelationManager_idl): ciaoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags     += -Wb,stub_export_macro=FaultCorrelationManager_stub_Export
+  idlflags     += -Wb,stub_export_include=FaultCorrelationManager_stub_export.h
+  idlflags     += -Wb,skel_export_macro=FaultCorrelationManager_svnt_Export
+  idlflags     += -Wb,skel_export_include=FaultCorrelationManager_svnt_export.h
+
+  IDL_Files {
+    FaultCorrelationManager.idl
+  }
+}
+
+project (DAnCE_FaultCorrelationManager_stub): dance_lib, messaging, dance_deployment_stub {
+  after += DAnCE_FaultCorrelationManager_idl
+  sharedname = DAnCE_FaultCorrelationManager_stub
+  libs += LWFT_ReplicationManager
+
+  dynamicflags = FAULTCORRELATIONMANAGER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    FaultCorrelationManagerC.cpp
+  }
+}
+
+project (DAnCE_FaultCorrelationManager_svnt): dance_lib, messaging, dance_deployment_svnt, ciao_output, ciaolib_with_idl {
+  after += DAnCE_FaultCorrelationManager_idl
+  sharedname = DAnCE_FaultCorrelationManager_svnt
+  libs += LWFT_ReplicationManager DAnCE_FaultCorrelationManager_stub
+
+  dynamicflags = FAULTCORRELATIONMANAGER_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    FaultCorrelationManagerS.cpp
+  }
+}
diff --git a/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.cpp b/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.cpp
index 6cf95f4cc7c..f0bf902eb21 100644
--- a/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.cpp
+++ b/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.cpp
@@ -6,7 +6,7 @@
  * interface
  */
 
-#include "Deployment/FaultCorrelationManagerC.h"
+#include "Interfaces/FaultCorrelationManagerC.h"
 
 int usage ()
 {
@@ -29,8 +29,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var obj = orb->string_to_object (argv[1]);
 
-      FTDeployment::FaultCorrelationManager_var fcm =
-        FTDeployment::FaultCorrelationManager::_narrow (obj.in ());
+      DAnCE::FaultCorrelationManager_var fcm =
+        DAnCE::FaultCorrelationManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (fcm.in ()))
         {
@@ -39,7 +39,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
       ACE_DEBUG ((LM_DEBUG, 
-                  "calling proc_failure (%c,%C)\n",
+                  "calling proc_failure (%C, %C)\n",
                   argv[2],
                   argv[3]));
 
diff --git a/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc b/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc
index 48669255815..55591f048d2 100644
--- a/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc
+++ b/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc
@@ -1,6 +1,6 @@
 // $Id$
 project(proc_failure) : dance_deployment_stub {
-  libs += FCM 
+  libs += DAnCE_FaultCorrelationManager_stub
 
   Source_Files {
     proc_failure.cpp