Thu Jul 1 12:02:05 2004 Jaiganesh B <jai@dre.vanderbilt.edu>

21 files changed, 317 insertions, 254 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index befeb5c12e9..f9a391c26ec 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,33 @@
+Thu Jul  1 12:02:05 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+        * DnC/Config_Handlers/CAD_Handler.cpp:
+        * DnC/Config_Handlers/CPR_Handler.cpp:
+        * DnC/Config_Handlers/Cap_Handler.cpp:
+        * DnC/Config_Handlers/CompImplDesc_Handler.cpp:
+        * DnC/Config_Handlers/CompIntrDesc_Handler.cpp:
+        * DnC/Config_Handlers/CompPkgDesc_Handler.cpp:
+        * DnC/Config_Handlers/Config_Handlers.mpc:
+        * DnC/Config_Handlers/Domain_Handler.cpp:
+        * DnC/Config_Handlers/IAD_Handler.cpp:
+        * DnC/Config_Handlers/IR_Handler.cpp:
+        * DnC/Config_Handlers/NIA_Handler.cpp:
+        * DnC/Config_Handlers/PCI_Handler.cpp:
+        * DnC/Config_Handlers/PC_Handler.cpp:
+        * DnC/Config_Handlers/Plan_Handler.cpp:
+        * DnC/Config_Handlers/Process_Basic_Type.h:
+        * DnC/Config_Handlers/Process_Basic_Type.i:
+        * DnC/Config_Handlers/Process_Element_T.cpp:
+        * DnC/Config_Handlers/TPD_Handler.cpp:
+        * DnC/Config_Handlers/Utils.cpp:
+        * DnC/Config_Handlers/Utils.h:
+        * DnC/Config_Handlers/Process_Basic_Type.h:
+        * DnC/Config_Handlers/Process_Basic_Type.i:
+
+          Moved the code in Process_Basic_Type.h and
+          Process_Basic_Type.i to Utils.h and Utils.cpp,
+          as all the utility functions are defined
+          in that file.
+
 Thu Jul  1 11:37:14 2004  Tao Lu  <lu@dre.vanderbilt.edu>
 
 	* docs/todo.html:
diff --git a/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp
index 24cb7806ec9..1f6464e6102 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CAD_Handler.cpp
@@ -10,7 +10,7 @@
 #include "Property_Handler.h"
 #include "Requirement_Handler.h"
 #include "CompPkgDesc_Handler.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 #include <iostream>
 
@@ -130,7 +130,8 @@ void CAD_Handler::process_instance (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", sid.name));
+        (CIAO::Config_Handler::Utils::process_string 
+                 (iter, node_name, "name", sid.name));
       else if
         (process_sequence_remote<Deployment::ComponentPackageDescription, 
                                  CompPkgDesc_Handler>
@@ -179,7 +180,8 @@ void CAD_Handler::process_connection (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string(iter, node_name, "name", acd.name));
+        (CIAO::Config_Handler::Utils::process_string
+               (iter, node_name, "name", acd.name));
       else if
         (process_sequence_common<Deployment::Requirement>
            (node->getOwnerDocument(), iter, node,
@@ -225,7 +227,8 @@ void CAD_Handler::process_spe (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "portName", spe.portName));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "portName", spe.portName));
       else if
         (process_reference(node, node_name, "instance",
                            spe.instanceRef,
@@ -255,7 +258,8 @@ void CAD_Handler::process_spr (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "propertyName", spr.propertyName));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "propertyName", spr.propertyName));
       else if
         (process_reference(node, node_name, "instance",
                            spr.instanceRef,
@@ -285,9 +289,11 @@ void CAD_Handler::process_property(DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", apm.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "name", apm.name));
       else if
-        (process_string (iter, node_name, "externalName", apm.externalName));
+        (CIAO::Config_Handler::Utils::process_string 
+            (iter, node_name, "externalName", apm.externalName));
       else if
         (process_sequence_local<Deployment::SubcomponentPropertyReference>
            (node->getOwnerDocument(), iter, node,
diff --git a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp
index ed4f007ff21..424e6246e28 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp
@@ -4,7 +4,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "CPR_Handler.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 
 BEGIN_DEPLOYMENT_NAMESPACE
 
@@ -20,14 +20,15 @@ void CPR_Handler::process_ComponentPackageReference
 
       if (false);
       else if
-        (process_string(this->iter_, node_name, "requiredUUID", 
+        (CIAO::Config_Handler::Utils::process_string
+               (this->iter_, node_name, "requiredUUID", 
                         cpr.requiredUUID));
       else if
-        (process_string(this->iter_, node_name, "requiredName", 
-                        cpr.requiredName));
+        (CIAO::Config_Handler::Utils::process_string
+               (this->iter_, node_name, "requiredName", cpr.requiredName));
       else if
-        (process_string(this->iter_, node_name, "requiredType", 
-                        cpr.requiredType));
+        (CIAO::Config_Handler::Utils::process_string
+               (this->iter_, node_name, "requiredType", cpr.requiredType));
       else
         {
           this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp
index 4bc9c66aa2c..d357bc03ec8 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/Cap_Handler.cpp
@@ -14,7 +14,7 @@
 #include "Utils.h"
 #include <iostream>
 #include "string.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 
 BEGIN_DEPLOYMENT_NAMESPACE
@@ -34,9 +34,11 @@ CAP_Handler::process_Capability (Deployment::Capability &cap)
         {
         }
       else if
-        (process_string (this->iter_, node_name, "name", cap.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "name", cap.name));
       else if
-        (process_string_seq (this->iter_, node_name, "resourceType", 
+        (CIAO::Config_Handler::Utils::process_string_seq 
+              (this->iter_, node_name, "resourceType", 
                              cap.resourceType));
       else if
         (process_sequence_common<Deployment::SatisfierProperty>
diff --git a/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp
index c274ee9059e..afccc0c5f0b 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CompImplDesc_Handler.cpp
@@ -11,7 +11,7 @@
 #include "Cap_Handler.h"
 #include "CompIntrDesc_Handler.h"
 #include "CompImplDesc_Handler.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 #include <iostream>
 
@@ -36,9 +36,11 @@ void CompImplDesc_Handler::process_ComponentImplementationDescription
         {
         }
       else if
-        (process_string (this->iter_, node_name, "label", cid.label));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "label", cid.label));
       else if
-        (process_string (this->iter_, node_name, "UUID", cid.UUID));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "UUID", cid.UUID));
       else if
         (process_element_remote<Deployment::ComponentInterfaceDescription, 
                                 CompIntrDesc_Handler>
diff --git a/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp
index 62462556ab2..25ca99733fc 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CompIntrDesc_Handler.cpp
@@ -6,7 +6,7 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 #include "Property_Handler.h"
 #include "CompIntrDesc_Handler.h"
@@ -31,17 +31,22 @@ void CompIntrDesc_Handler::process_ComponentInterfaceDescription
         {
         }
       else if
-        (process_string(this->iter_, node_name, "label", ccd.label));
+        (CIAO::Config_Handler::Utils::process_string
+              (this->iter_, node_name, "label", ccd.label));
       else if
-        (process_string(this->iter_, node_name, "UUID", ccd.UUID));
+        (CIAO::Config_Handler::Utils::process_string
+              (this->iter_, node_name, "UUID", ccd.UUID));
       else if
-        (process_string(this->iter_, node_name, "specificType", 
+        (CIAO::Config_Handler::Utils::process_string
+              (this->iter_, node_name, "specificType", 
                         ccd.specificType));
       else if
-        (process_string_seq(this->iter_, node_name, "supportedType", 
+        (CIAO::Config_Handler::Utils::process_string_seq
+              (this->iter_, node_name, "supportedType", 
                             ccd.supportedType));
       else if
-        (process_string_seq(this->iter_, node_name, "idlFile", ccd.idlFile));
+        (CIAO::Config_Handler::Utils::process_string_seq
+              (this->iter_, node_name, "idlFile", ccd.idlFile));
       else if
         (process_sequence_common<Deployment::Property>
            (this->doc_, this->iter_, node,
@@ -89,7 +94,8 @@ void CompIntrDesc_Handler::process_comp_property (DOMNodeIterator* iter,
                (ACE_TEXT ("Deployment:ComponentPropertyDescription")))
         {
         }
-      else if (process_string(iter, node_name, "name", property.name));
+      else if (CIAO::Config_Handler::Utils::process_string
+                  (iter, node_name, "name", property.name));
       else if (node_name == XStr (ACE_TEXT ("type")))
         {
           int argc = 0;
@@ -120,22 +126,27 @@ void CompIntrDesc_Handler::process_port (DOMNodeIterator* iter,
                (ACE_TEXT ("Deployment:ComponentPortDescription")))
         {
         }
-      else if (process_string(iter, node_name, "name", port.name));
+      else if (CIAO::Config_Handler::Utils::process_string
+                   (iter, node_name, "name", port.name));
       else if
-        (process_string(iter, node_name, "specificType", port.specificType));
+        (CIAO::Config_Handler::Utils::process_string
+                   (iter, node_name, "specificType", port.specificType));
       else if
-        (process_string_seq(iter, node_name, "supportedType", 
-                            port.supportedType));
+        (CIAO::Config_Handler::Utils::process_string_seq
+                   (iter, node_name, "supportedType", port.supportedType));
       else if
-        (process_boolean(iter, node_name, "provider", port.provider));
+        (CIAO::Config_Handler::Utils::process_boolean
+                   (iter, node_name, "provider", port.provider));
       else if
-        (process_boolean(iter, node_name, "exclusiveProvider", 
+        (CIAO::Config_Handler::Utils::process_boolean
+                   (iter, node_name, "exclusiveProvider", 
                          port.exclusiveProvider));
       else if
-        (process_boolean(iter, node_name, "exclusiveUser", 
-                         port.exclusiveUser));
+        (CIAO::Config_Handler::Utils::process_boolean
+                  (iter, node_name, "exclusiveUser", port.exclusiveUser));
       else if
-        (process_boolean(iter, node_name, "optional", port.optional));
+        (CIAO::Config_Handler::Utils::process_boolean
+                 (iter, node_name, "optional", port.optional));
       else if (node_name == XStr(ACE_TEXT("kind")))
         {
           CPK_Handler::process_CCMComponentPortKind (iter, port.kind);
diff --git a/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp
index 7b92f91f80f..c60201535cb 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CompPkgDesc_Handler.cpp
@@ -6,7 +6,7 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "CompPkgDesc_Handler.h"
 #include "Property_Handler.h"
 #include "PCI_Handler.h"
@@ -31,9 +31,11 @@ void CompPkgDesc_Handler::process_ComponentPackageDescription
         {
         }
       else if
-        (process_string (this->iter_, node_name, "label", comppkgdesc.label));
+        (CIAO::Config_Handler::Utils::process_string 
+             (this->iter_, node_name, "label", comppkgdesc.label));
       else if
-        (process_string (this->iter_, node_name, "UUID", comppkgdesc.UUID));
+        (CIAO::Config_Handler::Utils::process_string 
+             (this->iter_, node_name, "UUID", comppkgdesc.UUID));
       else if
         (process_element_remote<Deployment::ComponentInterfaceDescription, 
                                 CompIntrDesc_Handler>
diff --git a/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc
index 33855b5145c..54c692644b8 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc
@@ -10,6 +10,7 @@ project (Config_Handlers) : ciao_deployment_stub {
   libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client
 
   Source_Files {
+    Utils.cpp
     Any_Handler.cpp
     Basic_Handler.cpp
     CAD_Handler.cpp
@@ -41,7 +42,6 @@ project (Config_Handlers) : ciao_deployment_stub {
     SP_Handler.cpp
     SPK_Handler.cpp
     TPD_Handler.cpp
-    Utils.cpp
     XercesString.cpp
   }
 }
diff --git a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp
index 7852bab38bb..5d6d1456e07 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp
@@ -7,7 +7,7 @@
 #include "Property_Handler.h"
 #include "SP_Handler.h"
 #include "Process_Element.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include <iostream>
 #include "string.h"
 
@@ -26,9 +26,11 @@ void Domain_Handler::process_domain (Deployment::Domain& domain)
         {
         }
       else if
-        (process_string(this->iter_, node_name, "UUID", domain.UUID));
+        (CIAO::Config_Handler::Utils::process_string
+             (this->iter_, node_name, "UUID", domain.UUID));
       else if
-        (process_string(this->iter_, node_name, "label", domain.label));
+        (CIAO::Config_Handler::Utils::process_string
+             (this->iter_, node_name, "label", domain.label));
       else if
         (process_sequence_local<Deployment::SharedResource>
            (this->doc_, this->iter_, node,
@@ -84,9 +86,11 @@ void Domain_Handler::process_node (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string(iter, node_name, "name", domain_node.name));
+        (CIAO::Config_Handler::Utils::process_string
+               (iter, node_name, "name", domain_node.name));
       else if
-        (process_string(iter, node_name, "label", domain_node.label));
+        (CIAO::Config_Handler::Utils::process_string
+               (iter, node_name, "label", domain_node.label));
       else if
         (process_sequence_local<Deployment::Resource>
            (node->getOwnerDocument(), iter, node,
@@ -128,9 +132,10 @@ void Domain_Handler::process_resource (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string(iter, node_name, "name", domain_resource.name));
+        (CIAO::Config_Handler::Utils::process_string
+             (iter, node_name, "name", domain_resource.name));
       else if
-        (process_string_seq
+        (CIAO::Config_Handler::Utils::process_string_seq
            (iter, node_name, "resourceType", domain_resource.resourceType));
       else if
         (process_sequence_common<Deployment::SatisfierProperty>
@@ -160,9 +165,11 @@ void Domain_Handler::process_bridge (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", domain_bridge.name));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "name", domain_bridge.name));
       else if
-        (process_string (iter, node_name, "label", domain_bridge.label));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "label", domain_bridge.label));
       else if
         (process_reference_seq (node, node_name, "connect",
                                 domain_bridge.connectRef,
@@ -198,9 +205,11 @@ void Domain_Handler::process_interconnect (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", domain_ic.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "name", domain_ic.name));
       else if
-        (process_string (iter, node_name, "label", domain_ic.label));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "label", domain_ic.label));
       else if
         (process_reference_seq (node, node_name, "connect",
                                 domain_ic.connectRef,
@@ -243,10 +252,12 @@ void Domain_Handler::process_sr (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", domain_sr.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "name", domain_sr.name));
       else if
-        (process_string_seq (iter, node_name, "resourceType", 
-                             domain_sr.resourceType));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+              (iter, node_name, "resourceType", 
+               domain_sr.resourceType));
       else if
         (process_reference_seq (node, node_name, "node",
                                 domain_sr.nodeRef,
diff --git a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp
index 021ee1ab8d1..9e4ff47cf28 100644
--- a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "Requirement_Handler.h"
 #include "NIA_Handler.h"
 #include "IAD_Handler.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 #include <iostream>
 
@@ -28,12 +28,15 @@ void IAD_Handler::process_ImplementationArtifactDescription
         {
         }
       else if
-        (process_string (this->iter_, node_name, "label", iad.label));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "label", iad.label));
       else if
-        (process_string (this->iter_, node_name, "UUID", iad.UUID));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "UUID", iad.UUID));
       else if
-        (process_string_seq (this->iter_, node_name, "location", 
-                             iad.location));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+              (this->iter_, node_name, "location", 
+               iad.location));
       else if
         (process_sequence_common<Deployment::Property>
            (this->doc_, this->iter_, node,
diff --git a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp
index e1506fcd2f1..d4255b5555e 100644
--- a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp
@@ -6,7 +6,7 @@
 #include "IR_Handler.h"
 #include "RUK_Handler.h"
 #include "Utils.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 #include "Property_Handler.h"
 
@@ -27,16 +27,20 @@ void IR_Handler::process_ImplementationRequirement
         {
         }
       else if
-        (process_string (this->iter_, node_name, "resourcePort", 
-                         ir.resourcePort));
+        (CIAO::Config_Handler::Utils::process_string 
+             (this->iter_, node_name, "resourcePort", 
+              ir.resourcePort));
       else if
-        (process_string (this->iter_, node_name, "componentPort", 
-                         ir.componentPort));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "componentPort", 
+               ir.componentPort));
       else if
-        (process_string (this->iter_, node_name, "resourceType", 
-                         ir.resourceType));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "resourceType", 
+               ir.resourceType));
       else if
-        (process_string (this->iter_, node_name, "name", ir.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "name", ir.name));
       else if
         (process_sequence_common<Deployment::Property>
            (this->doc_, this->iter_, node,
diff --git a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp
index 4d382f14f9a..11db8839207 100644
--- a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp
@@ -5,7 +5,7 @@
 #include "ace/Log_Msg.h"
 #include "IAD_Handler.h"
 #include "NIA_Handler.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 
 BEGIN_DEPLOYMENT_NAMESPACE
@@ -24,7 +24,8 @@ void NIA_Handler::process_NamedImplementationArtifact
         {
         }
       else if
-        (process_string (this->iter_, node_name, "name", nia.name));
+        (CIAO::Config_Handler::Utils::process_string 
+               (this->iter_, node_name, "name", nia.name));
       else if
         (process_element_remote<Deployment::ImplementationArtifactDescription,
                                 IAD_Handler>
diff --git a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp
index 3fe95ebf758..e26a73dab27 100644
--- a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp
@@ -5,7 +5,7 @@
 #include "ace/Log_Msg.h"
 #include "CompImplDesc_Handler.h"
 #include "PCI_Handler.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 #include "Process_Element.h"
 
 BEGIN_DEPLOYMENT_NAMESPACE
@@ -25,7 +25,8 @@ void PCI_Handler::process_PackagedComponentImplementation
         {
         }
       else if
-        (process_string (this->iter_, node_name, "name", pci.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (this->iter_, node_name, "name", pci.name));
       else if
         (process_element_remote<Deployment::ComponentImplementationDescription,
                                 CompImplDesc_Handler>
diff --git a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp
index d7cc84c08b6..25804bd71c3 100644
--- a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp
@@ -9,7 +9,7 @@
 #include "CompPkgDesc_Handler.h"
 #include "PC_Handler.h"
 #include "Process_Element.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 
 BEGIN_DEPLOYMENT_NAMESPACE
 
@@ -26,10 +26,12 @@ void PC_Handler::process_PackageConfiguration
                     (ACE_TEXT ("Deployment:PackageConfiguration")))
         {
         }
-      else if (process_string (this->iter_, node_name, "label", pc.label))
+      else if (CIAO::Config_Handler::Utils::process_string 
+                  (this->iter_, node_name, "label", pc.label))
         {
         }
-      else if (process_string (this->iter_, node_name, "UUID", pc.UUID))
+      else if (CIAO::Config_Handler::Utils::process_string 
+                  (this->iter_, node_name, "UUID", pc.UUID))
         {
         }
       else if (process_sequence_remote
diff --git a/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp
index dd57de243a2..924f7621c64 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/Plan_Handler.cpp
@@ -37,9 +37,11 @@ void Plan_Handler::process_plan(Deployment::DeploymentPlan& plan)
         {
         }
       else if
-        (process_string (this->iter_, node_name, "label", plan.label));
+        (CIAO::Config_Handler::Utils::process_string 
+             (this->iter_, node_name, "label", plan.label));
       else if
-        (process_string (this->iter_, node_name, "UUID", plan.UUID));
+        (CIAO::Config_Handler::Utils::process_string 
+             (this->iter_, node_name, "UUID", plan.UUID));
       else if
         (process_element<Deployment::ComponentInterfaceDescription>
            (this->doc_, this->iter_, node,
@@ -111,10 +113,12 @@ void Plan_Handler::process_rdd (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "requirementName", 
-                         rdd.requirementName));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "requirementName", 
+               rdd.requirementName));
       else if
-        (process_string (iter, node_name, "resourceName", rdd.resourceName));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "resourceName", rdd.resourceName));
       else if (node_name == XStr (ACE_TEXT ("resourceValue")))
         {
           Any_Handler::process_Any (iter, rdd.resourceValue);
@@ -146,10 +150,12 @@ void Plan_Handler::process_irdd (DOMNodeIterator* iter,
           RUK_Handler::process_ResourceUsageKind (iter, irdd.resourceUsage);
         }
       else if
-        (process_string (iter, node_name, "requirementName", 
-                         irdd.requirementName));
+        (CIAO::Config_Handler::Utils::process_string 
+            (iter, node_name, "requirementName", 
+             irdd.requirementName));
       else if
-        (process_string (iter, node_name, "resourceName", irdd.resourceName));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "resourceName", irdd.resourceName));
       else if (node_name == XStr (ACE_TEXT ("resourceValue")))
         {
           Any_Handler::process_Any (iter, irdd.resourceValue);
@@ -176,13 +182,17 @@ void Plan_Handler::process_add (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", add.name));
+        (CIAO::Config_Handler::Utils::process_string 
+               (iter, node_name, "name", add.name));
       else if
-        (process_string_seq (iter, node_name, "location", add.location));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+               (iter, node_name, "location", add.location));
       else if
-        (process_string (iter, node_name, "node", add.node));
+        (CIAO::Config_Handler::Utils::process_string 
+               (iter, node_name, "node", add.node));
       else if
-        (process_string_seq (iter, node_name, "source", add.source));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+               (iter, node_name, "source", add.source));
       else if
         (process_sequence_common<Deployment::Property>
            (node->getOwnerDocument(), iter, node,
@@ -222,11 +232,14 @@ void Plan_Handler::process_idd (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", idd.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "name", idd.name));
       else if
-        (process_string (iter, node_name, "node", idd.node));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "node", idd.node));
       else if
-        (process_string_seq (iter, node_name, "source", idd.source));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+              (iter, node_name, "source", idd.source));
       else if
         (process_reference (node, node_name, "implementation",
                             idd.implementationRef, 
@@ -275,9 +288,11 @@ void Plan_Handler::process_mdd (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", mdd.name));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "name", mdd.name));
       else if
-        (process_string_seq (iter, node_name, "source", mdd.source));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+             (iter, node_name, "source", mdd.source));
       else if
         (process_reference_seq (node, node_name, "artifact",
                                 mdd.artifactRef,
@@ -327,7 +342,8 @@ void Plan_Handler::process_pspr (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "propertyName", pspr.propertyName));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "propertyName", pspr.propertyName));
       else if
         (process_reference (node, node_name, "instance", pspr.instanceRef, 
                             this->index_, this->idref_map_))
@@ -356,7 +372,8 @@ void Plan_Handler::process_pspe (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "portName", pspe.portName));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "portName", pspe.portName));
       else if
         (process_boolean (iter, node_name, "provider", pspe.provider));
       else if (node_name == XStr (ACE_TEXT ("kind")))
@@ -392,11 +409,14 @@ void Plan_Handler::process_ppm(DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", ppm.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "name", ppm.name));
       else if
-        (process_string_seq (iter, node_name, "source", ppm.source));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+              (iter, node_name, "source", ppm.source));
       else if
-        (process_string (iter, node_name, "externalName", ppm.externalName));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "externalName", ppm.externalName));
       else if
         (process_sequence_local<Deployment::PlanSubcomponentPropertyReference>
            (node->getOwnerDocument(), iter, node,
@@ -425,12 +445,15 @@ void Plan_Handler::process_crdd (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "targetName", crdd.targetName));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "targetName", crdd.targetName));
       else if
-        (process_string (iter, node_name, "requirementName", 
-                         crdd.requirementName));
+        (CIAO::Config_Handler::Utils::process_string 
+             (iter, node_name, "requirementName", 
+              crdd.requirementName));
       else if
-        (process_string (iter, node_name, "resourceName", crdd.resourceName));
+        (CIAO::Config_Handler::Utils::process_string 
+            (iter, node_name, "resourceName", crdd.resourceName));
       else if (node_name == XStr (ACE_TEXT ("resourceValue")))
         {
           Any_Handler::process_Any (iter, crdd.resourceValue);
@@ -457,9 +480,11 @@ void Plan_Handler::process_pcd (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string (iter, node_name, "name", pcd.name));
+        (CIAO::Config_Handler::Utils::process_string 
+              (iter, node_name, "name", pcd.name));
       else if
-        (process_string_seq (iter, node_name, "source", pcd.source));
+        (CIAO::Config_Handler::Utils::process_string_seq 
+              (iter, node_name, "source", pcd.source));
       else if
         (process_sequence_common<Deployment::Requirement>
            (node->getOwnerDocument(), this->iter_, node,
diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Basic_Type.h b/TAO/CIAO/DnC/Config_Handlers/Process_Basic_Type.h
deleted file mode 100644
index a338b9c5f53..00000000000
--- a/TAO/CIAO/DnC/Config_Handlers/Process_Basic_Type.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//==================================================================
-/**
- *  @file Process_Basic_Type.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PROCESS_BASIC_TYPE_H
-#define PROCESS_BASIC_TYPE_H
-
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "DeploymentC.h"
-
-using xercesc::DOMNodeIterator;
-using Config_Handler::XStr;
-
-inline bool
-process_string (DOMNodeIterator* iter,
-                const XStr& node_name, const char* name,
-                TAO_String_Manager& var);
-
-inline bool
-process_string_seq(DOMNodeIterator* iter,
-                   const XStr& node_name, const char* name,
-                   CORBA::StringSeq& seq);
-
-inline bool
-process_boolean(DOMNodeIterator* iter,
-                const XStr& node_name, const char* name,
-                CORBA::Boolean& var);
-
-#include "Process_Basic_Type.i"
-
-#endif // PROCESS_BASIC_TYPE_H
diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Basic_Type.i b/TAO/CIAO/DnC/Config_Handlers/Process_Basic_Type.i
deleted file mode 100644
index fce5c147a1e..00000000000
--- a/TAO/CIAO/DnC/Config_Handlers/Process_Basic_Type.i
+++ /dev/null
@@ -1,109 +0,0 @@
-//==================================================================
-/**
- *  @file Process_Basic_Type.i
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-/*
- *  Process string values
- */
-
-using xercesc::DOMNode;
-using xercesc::XMLString;
-using xercesc::DOMText;
-
-inline bool
-process_string (DOMNodeIterator* iter,
-                const XStr& node_name, const char* name,
-                TAO_String_Manager& var)
-{
-  bool result = (node_name == XStr(ACE_TEXT (name)));
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode();
-      const XMLCh* text = ACE_reinterpret_cast(DOMText*, node)->getNodeValue ();
-      if (text)
-        var = XMLString::transcode (text);
-    }
-  return result;
-}
-
-/*
- *  Process string sequences
- */
-
-inline bool
-process_string_seq (DOMNodeIterator* iter,
-                    const XStr& node_name, const char* name,
-                    CORBA::StringSeq& seq)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast 
-                            (DOMText*, node)->getNodeValue ();
-
-      if (text) 
-        {
-          CORBA::ULong i (seq.length ());
-          seq.length (i + 1);
-          seq[i] = XMLString::transcode (text);
-        }
-    }
-
-  return result;
-}
-
-inline bool
-process_ulong (DOMNodeIterator* iter,
-               const XStr& node_name, const char* name,
-               CORBA::ULong& var)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast 
-                            (DOMText*, node)->getNodeValue ();
-
-      if (text) 
-        {
-          CORBA::String_var temp = XMLString::transcode (text);
-          var = ACE_static_cast (CORBA::ULong, ACE_OS::strtol (temp.in (), 
-                                 0, 10));
-        }
-    }
-
-  return result;
-}
-
-inline bool
-process_boolean (DOMNodeIterator* iter,
-                 const XStr& node_name, const char* name,
-                 CORBA::Boolean& var)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast 
-                            (DOMText*, node)->getNodeValue ();
-
-      if (text) 
-        {
-          CORBA::String_var temp = XMLString::transcode (text);
-          var = ACE_static_cast (CORBA::Boolean, ACE_OS::strtol (temp.in (), 
-                                 0, 10));
-        }
-    }
-
-  return result;
-}
diff --git a/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp b/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp
index 486574da240..56d0f530315 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/Process_Element_T.cpp
@@ -21,7 +21,7 @@ BEGIN_DEPLOYMENT_NAMESPACE
 class parser_error { };
 
 template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION>
-ACE_INLINE bool
+bool
 process_sequence_local(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
                        XStr& node_name, const char* name,
                        SEQUENCE& seq, OBJECT* obj, FUNCTION func)
@@ -39,7 +39,7 @@ process_sequence_local(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
 }
 
 template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION>
-ACE_INLINE bool
+bool
 process_sequence_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode*
 node,
                         XStr& node_name, const char* name,
@@ -61,7 +61,7 @@ node,
 }
 
 template<typename DATA, typename SEQUENCE, typename FUNCTION>
-ACE_INLINE bool
+bool
 process_sequence_common(DOMDocument* doc, DOMNodeIterator* iter, DOMNode*
 node,
                         XStr& node_name, const char* name,
@@ -81,7 +81,7 @@ node,
 }
 
 template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION>
-ACE_INLINE bool
+bool
 process_element(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
                 XStr& node_name, const char* name,
                 ELEMENT& elem, OBJECT* obj, FUNCTION func,
@@ -111,7 +111,7 @@ process_element(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
 }
 
 template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION>
-ACE_INLINE bool
+bool
 process_element_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
                        XStr& node_name, const char *name,
                        ELEMENT& elem, FUNCTION func,
diff --git a/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp
index 4eee8db5211..d145106bae5 100644
--- a/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/TPD_Handler.cpp
@@ -8,7 +8,7 @@
 #include "CompPkgDesc_Handler.h"
 #include "TPD_Handler.h"
 #include "Process_Element.h"
-#include "Process_Basic_Type.h"
+#include "Utils.h"
 
 BEGIN_DEPLOYMENT_NAMESPACE
 
diff --git a/TAO/CIAO/DnC/Config_Handlers/Utils.cpp b/TAO/CIAO/DnC/Config_Handlers/Utils.cpp
index b179126c1fc..526d757dbd9 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Utils.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/Utils.cpp
@@ -108,6 +108,95 @@ CIAO::Config_Handler::Utils::parse_octet (DOMNodeIterator * iter)
   return Utils::parse_char (iter);
 }
 
+bool
+CIAO::Config_Handler::Utils::process_string (DOMNodeIterator* iter,
+                const XStr& node_name, const char* name,
+                TAO_String_Manager& var)
+{
+  bool result = (node_name == XStr(ACE_TEXT (name)));
+  if (result == true)
+    {
+      DOMNode* node = iter->nextNode();
+      const XMLCh* text = ACE_reinterpret_cast(DOMText*, node)->getNodeValue
+();
+      if (text)
+        var = XMLString::transcode (text);
+    }
+  return result;
+}
+
+bool
+CIAO::Config_Handler::Utils::process_string_seq (DOMNodeIterator* iter,
+                    const XStr& node_name, const char* name,
+                    CORBA::StringSeq& seq)
+{
+  bool result = (node_name == XStr (ACE_TEXT (name)));
+
+  if (result == true)
+    {
+      DOMNode* node = iter->nextNode ();
+      const XMLCh* text = ACE_reinterpret_cast
+                            (DOMText*, node)->getNodeValue ();
+
+      if (text)
+        {
+          CORBA::ULong i (seq.length ());
+          seq.length (i + 1);
+          seq[i] = XMLString::transcode (text);
+        }
+    }
+
+  return result;
+}
+
+bool
+CIAO::Config_Handler::Utils::process_ulong (DOMNodeIterator* iter,
+               const XStr& node_name, const char* name,
+               CORBA::ULong& var)
+{
+  bool result = (node_name == XStr (ACE_TEXT (name)));
+
+  if (result == true)
+    {
+      DOMNode* node = iter->nextNode ();
+      const XMLCh* text = ACE_reinterpret_cast
+                            (DOMText*, node)->getNodeValue ();
+
+      if (text)
+        {
+          CORBA::String_var temp = XMLString::transcode (text);
+          var = ACE_static_cast (CORBA::ULong, ACE_OS::strtol (temp.in (),
+                                 0, 10));
+        }
+    }
+
+  return result;
+}
+
+bool
+CIAO::Config_Handler::Utils::process_boolean (DOMNodeIterator* iter,
+                 const XStr& node_name, const char* name,
+                 CORBA::Boolean& var)
+{
+  bool result = (node_name == XStr (ACE_TEXT (name)));
+
+  if (result == true)
+    {
+      DOMNode* node = iter->nextNode ();
+      const XMLCh* text = ACE_reinterpret_cast
+                            (DOMText*, node)->getNodeValue ();
+
+      if (text)
+        {
+          CORBA::String_var temp = XMLString::transcode (text);
+          var = ACE_static_cast (CORBA::Boolean, ACE_OS::strtol (temp.in (),
+                                 0, 10));
+        }
+    }
+
+  return result;
+}
+
 DOMDocument*
 CIAO::Config_Handler::Utils::create_document (const char * url)
 {
diff --git a/TAO/CIAO/DnC/Config_Handlers/Utils.h b/TAO/CIAO/DnC/Config_Handlers/Utils.h
index cb28a59f972..dd051603d40 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Utils.h
+++ b/TAO/CIAO/DnC/Config_Handlers/Utils.h
@@ -17,6 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handler_export.h"
+#include "DeploymentC.h"
 
 #include "tao/Basic_Types.h"
 #include "XercesString.h"
@@ -87,6 +88,25 @@ namespace CIAO {
       static DOMBuilder* create_parser ();
       // Create a parser from the URL
 
+      static bool process_string (DOMNodeIterator* iter, const XStr& node_name, 
+                                  const char* name, TAO_String_Manager& var);
+      // process strings
+
+      static bool process_string_seq (DOMNodeIterator* iter, 
+                                      const XStr& node_name, 
+                                      const char* name, CORBA::StringSeq& seq);
+      // process string sequence
+
+      static bool process_boolean (DOMNodeIterator* iter, 
+                                   const XStr& node_name, 
+                                   const char* name, CORBA::Boolean& var);
+      // process strings
+
+      static bool process_ulong (DOMNodeIterator* iter, const XStr& node_name, 
+                                 const char* name, CORBA::ULong& var);
+      // process ulong
+
+
       static DOMNodeIterator * parse_href_tag (XMLURL xml_url,
                                                DOMDocument * doc);
       // Process the <href = "URL"> and return an iterator to the