Thu Feb 9 16:33:45 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>

24 files changed, 464 insertions, 398 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index 09d53d2afd5..9a0d50a34f1 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -21,6 +21,7 @@ namespace CIAO
         const DeploymentPlan &src,
         ::Deployment::ArtifactDeploymentDescriptions &dest)
     {
+      CIAO_TRACE("ADD_Handler::atrifact_deployment_descrs");
       DeploymentPlan::artifact_const_iterator aci_e =
         src.end_artifact ();
       dest.length (src.count_artifact ());
@@ -43,6 +44,7 @@ namespace CIAO
         Deployment::ArtifactDeploymentDescription &dest,
         CORBA::ULong pos)
     {
+      CIAO_TRACE("ADD_Handler::atrifact_deployment_descr");
       dest.name = src.name ().c_str ();
 
       dest.node = src.node ().c_str ();
@@ -127,39 +129,40 @@ namespace CIAO
       ADD_Handler::artifact_deployment_descr (
 	  const Deployment::ArtifactDeploymentDescription &src)
       {
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descr - reverse");
 	  //Get the name and node and store them in the add
-	  XMLSchema::string< char > name ((src.name));
-	  XMLSchema::string< char > node ((src.node));
-	  
-	  ArtifactDeploymentDescription add (name,node);
-
-	  //Get the location(s) and store it/them in the add
-	  size_t total = src.location.length ();
-	  for (size_t i = 0; i < total; ++i)
+        XMLSchema::string< char > name ((src.name));
+        XMLSchema::string< char > node ((src.node));
+        
+        ArtifactDeploymentDescription add (name,node);
+        
+        //Get the location(s) and store it/them in the add
+        size_t total = src.location.length ();
+        for (size_t i = 0; i < total; ++i)
 	  {
-	      XMLSchema::string< char > curr ((src.location[i]));
-	      add.add_location (curr);
+            XMLSchema::string< char > curr ((src.location[i]));
+            add.add_location (curr);
 	  }
-
-	  //As above, for the source(s)
-	  total = src.source.length ();
-	  for (size_t j = 0; j < total; ++j)
+        
+        //As above, for the source(s)
+        total = src.source.length ();
+        for (size_t j = 0; j < total; ++j)
 	  {
-	      XMLSchema::string< char > curr ((src.source[j]));
-	      add.add_source (curr);
+            XMLSchema::string< char > curr ((src.source[j]));
+            add.add_source (curr);
 	  }  
-
-	  //As above for the execParameter(s)
-	  total = src.execParameter.length ();
+        
+        //As above for the execParameter(s)
+        total = src.execParameter.length ();
 	  for (size_t k = 0; k < total; ++k)
-	  {
+            {
 	      add.add_execParameter (
 		  Property_Handler::get_property (
 		      src.execParameter[k]));
-	  }
-        
+            }
+          
 	  return add;       
-    }
+      }
 
     
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
index e14838e9a9a..5a8ff23331f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
@@ -6,7 +6,7 @@
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "tao/AnyTypeCode/Any.h"
-
+#include "ciao/CIAO_common.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
 namespace CIAO
@@ -27,6 +27,7 @@ namespace CIAO
                                    CORBA::Any& toconfig)
 
     {
+      CIAO_TRACE("Any_Handler::extract_into_any");
       DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (),
                                                  desc.value ());
       
@@ -37,6 +38,7 @@ namespace CIAO
 
     Any Any_Handler::get_any (const ::CORBA::Any& src)
     {
+      CIAO_TRACE("Any_Handler::extract_into_any - reverse");
       //MAJO
       //@Bala ... still haven't figured this one out yet
       //I was saving it for last...going from corba::any
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index 288787f1eda..f55e3654282 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ciao/CIAO_common.h"
 #include "CCD_Handler.h"
 #include "ccd.hpp"
 #include "Property_Handler.h"
@@ -16,92 +17,93 @@ namespace CIAO
         const ComponentInterfaceDescription &desc,
         Deployment::ComponentInterfaceDescription& toconfig)
     {
-	if (desc.UUID_p ())
-	    toconfig.UUID =
-		CORBA::string_dup (desc.UUID ().c_str ());
-
-	if (desc.label_p ())
+      CIAO_TRACE("CCD_Handler::component_interface_descr");
+      if (desc.UUID_p ())
+        toconfig.UUID =
+          CORBA::string_dup (desc.UUID ().c_str ());
+      
+      if (desc.label_p ())
         {
-	    toconfig.label =
-		CORBA::string_dup (desc.label ().c_str ());
+          toconfig.label =
+            CORBA::string_dup (desc.label ().c_str ());
         }
-	
-	if (desc.specificType_p ())
+      
+      if (desc.specificType_p ())
         {
 	    toconfig.specificType =
-		CORBA::string_dup (desc.specificType ().c_str ());
+              CORBA::string_dup (desc.specificType ().c_str ());
         }
-
-	ComponentInterfaceDescription::supportedType_const_iterator
-	    end = desc.end_supportedType ();
-	
-        CORBA::ULong pos = 0;
-        toconfig.supportedType.length (desc.count_supportedType ());
-	for (ComponentInterfaceDescription::supportedType_const_iterator s =
-		 desc.begin_supportedType ();
-	     s != end;
-	     ++s)
+      
+      ComponentInterfaceDescription::supportedType_const_iterator
+        end = desc.end_supportedType ();
+      
+      CORBA::ULong pos = 0;
+      toconfig.supportedType.length (desc.count_supportedType ());
+      for (ComponentInterfaceDescription::supportedType_const_iterator s =
+             desc.begin_supportedType ();
+           s != end;
+           ++s)
         {
           toconfig.supportedType[pos++] = s->c_str ();
         }
-	
-	ComponentInterfaceDescription::idlFile_const_iterator
-	    eidl = desc.end_idlFile ();
-	pos = 0;
-        toconfig.idlFile.length (desc.count_idlFile ());
-	for (ComponentInterfaceDescription::idlFile_const_iterator sidl=
-		 desc.begin_idlFile ();
-	     sidl != eidl;
-	     ++sidl)
+      
+      ComponentInterfaceDescription::idlFile_const_iterator
+        eidl = desc.end_idlFile ();
+      pos = 0;
+      toconfig.idlFile.length (desc.count_idlFile ());
+      for (ComponentInterfaceDescription::idlFile_const_iterator sidl=
+             desc.begin_idlFile ();
+           sidl != eidl;
+           ++sidl)
         {
-	    toconfig.idlFile [pos++] = sidl->c_str ();
+          toconfig.idlFile [pos++] = sidl->c_str ();
         }
-	
-	ComponentInterfaceDescription::configProperty_const_iterator pend =
-	    desc.end_configProperty ();
-	pos = 0;
-        toconfig.configProperty.length (desc.count_configProperty ());
-	for (ComponentInterfaceDescription::configProperty_const_iterator pstart =
-		 desc.begin_configProperty ();
-	     pstart != pend;
-	     ++pstart)
+      
+      ComponentInterfaceDescription::configProperty_const_iterator pend =
+        desc.end_configProperty ();
+      pos = 0;
+      toconfig.configProperty.length (desc.count_configProperty ());
+      for (ComponentInterfaceDescription::configProperty_const_iterator pstart =
+             desc.begin_configProperty ();
+           pstart != pend;
+           ++pstart)
 	{
-	    Property_Handler::get_property (*pstart,
-					    toconfig.configProperty [pos++]);
+          Property_Handler::get_property (*pstart,
+                                          toconfig.configProperty [pos++]);
 	}
-	
-        pos = 0;
-        toconfig.port.length (desc.count_port ());
-	for (ComponentInterfaceDescription::port_const_iterator
-		 port (desc.begin_port ());
-	     port != desc.end_port ();
-	     ++port)
+      
+      pos = 0;
+      toconfig.port.length (desc.count_port ());
+      for (ComponentInterfaceDescription::port_const_iterator
+             port (desc.begin_port ());
+           port != desc.end_port ();
+           ++port)
 	{
-	    CPD_Handler::component_port_description (
-		*port,
-		toconfig.port[pos++]);
+          CPD_Handler::component_port_description (
+                                                   *port,
+                                                   toconfig.port[pos++]);
 	}
-	
-        pos = 0;
-        toconfig.property.length ( desc.count_property ());
-	for(ComponentInterfaceDescription::property_const_iterator
-		prop (desc.begin_property());
-	    prop != desc.end_property();
-	    prop++)
+      
+      pos = 0;
+      toconfig.property.length ( desc.count_property ());
+      for(ComponentInterfaceDescription::property_const_iterator
+            prop (desc.begin_property());
+          prop != desc.end_property();
+          prop++)
 	{
-	    ComponentPropertyDescription_Handler::component_property_description (
+          ComponentPropertyDescription_Handler::component_property_description (
 		*prop,
 		toconfig.property[pos++]);
 	}
 	
-        pos = 0;
-        toconfig.infoProperty.length (desc.count_infoProperty ());
-	for ( ComponentInterfaceDescription::infoProperty_const_iterator
-		  infoProp (desc.begin_infoProperty());
-	      infoProp != desc.end_infoProperty();
+      pos = 0;
+      toconfig.infoProperty.length (desc.count_infoProperty ());
+      for ( ComponentInterfaceDescription::infoProperty_const_iterator
+              infoProp (desc.begin_infoProperty());
+            infoProp != desc.end_infoProperty();
 	      infoProp++)
 	{
-	    Property_Handler::get_property (
+          Property_Handler::get_property (
 		*infoProp,
 		toconfig.infoProperty[pos]);
 	}	
@@ -111,6 +113,7 @@ namespace CIAO
       CCD_Handler::component_interface_descr (
 	  const ::Deployment::ComponentInterfaceDescription&  src)
       {
+        CIAO_TRACE("CCD_Handler::component_interface_descr - reverse");
 	  ComponentInterfaceDescription cid;
 	  
 	  //Load up the basic string members
@@ -126,58 +129,55 @@ namespace CIAO
 	  //Get the supported type(s) and load them into cid
 	  ::CORBA::ULong total = src.supportedType.length ();
 	  for (size_t i = 0; i < total; ++i)
-	  {
+            {
 	      XMLSchema::string< char > curr ((src.supportedType[i]));
 	      cid.add_supportedType (curr);
-	  }
+            }
 	  
 	  //Get the idlFile(s) and store them into the cid
 	  total = src.idlFile.length ();
 	  for (size_t j = 0; j < total; ++j)
-	  {
+            {
 	      XMLSchema::string< char > curr ((src.idlFile[j]));
 	      cid.add_idlFile (curr);
-	  }
+            }
 	  
 	  //Get the configProperty(ies) and store them into the cid 
 	  total = src.configProperty.length ();
 	  for (size_t k = 0; k < total; ++k)
-	  {
+            {
 	      cid.add_configProperty (
-		  Property_Handler::get_property (
-		      src.configProperty[k]));
-	  }
+                  Property_Handler::get_property (src.configProperty[k]));
+            }
 	  
 	  //Same drill for the component port description(s)
 	  total = src.port.length ();
 	  for (size_t l = 0; l < total; ++l)
-	  {
+            {
 	      cid.add_port (
-		  CPD_Handler::component_port_description (
-		      src.port[l]));
-	  }
+                 CPD_Handler::component_port_description (src.port[l]));
+            }
 
 	  //Load up the property field
 	  total = src.property.length();
 	  for(size_t m = 0;
 	      m < total;
 	      m++)
-	  {
+            {
 	      cid.add_property(
-		  ComponentPropertyDescription_Handler::component_property_description (
-		      src.property[m]));
-	  }
+                ComponentPropertyDescription_Handler::component_property_description (
+                   src.property[m]));
+            }
 
 	  //Load up the infoProperty(s)
 	  total = src.infoProperty.length();
 	  for(size_t n = 0;
 	      n < total;
 	      n++)
-	  {
+            {
 	      cid.add_infoProperty(
-		  Property_Handler::get_property (
-		      src.infoProperty[n]));
-	  }
+                Property_Handler::get_property (src.infoProperty[n]));
+            }
 
 	  return cid;
       }
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 71d280266bd..7eda79a5338 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,6 +13,7 @@ namespace CIAO
         const PlanConnectionDescription &src,
         ::Deployment::ComponentExternalPortEndpoints &dest)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoints");
       PlanConnectionDescription::externalEndpoint_const_iterator eeci_e =
         src.end_externalEndpoint ();
 
@@ -33,6 +34,7 @@ namespace CIAO
         const ComponentExternalPortEndpoint &src,
         ::Deployment::ComponentExternalPortEndpoint &dest)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoint");
       dest.portName = src.portName ().c_str ();
     }
     
@@ -40,6 +42,7 @@ namespace CIAO
     CEPE_Handler::external_port_endpoint (
       const ::Deployment::ComponentExternalPortEndpoint &src)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoint - reverse");
       //MAJO Unfinished
       XMLSchema::string< char > portname ((src.portName));
       ComponentExternalPortEndpoint cepe (portname);
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index ccf604c5465..e9667484d0b 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -2,6 +2,8 @@
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -11,6 +13,7 @@ namespace CIAO
       const ComponentPortDescription& desc,
       Deployment::ComponentPortDescription& toconfig)
     {
+      CIAO_TRACE("CPD_Handler::component_port_description");
       toconfig.name =
         desc.name ().c_str ();
 
@@ -67,6 +70,7 @@ namespace CIAO
     CPD_Handler::component_port_description (
       const Deployment::ComponentPortDescription& src)
     {
+      CIAO_TRACE("CPD_Handler::component_port_description - reverse");
       ::XMLSchema::string< char > name ((src.name));
       ::XMLSchema::string< char > stype ((src.specificType));
      
diff --git a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index da4f6584eb0..b9a8b41de94 100644
--- a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -25,6 +25,7 @@ namespace CIAO
                 Deployment::ConnectionResourceDeploymentDescription& toconfig,
                 ConnectionResourceDeploymentDescription& desc)
     {
+      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription");
       toconfig.targetName = CORBA::string_dup (desc.targetName ().c_str ());
       toconfig.requirementName =
         CORBA::string_dup (desc.requirementName ().c_str ());
@@ -39,6 +40,7 @@ namespace CIAO
     CRDD_Handler::connection_resource_depl_desc (
       const ::Deployment::ConnectionResourceDeploymentDescription& src)
     {
+      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse");
       XMLSchema::string< char > tname ((src.targetName));
       XMLSchema::string< char > reqname ((src.requirementName));
       XMLSchema::string< char > resname ((src.resourceName));
diff --git a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 6c56f10a44e..751464970aa 100644
--- a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -3,7 +3,7 @@
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,6 +13,7 @@ namespace CIAO
         const ComponentPropertyDescription& desc,
         ::Deployment::ComponentPropertyDescription& toconfig)
     {
+      CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description");
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       // Delegate the DataType to the
@@ -29,6 +30,7 @@ namespace CIAO
     ComponentPropertyDescription_Handler::component_property_description (
       const ::Deployment::ComponentPropertyDescription &src)
     {
+      CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description - reverse");
       XMLSchema::string< char > name ((src.name));
       DataType dt (DataType_Handler::data_type (src.type));
       ComponentPropertyDescription cpd (name,dt);
diff --git a/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
index 939b2437f4c..4e212e62922 100644
--- a/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
@@ -17,6 +17,7 @@ namespace CIAO
       domain_ (0),
       retval_ (false)
     {
+      CIAO_TRACE("DP_PCD_Handler::constructor");
       XML_Helper helper;
 
       if (CIAO::debug_level () > 9)
@@ -63,6 +64,7 @@ namespace CIAO
       domain_(dmn),
       retval_(false)
     {
+      CIAO_TRACE("DP_PCD_Handler::constructor - Domain");
       if(!this->build_domain ())
         throw NoDomain ();
     }
@@ -83,6 +85,7 @@ namespace CIAO
     bool
     DD_Handler::build_domain ()
     {
+      CIAO_TRACE("DP_PCD_Handler::build_domain");
       this->idl_domain_.reset ( new ::Deployment::Domain );
 
       // Read in the name
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 00aacd892c9..5396898d047 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -93,6 +93,8 @@ namespace CIAO
     bool
     DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
     {
+      CIAO_TRACE ("DP_Handler::resolve_plan");
+      
       ::Deployment::DeploymentPlan *tmp =
           new Deployment::DeploymentPlan;
 
@@ -181,6 +183,8 @@ namespace CIAO
     bool
     DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
     {
+      CIAO_TRACE ("DP_Handler::build_xsc");
+      
       size_t len; //Used for checking the length of struct data members
       
       // Read in the label, if present, since minoccurs = 0
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index e468ec00357..22512ec15a5 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -9,7 +9,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -19,6 +19,7 @@ namespace CIAO
         const DeploymentPlan &src,
         Deployment::PlanConnectionDescriptions& dest)
     {
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descrs");
       DeploymentPlan::connection_const_iterator cci_e =
         src.end_connection ();
       
@@ -38,8 +39,9 @@ namespace CIAO
     DP_PCD_Handler::plan_connection_descr (
 	const Deployment::PlanConnectionDescription &src)
     {
-	PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
-	return pcd;
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr");
+      PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
+      return pcd;
     }
 
     void
@@ -47,6 +49,7 @@ namespace CIAO
         const PlanConnectionDescription &src,
         Deployment::PlanConnectionDescription &dest)
     {
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr - reverse");
       dest.name =
         src.name ().c_str ();
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
index c71f8701d6f..52360fc3b6f 100644
--- a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DataType_Handler.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO{
 
   namespace Config_Handlers{
@@ -21,158 +21,158 @@ namespace CIAO{
                                 CORBA::TypeCode_ptr& type,
                                 const DataType& desc)
     {
-
-        TCKind kind (desc.kind ());
+      CIAO_TRACE("DataType_Handler::data_type");
+      TCKind kind (desc.kind ());
         
-        switch (kind.integral ())
-          {
-          case  TCKind::tk_null_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-            break;
-
-          case  TCKind::tk_short_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-            break;
-
-          case  TCKind::tk_long_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-            break;
-
-          case  TCKind::tk_ushort_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-            break;
-
-          case  TCKind::tk_ulong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-            break;
-
-          case  TCKind::tk_float_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-            break;
-
-          case  TCKind::tk_double_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-            break;
-
-          case  TCKind::tk_boolean_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-            break;
-
-          case  TCKind::tk_char_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-            break;
-
-          case  TCKind::tk_octet_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-            break;
-
-          case  TCKind::tk_string_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-            break;
-
-          case  TCKind::tk_longlong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-            break;
-
-          case  TCKind::tk_ulonglong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-            break;
-
-          case  TCKind::tk_longdouble_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-            break;
-
-          case  TCKind::tk_wchar_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-            break;
-
-          case  TCKind::tk_wstring_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-            break;
-
-          case  TCKind::tk_any_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-            break;
-
-          case  TCKind::tk_TypeCode_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-            break;
-
-          default:
-            ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
-            throw 1;
-          }
+      switch (kind.integral ())
+        {
+        case  TCKind::tk_null_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+          break;
+
+        case  TCKind::tk_short_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
+          break;
+
+        case  TCKind::tk_long_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
+          break;
+
+        case  TCKind::tk_ushort_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
+          break;
+
+        case  TCKind::tk_ulong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
+          break;
+
+        case  TCKind::tk_float_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
+          break;
+
+        case  TCKind::tk_double_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
+          break;
+
+        case  TCKind::tk_boolean_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
+          break;
+
+        case  TCKind::tk_char_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
+          break;
+
+        case  TCKind::tk_octet_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
+          break;
+
+        case  TCKind::tk_string_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+          break;
+
+        case  TCKind::tk_longlong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
+          break;
+
+        case  TCKind::tk_ulonglong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
+          break;
+
+        case  TCKind::tk_longdouble_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
+          break;
+
+        case  TCKind::tk_wchar_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
+          break;
+
+        case  TCKind::tk_wstring_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+          break;
+
+        case  TCKind::tk_any_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
+          break;
+
+        case  TCKind::tk_TypeCode_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
+          break;
+
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
+          throw 1;
+        }
         
-        //   This case used to be supported...is it not in the schema?
-    //    case  TCKind::tk_Object)
-    //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
+      //   This case used to be supported...is it not in the schema?
+      //    case  TCKind::tk_Object)
+      //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
 
     }
 
     DataType
     DataType_Handler::data_type (
-                      const CORBA::TypeCode_ptr&  src)
+                                 const CORBA::TypeCode_ptr&  src)
     {
-              
-        switch (src->kind ())
-          {
-          case ::CORBA::tk_null:
-            return DataType ( (TCKind::tk_null));
-            break;
-          case CORBA::tk_short:
-            return DataType ( (TCKind::tk_short));
-            break;
-          case CORBA::tk_long:
-            return DataType ( (TCKind::tk_long));
-            break;
-          case CORBA::tk_ushort:
-            return DataType ( (TCKind::tk_ushort));
-            break;
-          case CORBA::tk_ulong:
-            return DataType ( (TCKind::tk_ulong));
-            break;
-          case CORBA::tk_float:
-            return DataType ( (TCKind::tk_float));
-            break;
-          case CORBA::tk_double:
-            return DataType ( (TCKind::tk_double));
-            break;
-          case CORBA::tk_boolean:
-            return DataType ( (TCKind::tk_boolean));
-            break;
-          case CORBA::tk_char:
-            return DataType ( (TCKind::tk_char));
-            break;
-          case CORBA::tk_octet:
-            return DataType ( (TCKind::tk_octet));
-            break;
-          case CORBA::tk_string:
-            return DataType ( (TCKind::tk_string));
-            break;
-          case CORBA::tk_longlong:
-            return DataType ( (TCKind::tk_longlong));
-            break;
-          case CORBA::tk_ulonglong:
-            return DataType ( (TCKind::tk_ulonglong));
-            break;
-          case CORBA::tk_longdouble:
-            return DataType ( (TCKind::tk_longdouble));
-            break;
-          case CORBA::tk_wchar:
-            return DataType ( (TCKind::tk_wchar));
-            break;
-          case CORBA::tk_wstring:
-            return DataType ( (TCKind::tk_wstring));
-            break;
-          case CORBA::tk_any:
-            return DataType ( (TCKind::tk_any));
-            break;
-          case CORBA::tk_TypeCode:
-            return DataType ( (TCKind::tk_TypeCode));
-          default:
-            ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
-            throw 1;
-          }
+      CIAO_TRACE("DataType_Handler::data_type - reverse");
+      switch (src->kind ())
+        {
+        case ::CORBA::tk_null:
+          return DataType ( (TCKind::tk_null));
+          break;
+        case CORBA::tk_short:
+          return DataType ( (TCKind::tk_short));
+          break;
+        case CORBA::tk_long:
+          return DataType ( (TCKind::tk_long));
+          break;
+        case CORBA::tk_ushort:
+          return DataType ( (TCKind::tk_ushort));
+          break;
+        case CORBA::tk_ulong:
+          return DataType ( (TCKind::tk_ulong));
+          break;
+        case CORBA::tk_float:
+          return DataType ( (TCKind::tk_float));
+          break;
+        case CORBA::tk_double:
+          return DataType ( (TCKind::tk_double));
+          break;
+        case CORBA::tk_boolean:
+          return DataType ( (TCKind::tk_boolean));
+          break;
+        case CORBA::tk_char:
+          return DataType ( (TCKind::tk_char));
+          break;
+        case CORBA::tk_octet:
+          return DataType ( (TCKind::tk_octet));
+          break;
+        case CORBA::tk_string:
+          return DataType ( (TCKind::tk_string));
+          break;
+        case CORBA::tk_longlong:
+          return DataType ( (TCKind::tk_longlong));
+          break;
+        case CORBA::tk_ulonglong:
+          return DataType ( (TCKind::tk_ulonglong));
+          break;
+        case CORBA::tk_longdouble:
+          return DataType ( (TCKind::tk_longdouble));
+          break;
+        case CORBA::tk_wchar:
+          return DataType ( (TCKind::tk_wchar));
+          break;
+        case CORBA::tk_wstring:
+          return DataType ( (TCKind::tk_wstring));
+          break;
+        case CORBA::tk_any:
+          return DataType ( (TCKind::tk_any));
+          break;
+        case CORBA::tk_TypeCode:
+          return DataType ( (TCKind::tk_TypeCode));
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
+          throw 1;
+        }
         
         
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index 2f6de450d8c..51fcbf6f898 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,6 +13,7 @@ namespace CIAO
         const PlanConnectionDescription &src,
         Deployment::ExternalReferenceEndpoints &dest)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoints");
       PlanConnectionDescription::externalReference_const_iterator erep_e =
         src.end_externalReference ();
 
@@ -33,6 +34,7 @@ namespace CIAO
         const ExternalReferenceEndpoint &src,
         Deployment::ExternalReferenceEndpoint &dest)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoint");
       dest.location =
         src.location ().c_str ();
     }
@@ -41,6 +43,7 @@ namespace CIAO
     ERE_Handler::external_ref_endpoint (
         const Deployment::ExternalReferenceEndpoint& src)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoint - reverse");
       XMLSchema::string< char > loc ((src.location));
       ExternalReferenceEndpoint erp (loc);
       return erp;
diff --git a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 5f1978d41b9..5897a3d4e76 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -21,6 +21,7 @@ namespace CIAO
         Deployment::InstanceDeploymentDescriptions& dest)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDD_Handler::instance_deployment_descrs");
       DeploymentPlan::instance_const_iterator idd_e =
         src.end_instance ();
       
@@ -44,6 +45,7 @@ namespace CIAO
         CORBA::ULong pos)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDD_Handler::instance_deployment_descr");
       try
 	{
 	  dest.name = src.name ().c_str ();
@@ -114,38 +116,38 @@ namespace CIAO
 	const Deployment::InstanceDeploymentDescription& src)
       throw (Config_Error)
     {
-	
-	//Get all the string/IDREFs
-	XMLSchema::string < ACE_TCHAR > name ((src.name));
-	XMLSchema::string < ACE_TCHAR > node ((src.node));
-	XMLSchema::string < ACE_TCHAR > source ((src.source[0]));
-	ACE_CString temp;
-	MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
-	XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
-
-	// Instantiate the IDD
-	InstanceDeploymentDescription idd (name, node, source, implementation);
-
-	//Get and store the configProperty(s)
-	size_t total = src.configProperty.length();
-	for(size_t j = 0; j < total; j++)
+      CIAO_TRACE("IDD_Handler::instance_deployment_descr - reverse");
+      //Get all the string/IDREFs
+      XMLSchema::string < ACE_TCHAR > name ((src.name));
+      XMLSchema::string < ACE_TCHAR > node ((src.node));
+      XMLSchema::string < ACE_TCHAR > source ((src.source[0]));
+      ACE_CString temp;
+      MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
+      XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
+      
+      // Instantiate the IDD
+      InstanceDeploymentDescription idd (name, node, source, implementation);
+      
+      //Get and store the configProperty(s)
+      size_t total = src.configProperty.length();
+      for(size_t j = 0; j < total; j++)
 	{
-	    idd.add_configProperty(
+          idd.add_configProperty(
 		Property_Handler::get_property (
 		    src.configProperty[j]));
 	}
 
-	//Check if there is a deployedResource, if so store
-	if(src.deployedResource.length() != 0)
-	    idd.deployedResource(
+      //Check if there is a deployedResource, if so store
+      if(src.deployedResource.length() != 0)
+        idd.deployedResource(
 		IRDD_Handler::instance_resource_deployment_descr(
 		    src.deployedResource[0]));
 
-	//Check if there is a deployedSharedResource, if so store it
-	if(src.deployedSharedResource.length() != 0)
-	    idd. deployedSharedResource(
+      //Check if there is a deployedSharedResource, if so store it
+      if(src.deployedSharedResource.length() != 0)
+        idd. deployedSharedResource(
 		IRDD_Handler::instance_resource_deployment_descr(
-		    src.deployedSharedResource[0]));
+                    src.deployedSharedResource[0]));
 
 	return idd;
     }	
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
index 88808bb4a6f..33dad285224 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
@@ -2,6 +2,7 @@
 #ifndef IDREF_BASE_CPP
 #define IDREF_BASE_CPP
 
+#include "ciao/CIAO_common.h"
 #include "IDREF_Base.h"
 #include <iostream>
 
@@ -20,6 +21,8 @@ namespace CIAO
     IDREF_Base<T>::bind_ref (ACE_CString& id, T value)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDREF_Base<T>::bind_ref");
+      
       int retval =
         idref_map_.bind (id, value);
 
@@ -35,6 +38,8 @@ namespace CIAO
     IDREF_Base<T>::find_ref (const ACE_CString& id, T& val)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDREF_Base<T>::find_ref(C_String, T)");
+      
       int retval =
         idref_map_.find (id, val);
 
@@ -48,6 +53,8 @@ namespace CIAO
     IDREF_Base<T>::find_ref (const T& value, ACE_CString& id)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDREF_Base<T>::find_ref (T, CString)");
+      
       int retval =
         pos_map_.find (value, id);
 
@@ -60,6 +67,7 @@ namespace CIAO
     bool
     IDREF_Base<T>::unbind_refs (void)
     {
+      CIAO_TRACE("IDREF_Base<T>::unbind_refs")
       int retval =
         idref_map_.unbind_all ();
  
diff --git a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 664e4f46b3d..2df07f281e0 100644
--- a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -4,7 +4,7 @@
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -23,6 +23,8 @@ namespace CIAO
                     Deployment::ImplementationDependency& toconfig,
                     const ImplementationDependency& desc)
     {
+      CIAO_TRACE("ID_Handler::get_ImplementationDependency");
+      
       toconfig.requiredType=
            CORBA::string_dup (desc.requiredType ().c_str ());
     }
@@ -31,6 +33,7 @@ namespace CIAO
     ID_Handler::impl_dependency (
         const ::Deployment::ImplementationDependency& src)
     {
+      CIAO_TRACE("ID_Handler::get_ImplementationDependency - reverse");
       XMLSchema::string< char > reqtype ((src.requiredType));
 
       ImplementationDependency id (reqtype);
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 36ab6231001..3cf1578892c 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -6,7 +6,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
 #include "Any_Handler.h"
-
+#include "ciao/CIAO_common.h"
 
 
 namespace CIAO
@@ -29,6 +29,7 @@ namespace CIAO
                     Deployment::InstanceResourceDeploymentDescription& toconfig)
       throw (Config_Error)
     {
+      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr");
       
       switch (desc.resourceUsage ().integral ())
 	{
@@ -72,6 +73,8 @@ namespace CIAO
       const Deployment::InstanceResourceDeploymentDescription& src)
       throw (Config_Error)
     {
+      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr - reverse");
+      
       XMLSchema::string< char > reqname ((src.requirementName));
       XMLSchema::string< char > resname ((src.resourceName));
       Any resval (Any_Handler::get_any (src.resourceValue));
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index e9200cb0a49..1acbc3c1c9a 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -18,6 +18,8 @@ namespace CIAO
         const DeploymentPlan& src,
         Deployment::MonolithicDeploymentDescriptions& dest)
     {
+      CIAO_TRACE("MDD_Handler::mono_deployment_descriptions");
+      
       DeploymentPlan::implementation_const_iterator imp_e =
         src.end_implementation ();
       CORBA::ULong pos = 0;
@@ -120,47 +122,47 @@ namespace CIAO
       MDD_Handler::mono_deployment_description(
 	  const Deployment::MonolithicDeploymentDescription &src)
       {
-	  //Get the name and instantiate the mdd
-	  XMLSchema::string < char > name ((src.name));
-	  MonolithicDeploymentDescription mdd (name);
-
-	  //Get the source(s) from the IDL and store them
-	  size_t total = src.source.length();
-	  for(size_t i = 0; i < total; i++)
+        CIAO_TRACE("mono_deployment_description - reverse");
+        
+        //Get the name and instantiate the mdd
+        XMLSchema::string < char > name ((src.name));
+        MonolithicDeploymentDescription mdd (name);
+
+        //Get the source(s) from the IDL and store them
+        size_t total = src.source.length();
+        for(size_t i = 0; i < total; i++)
 	  {
-	      XMLSchema::string< char > curr ((src.source[i]));
-	      mdd.add_source(curr);
+            XMLSchema::string< char > curr ((src.source[i]));
+            mdd.add_source(curr);
 	  }
 
-	  //Get the artifactRef(s) from the IDL and store them
-	  total = src.artifactRef.length();
-	  for(size_t j = 0; j < total; j++)
+        //Get the artifactRef(s) from the IDL and store them
+        total = src.artifactRef.length();
+        for(size_t j = 0; j < total; j++)
 	  {
-	      ACE_CString tmp;
-	      ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
-	      XMLSchema::IDREF< ACE_TCHAR > curr(tmp.c_str());
-	      mdd.add_artifact (curr);
+            ACE_CString tmp;
+            ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
+            XMLSchema::IDREF< ACE_TCHAR > curr(tmp.c_str());
+            mdd.add_artifact (curr);
 	  }
 
-	  //Get the execParameter(s) from the IDL and store them
-	  total = src.execParameter.length();
-	  for(size_t k = 0; k < total; k++)
+        //Get the execParameter(s) from the IDL and store them
+        total = src.execParameter.length();
+        for(size_t k = 0; k < total; k++)
 	  {
-	      mdd.add_execParameter (
-		  Property_Handler::get_property (
-		      src.execParameter[k]));
+            mdd.add_execParameter (
+                Property_Handler::get_property (src.execParameter[k]));
 	  }
 
-	  //Get the deployRequirement(s) from the IDL and store them
-	  total = src.deployRequirement.length();
-	  for(size_t l = 0; l < total; l++)
+        //Get the deployRequirement(s) from the IDL and store them
+        total = src.deployRequirement.length();
+        for(size_t l = 0; l < total; l++)
 	  {
-	      mdd.add_deployRequirement(
-		  Req_Handler::get_requirement (
-		      src.deployRequirement[l]));
+            mdd.add_deployRequirement(
+               Req_Handler::get_requirement (src.deployRequirement[l]));
 	  }
 
-	  return mdd;
+        return mdd;
       }
 
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 917c056a6cb..a383f9dad4b 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -8,6 +8,7 @@
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -29,6 +30,8 @@ namespace CIAO
                 Deployment::PlanConnectionDescription& toconfig,
                 PlanConnectionDescription& desc)
     {
+      CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
+      
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       //Source is mapped to a string in the schema and a sequence
@@ -95,66 +98,63 @@ namespace CIAO
 
     }
       
-      PlanConnectionDescription PCD_Handler::get_PlanConnectionDescription (
-	  const Deployment::PlanConnectionDescription &src)
-      {
-	  XMLSchema::string< char > name ((src.name));
-
-	  PlanConnectionDescription pcd(name);
-
-	  //Get the source if it exists
-	  if(src.source.length() != 0)
-	  {
-	      XMLSchema::string< char > source((src.source[0]));
-	      pcd.source(source);
-	  }
-
-	  //Get any externalEndpoint(s) and store them
-	  size_t total = src.externalEndpoint.length();
-	  for(size_t i = 0; i < total; i++)
-	  {
-	      pcd.add_externalEndpoint(
-		  CEPE_Handler::external_port_endpoint(
-		      src.externalEndpoint[i]));
-	  }
-
-	  //Get any externalReference(s) and store them
-	  total = src.externalReference.length();
-	  for(size_t j = 0; j < total; j++)
-	  {
-	      pcd.add_externalReference(
-		  ERE_Handler::external_ref_endpoint(
-		      src.externalReference[j]));
-	  }
-
-	  //Get any internalEndpoint(s) and store them
-	  total = src.internalEndpoint.length();
-	  for(size_t k = 0; k < total; k++)
-	  {
-	      pcd.add_internalEndpoint(
-		  PSPE_Handler::sub_component_port_endpoint(
-		      src.internalEndpoint[k]));
-	  }
+    PlanConnectionDescription PCD_Handler::get_PlanConnectionDescription (
+        const Deployment::PlanConnectionDescription &src)
+    {
+      CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
+      
+      XMLSchema::string< char > name ((src.name));
+      
+      PlanConnectionDescription pcd(name);
+      
+      //Get the source if it exists
+      if(src.source.length() != 0)
+        {
+          XMLSchema::string< char > source((src.source[0]));
+          pcd.source(source);
+        }
+
+      //Get any externalEndpoint(s) and store them
+      size_t total = src.externalEndpoint.length();
+      for(size_t i = 0; i < total; i++)
+        {
+          pcd.add_externalEndpoint(
+            CEPE_Handler::external_port_endpoint(src.externalEndpoint[i]));
+        }
+
+      //Get any externalReference(s) and store them
+      total = src.externalReference.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          pcd.add_externalReference(
+             ERE_Handler::external_ref_endpoint(src.externalReference[j]));
+        }
+
+      //Get any internalEndpoint(s) and store them
+      total = src.internalEndpoint.length();
+      for(size_t k = 0; k < total; k++)
+        {
+          pcd.add_internalEndpoint(
+              PSPE_Handler::sub_component_port_endpoint(src.internalEndpoint[k]));
+        }
 	  
-	  //Get any deployedResource(s) and store them
-	  total = src.deployedResource.length();
-	  for(size_t l = 0; l < total; l++)
-	  {
-	      pcd.add_deployedResource(
-		  CRDD_Handler::connection_resource_depl_desc(
-		      src.deployedResource[l]));
-	  }
-
-	  //Get any deployRequirement(s) and store them
-	  total = src.deployRequirement.length();
-	  for(size_t m = 0; m < total; m++)
-	  {
-	      pcd.add_deployRequirement(
-		  Req_Handler::get_requirement(
-		      src.deployRequirement[m]));
-	  }
-
-	  return pcd;
-      }
+      //Get any deployedResource(s) and store them
+      total = src.deployedResource.length();
+      for(size_t l = 0; l < total; l++)
+        {
+          pcd.add_deployedResource(
+              CRDD_Handler::connection_resource_depl_desc(src.deployedResource[l]));
+        }
+
+      //Get any deployRequirement(s) and store them
+      total = src.deployRequirement.length();
+      for(size_t m = 0; m < total; m++)
+        {
+          pcd.add_deployRequirement(
+               Req_Handler::get_requirement(src.deployRequirement[m]));
+        }
+
+      return pcd;
+    }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 9dcf33fc81e..a6f370b76a3 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -14,6 +14,8 @@ namespace CIAO
         const PlanConnectionDescription &src,
         ::Deployment::PlanSubcomponentPortEndpoints &dest)
     {
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoints");
+      
       PlanConnectionDescription::internalEndpoint_const_iterator iei_e =
         src.end_internalEndpoint ();
       CORBA::ULong pos = 0;
@@ -34,6 +36,7 @@ namespace CIAO
         const PlanSubcomponentPortEndpoint &src,
         ::Deployment::PlanSubcomponentPortEndpoint &dest)
     {
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint")
       dest.portName =
         src.portName ().c_str ();
 
@@ -88,6 +91,7 @@ namespace CIAO
     PSPE_Handler::sub_component_port_endpoint (
       const Deployment::PlanSubcomponentPortEndpoint &src)
     { // @@MAJO
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse")
       XMLSchema::string< char > pname ((src.portName));
       XMLSchema::string< char > tval  ("true");
       XMLSchema::string< char > prov  ("");
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
index c2525f5ceeb..9a66a4a0c00 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -23,6 +23,8 @@ namespace CIAO
       const Property& desc,
       Deployment::Property& toconfig)
     {
+      CIAO_TRACE("Property_Handler::get_property");
+      
       toconfig.name =
         CORBA::string_dup (desc.name ().c_str ());
 
@@ -35,6 +37,8 @@ namespace CIAO
     Property_Handler::get_property (
       const Deployment::Property& src)
     {
+      CIAO_TRACE("Property_Handler::get_property - reverse");
+      
       ::XMLSchema::string< char > name ((src.name));
       Any value (Any_Handler::get_any (src.value));
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 7a9fe8bca08..7b071ab0308 100644
--- a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
 #include "Any_Handler.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,6 +13,8 @@ namespace CIAO
         const ResourceDeploymentDescription &src,
         ::Deployment::ResourceDeploymentDescription &dest)
     {
+      CIAO_TRACE("RDD_Handler::resource_deployment_descr");
+      
       dest.requirementName =
         src.requirementName ().c_str ();
 
@@ -28,6 +30,8 @@ namespace CIAO
     RDD_Handler::resource_deployment_descr (
       const ::Deployment::ResourceDeploymentDescription &src)
     {
+      CIAO_TRACE("RDD_Handler::resource_deployment_descr - reverse");
+      
       XMLSchema::string< char > reqname ((src.requirementName));
       XMLSchema::string< char > resname ((src.resourceName));
       Any resval (Any_Handler::get_any (src.resourceValue));
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
index 4a52efb9967..ddd8b3afadc 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Req_Handler.h"
 #include "Property_Handler.h"
 #include "ciao/DeploymentC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -22,6 +22,8 @@ namespace CIAO
                          Deployment::Requirement& toconfig,
                          Requirement& desc)
     {
+      CIAO_TRACE("Req_Handler::get_Requirement");
+      
       //Map the basic string types to their Deployment::Req
       //counterparts.
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
@@ -38,23 +40,21 @@ namespace CIAO
         toconfig.property[toconfig.property.length () - 1]);
     }
     
-      Requirement
-      Req_Handler::get_requirement (
-	  const Deployment::Requirement& src)
-      {
-	  //Get the values for name and res
-	  XMLSchema::string< char > name ((src.name));
-	  XMLSchema::string< char > res ((src.resourceType));
-
-	  //Get the Property
-	  Property prop (
-	      Property_Handler::get_property (
-		  src.property[0]));
-
-	  //Instantiate the Requirement
-	  Requirement req (name,res,prop);
-	  
-	  return req;
-      }
+    Requirement
+    Req_Handler::get_requirement (const Deployment::Requirement& src)
+    {
+      CIAO_TRACE("Req_Handler::get_requirement - reverse")
+      //Get the values for name and res
+      XMLSchema::string< char > name ((src.name));
+      XMLSchema::string< char > res ((src.resourceType));
+      
+      //Get the Property
+      Property prop (Property_Handler::get_property (src.property[0]));
+      
+      //Instantiate the Requirement
+      Requirement req (name,res,prop);
+      
+      return req;
+    }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
index f3eb1609c1b..6d4095a810b 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
@@ -11,7 +11,7 @@
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-
+#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -26,6 +26,8 @@ namespace CIAO
     bool
     STD_PC_Intf::prepare_PC (const char *file)
     {
+      CIAO_TRACE("STD_PC_Intf::prepare_PC");
+      
       ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper);
 
       if (!helper->is_initialized ())
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index 8c4caa05475..065890af816 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -11,7 +11,7 @@
 #include "Deployment.hpp"
 #include "DP_Handler.h"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 
 
 namespace CIAO
@@ -27,6 +27,8 @@ namespace CIAO
     bool
     XML_File_Intf::read_process_file (const char *file)
     {
+      CIAO_TRACE("XML_File_Intf::read_process_file");
+      
       XML_Helper helper;
 
       if (!helper.is_initialized ())
@@ -55,12 +57,15 @@ namespace CIAO
     ::Deployment::DeploymentPlan const *
     XML_File_Intf::get_plan (void) const
     {
+      CIAO_TRACE("get_plan");
       return this->idl_dp_.get ();
     }
 
     ::Deployment::DeploymentPlan *
     XML_File_Intf::get_plan (void)
     {
+      CIAO_TRACE("XML_File_Intf::get_plan");
+      
       return this->idl_dp_.release ();
     }
   }