1 files changed, 10 insertions, 15 deletions

diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
index 4605a1ea41b..312d01d0bfd 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -3,7 +3,6 @@
 #include "RepositoryManager_Impl.h"
 #include "Update_Plan.h"
 #include "ExecutionManager/ExecutionManagerC.h"
-#include "Config_Handlers/DnC_Dump.h"
 #include "NodeManager/NodeDaemonC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
@@ -68,10 +67,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   // Initialize the ORB so that CORBA::Any will work
   //
-  CORBA::ORB_var orb =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
   try
     {
@@ -106,9 +102,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           return 1;
         }
 
-      //DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
+      DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
 
-      //ACE_UNUSED_ARG (tpd_doc);
+      ACE_UNUSED_ARG (tpd_doc);
 
       if (tpd_handler.getErrors())
         {
@@ -119,7 +115,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \
                       May be the URL is wrong!!\n"));
-          throw CIAO::Null_Dom_Document ();
+          throw Null_Dom_Document ();
         }
 
       // free up DOMBuilder. DOMBuilder also deletes the DOMDocument memory.
@@ -143,14 +139,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       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;
+      REF_MAP ref_map;
+      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);
+      traverse_package (pc, plan, ref_map, primary_ref_map);
 
       //Deployment::DnC_Dump::dump (plan);
 
@@ -259,7 +254,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   catch (CORBA::Exception& ex)
     {
       ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      while (true);
+      while (true); 
       return -1;
     }
   catch (const DOMException& e)
@@ -278,13 +273,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       //ACE_PRINT_EXCEPTION ("Caught DOM Exception: ");
       ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
-      while (true);
+      while (true); 
       return -1;
     }
   catch (...)
     {
       ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      while (true);
+      while (true); 
       return -1;
     }