Fri Jun 11 16:12:54 2004 Jaiganesh B <jai@dre.vanderbilt.edu>

11 files changed, 209 insertions, 212 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6fce49d4ef3..4ce28397520 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jun 11 16:12:54 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+        * DnC/Config_Handlers/CPK_Handler.cpp:
+        * DnC/Config_Handlers/CPR_Handler.cpp:
+        * DnC/Config_Handlers/DT_Handler.cpp:
+        * DnC/Config_Handlers/Domain_Handler.cpp:
+        * DnC/Config_Handlers/IAD_Handler.cpp:
+        * DnC/Config_Handlers/IR_Handler.cpp:
+        * DnC/Config_Handlers/MID_Handler.cpp:
+        * DnC/Config_Handlers/NIA_Handler.cpp:
+        * DnC/Config_Handlers/PCI_Handler.cpp:
+        * DnC/Config_Handlers/PC_Handler.cpp:
+
+          Made some more cosing standard compliance changes.
+
 Fri Jun 11 15:44:00 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
         * DnC/Config_Handlers/CAD_Handler.cpp:
diff --git a/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp
index a110ea1f7bc..d2fee81d7ce 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CPK_Handler.cpp
@@ -13,11 +13,11 @@ process_CCMComponentPortKind (DOMNodeIterator * iter,
 {
   char* facet = XMLString::transcode (XStr ("Facet"));
   char* simplex_receptacle = XMLString::transcode (XStr ("SimplexReceptacle"));
-  char* multiplex_receptacle = XMLString::transcode (XStr ("MultiplexReceptacle"));
+  char* multiplex_receptacle = XMLString::transcode 
+                                 (XStr ("MultiplexReceptacle"));
   char* event_emitter = XMLString::transcode (XStr ("EventEmitter"));
   char* event_publisher = XMLString::transcode (XStr ("EventPublisher"));
   char* event_consumer = XMLString::transcode (XStr ("EventConsumer"));
-
   char * temp = Utils::parse_string (iter);
   XStr kind_str = XStr (temp);
   XMLString::release (&temp);
@@ -25,44 +25,45 @@ process_CCMComponentPortKind (DOMNodeIterator * iter,
   char* kind_str_tr = XMLString::transcode (kind_str);
 
   if ((ACE_OS::strcmp (kind_str_tr, facet)) == 0)
-  {
-    kind = Deployment::Facet;
-  }
+    {
+      kind = Deployment::Facet;
+    }
   else if ((ACE_OS::strcmp (kind_str_tr, simplex_receptacle)) == 0)
-  {
-    kind = Deployment::SimplexReceptacle;
-  }
+    {
+      kind = Deployment::SimplexReceptacle;
+    }
   else if ((ACE_OS::strcmp (kind_str_tr, multiplex_receptacle)) == 0)
-  {
-    kind = Deployment::MultiplexReceptacle;
-  }
+    {
+      kind = Deployment::MultiplexReceptacle;
+    }
   else if ((ACE_OS::strcmp (kind_str_tr, event_emitter)) == 0)
-  {
-    kind = Deployment::EventEmitter;
-  }
+    {
+      kind = Deployment::EventEmitter;
+    }
   else if ((ACE_OS::strcmp (kind_str_tr, event_publisher)) == 0)
-  {
-    kind = Deployment::EventPublisher;
-  }
+    {
+      kind = Deployment::EventPublisher;
+    }
   else if ((ACE_OS::strcmp (kind_str_tr, event_consumer)) == 0)
-  {
-    kind = Deployment::EventConsumer;
-  }
+    {
+      kind = Deployment::EventConsumer;
+    }
   else
-  {
-    // Something wrong here.. Throw exception
-    XMLString::release (&kind_str_tr);
-    XMLString::release (&facet);
-    XMLString::release (&simplex_receptacle);
-    XMLString::release (&multiplex_receptacle);
-    XMLString::release (&event_emitter);
-    XMLString::release (&event_publisher);
-    XMLString::release (&event_consumer);
+    {
+      // Something wrong here.. Throw exception
+      XMLString::release (&kind_str_tr);
+      XMLString::release (&facet);
+      XMLString::release (&simplex_receptacle);
+      XMLString::release (&multiplex_receptacle);
+      XMLString::release (&event_emitter);
+      XMLString::release (&event_publisher);
+      XMLString::release (&event_consumer);
 
-    ACE_DEBUG ((LM_DEBUG,
-                "Config_Handler::CPK_Handler::process_CCMComponentPortKing illegal <CCMComponentPortKind> value found \n"));
-    ACE_THROW (CORBA::INTERNAL ());
-  }
+      ACE_DEBUG ((LM_DEBUG,
+                  "Config_Handler::CPK_Handler::process_CCMComponentPortKing \
+                   illegal <CCMComponentPortKind> value found \n"));
+      ACE_THROW (CORBA::INTERNAL ());
+    }
 
   XMLString::release (&kind_str_tr);
   XMLString::release (&facet);
diff --git a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp
index 2c141918a73..ed4f007ff21 100644
--- a/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/CPR_Handler.cpp
@@ -3,15 +3,9 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "CPR_Handler.h"
 #include "Process_Basic_Type.h"
 
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the connection resource deployment description and populate it
@@ -26,11 +20,14 @@ void CPR_Handler::process_ComponentPackageReference
 
       if (false);
       else if
-        (process_string(this->iter_, node_name, "requiredUUID", cpr.requiredUUID));
+        (process_string(this->iter_, node_name, "requiredUUID", 
+                        cpr.requiredUUID));
       else if
-        (process_string(this->iter_, node_name, "requiredName", cpr.requiredName));
+        (process_string(this->iter_, node_name, "requiredName", 
+                        cpr.requiredName));
       else if
-        (process_string(this->iter_, node_name, "requiredType", cpr.requiredType));
+        (process_string(this->iter_, node_name, "requiredType", 
+                        cpr.requiredType));
       else
         {
           this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp
index 6168879cd3f..7840e86caa2 100644
--- a/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/DT_Handler.cpp
@@ -97,7 +97,7 @@ CIAO::Config_Handler::DT_Handler::process_DataType (DOMNodeIterator * iter,
     ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::process_ \
                            DataType supports only TCKind types\
                            support for recursive types will be added later\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INTERNAL ());
 
   }
 }
diff --git a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp
index 2a599f13f2a..7852bab38bb 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/Domain_Handler.cpp
@@ -6,16 +6,11 @@
 #include "Domain_Handler.h"
 #include "Property_Handler.h"
 #include "SP_Handler.h"
-
 #include "Process_Element.h"
 #include "Process_Basic_Type.h"
-
 #include <iostream>
 #include "string.h"
 
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the Domain type and populate the IDL structure
@@ -35,26 +30,31 @@ void Domain_Handler::process_domain (Deployment::Domain& domain)
       else if
         (process_string(this->iter_, node_name, "label", domain.label));
       else if
-        (process_sequence_local<Deployment::SharedResource>(this->doc_, this->iter_, node,
-                                                            node_name, "sharedResource", domain.sharedResource,
-                                                            this, &Domain_Handler::process_sr));
+        (process_sequence_local<Deployment::SharedResource>
+           (this->doc_, this->iter_, node,
+            node_name, "sharedResource", domain.sharedResource,
+            this, &Domain_Handler::process_sr));
       else if
-        (process_sequence_local<Deployment::Node>(this->doc_, this->iter_, node,
-                                            node_name, "node", domain.node,
-                                            this, &Domain_Handler::process_node));
+        (process_sequence_local<Deployment::Node>
+           (this->doc_, this->iter_, node,
+            node_name, "node", domain.node,
+            this, &Domain_Handler::process_node));
       else if
-        (process_sequence_local<Deployment::Interconnect>(this->doc_, this->iter_, node,
-                                                          node_name, "interconnect", domain.interconnect,
-                                                          this, &Domain_Handler::process_interconnect));
+        (process_sequence_local<Deployment::Interconnect>
+           (this->doc_, this->iter_, node,
+            node_name, "interconnect", domain.interconnect,
+            this, &Domain_Handler::process_interconnect));
       else if
-        (process_sequence_local<Deployment::Bridge>(this->doc_, this->iter_, node,
-                                                    node_name, "bridge", domain.bridge,
-                                                    this, &Domain_Handler::process_bridge));
+        (process_sequence_local<Deployment::Bridge>
+           (this->doc_, this->iter_, node,
+            node_name, "bridge", domain.bridge,
+            this, &Domain_Handler::process_bridge));
       else if
-        (process_sequence_common<Deployment::Property>(this->doc_, this->iter_, node,
-                                                       node_name, "infoProperty", domain.infoProperty,
-                                                       &Property_Handler::process_Property,
-                                                       this->id_map_));
+        (process_sequence_common<Deployment::Property>
+           (this->doc_, this->iter_, node,
+            node_name, "infoProperty", domain.infoProperty,
+            &Property_Handler::process_Property,
+            this->id_map_));
       else
         {
           // ??? How did we get here ???
@@ -88,20 +88,21 @@ void Domain_Handler::process_node (DOMNodeIterator* iter,
       else if
         (process_string(iter, node_name, "label", domain_node.label));
       else if
-        (process_sequence_local<Deployment::Resource>(node->getOwnerDocument(), iter, node,
-                                                      node_name, "resource", domain_node.resource,
-                                                      this, &Domain_Handler::process_resource));
+        (process_sequence_local<Deployment::Resource>
+           (node->getOwnerDocument(), iter, node,
+            node_name, "resource", domain_node.resource,
+            this, &Domain_Handler::process_resource));
       else if
-        (process_reference_seq(node, node_name, "connection",
-                               domain_node.connectionRef,
-                               this->index_, this->idref_map_))
+        (process_reference_seq (node, node_name, "connection",
+                                domain_node.connectionRef,
+                                this->index_, this->idref_map_))
         {
           this->index_ = this->index_ + 1;
         }
       else if
-        (process_reference_seq(node, node_name, "sharedResource",
-                               domain_node.sharedResourceRef,
-                               this->index_, this->idref_map_))
+        (process_reference_seq (node, node_name, "sharedResource",
+                                domain_node.sharedResourceRef,
+                                this->index_, this->idref_map_))
         {
           this->index_ = this->index_ + 1;
         }
@@ -113,8 +114,8 @@ void Domain_Handler::process_node (DOMNodeIterator* iter,
     }
 }
 
-void Domain_Handler::process_resource 
-(DOMNodeIterator* iter, Deployment::Resource& domain_resource)
+void Domain_Handler::process_resource (DOMNodeIterator* iter,
+                                       Deployment::Resource& domain_resource)
 {
   for (DOMNode* node = iter->nextNode();
        node != 0;
@@ -129,12 +130,14 @@ void Domain_Handler::process_resource
       else if
         (process_string(iter, node_name, "name", domain_resource.name));
       else if
-        (process_string_seq(iter, node_name, "resourceType", domain_resource.resourceType));
+        (process_string_seq
+           (iter, node_name, "resourceType", domain_resource.resourceType));
       else if
-        (process_sequence_common<Deployment::SatisfierProperty>(node->getOwnerDocument(), iter, node,
-                                                                node_name, "property", domain_resource.property,
-                                                                &SP_Handler::process_SatisfierProperty,
-                                                                this->id_map_));
+        (process_sequence_common<Deployment::SatisfierProperty>
+           (node->getOwnerDocument(), iter, node,
+            node_name, "property", domain_resource.property,
+            &SP_Handler::process_SatisfierProperty,
+            this->id_map_));
       else
         {
           node = iter->previousNode ();
@@ -143,8 +146,8 @@ void Domain_Handler::process_resource
     }
 }
 
-void Domain_Handler::process_bridge 
-(DOMNodeIterator* iter, Deployment::Bridge& domain_bridge)
+void Domain_Handler::process_bridge (DOMNodeIterator* iter,
+                                     Deployment::Bridge& domain_bridge)
 {
   for (DOMNode* node = iter->nextNode();
        node != 0;
@@ -157,20 +160,21 @@ void Domain_Handler::process_bridge
         {
         }
       else if
-        (process_string(iter, node_name, "name", domain_bridge.name));
+        (process_string (iter, node_name, "name", domain_bridge.name));
       else if
-        (process_string(iter, node_name, "label", domain_bridge.label));
+        (process_string (iter, node_name, "label", domain_bridge.label));
       else if
-        (process_reference_seq(node, node_name, "connect",
-                               domain_bridge.connectRef,
-                               this->index_, this->idref_map_))
+        (process_reference_seq (node, node_name, "connect",
+                                domain_bridge.connectRef,
+                                this->index_, this->idref_map_))
         {
           this->index_ = this->index_ + 1;
         }
       else if
-        (process_sequence_local<Deployment::Resource>(node->getOwnerDocument(), iter, node,
-                                                      node_name, "resource", domain_bridge.resource,
-                                                      this, &Domain_Handler::process_resource));
+        (process_sequence_local<Deployment::Resource>
+           (node->getOwnerDocument(), iter, node,
+            node_name, "resource", domain_bridge.resource,
+            this, &Domain_Handler::process_resource));
       else
         {
           iter->previousNode();
@@ -194,27 +198,28 @@ void Domain_Handler::process_interconnect (DOMNodeIterator* iter,
         {
         }
       else if
-        (process_string(iter, node_name, "name", domain_ic.name));
+        (process_string (iter, node_name, "name", domain_ic.name));
       else if
-        (process_string(iter, node_name, "label", domain_ic.label));
+        (process_string (iter, node_name, "label", domain_ic.label));
       else if
-        (process_reference_seq(node, node_name, "connect",
-                           domain_ic.connectRef,
-                           this->index_, this->idref_map_))
+        (process_reference_seq (node, node_name, "connect",
+                                domain_ic.connectRef,
+                                this->index_, this->idref_map_))
         {
           this->index_ = this->index_ + 1;
         }
       else if
-        (process_reference_seq(node, node_name, "connection",
-                               domain_ic.connectionRef,
-                               this->index_, this->idref_map_))
+        (process_reference_seq (node, node_name, "connection",
+                                domain_ic.connectionRef,
+                                this->index_, this->idref_map_))
         {
           this->index_ = this->index_ + 1;
         }
       else if
-        (process_sequence_local<Deployment::Resource>(node->getOwnerDocument(), iter, node,
-                                                      node_name, "resource", domain_ic.resource,
-                                                      this, &Domain_Handler::process_resource));
+        (process_sequence_local<Deployment::Resource>
+           (node->getOwnerDocument(), iter, node,
+            node_name, "resource", domain_ic.resource,
+            this, &Domain_Handler::process_resource));
       else
         {
           iter->previousNode();
@@ -224,9 +229,8 @@ void Domain_Handler::process_interconnect (DOMNodeIterator* iter,
 }
 
 
-void Domain_Handler::process_sr 
-(DOMNodeIterator* iter,
- Deployment::SharedResource& domain_sr)
+void Domain_Handler::process_sr (DOMNodeIterator* iter,
+                                 Deployment::SharedResource& domain_sr)
 {
   for (DOMNode* node = iter->nextNode();
        node != 0;
@@ -239,22 +243,23 @@ void Domain_Handler::process_sr
         {
         }
       else if
-        (process_string(iter, node_name, "name", domain_sr.name));
+        (process_string (iter, node_name, "name", domain_sr.name));
       else if
-        (process_string_seq(iter, node_name, "resourceType", domain_sr.resourceType));
+        (process_string_seq (iter, node_name, "resourceType", 
+                             domain_sr.resourceType));
       else if
-        (process_reference_seq(node, node_name, "node",
-                               domain_sr.nodeRef,
-                               this->index_, this->idref_map_))
+        (process_reference_seq (node, node_name, "node",
+                                domain_sr.nodeRef,
+                                this->index_, this->idref_map_))
         {
           this->index_ = this->index_ + 1;
         }
       else if
-        (process_sequence_common<Deployment::SatisfierProperty>(node->getOwnerDocument(), iter, node,
-                                                                node_name, "property", domain_sr.property,
-                                                                &SP_Handler::process_SatisfierProperty,
-                                                                this->id_map_));
-      // TODO: What about "any SatisfierProperty::value"
+        (process_sequence_common<Deployment::SatisfierProperty>
+           (node->getOwnerDocument(), iter, node,
+            node_name, "property", domain_sr.property,
+            &SP_Handler::process_SatisfierProperty,
+            this->id_map_));
       else
         {
           iter->previousNode();
diff --git a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp
index 4948ac9ef92..021ee1ab8d1 100644
--- a/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/IAD_Handler.cpp
@@ -3,20 +3,14 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "Property_Handler.h"
 #include "Requirement_Handler.h"
 #include "NIA_Handler.h"
 #include "IAD_Handler.h"
-
 #include "Process_Basic_Type.h"
 #include "Process_Element.h"
-
 #include <iostream>
 
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the package configuration and populate it
@@ -30,35 +24,40 @@ void IAD_Handler::process_ImplementationArtifactDescription
       XStr node_name (node->getNodeName());
 
       if (node_name == XStr 
-        (ACE_TEXT ("Deployment:ImplementationArtifactDescription")))
+             (ACE_TEXT ("Deployment:ImplementationArtifactDescription")))
         {
         }
       else if
-        (process_string(this->iter_, node_name, "label", iad.label));
+        (process_string (this->iter_, node_name, "label", iad.label));
       else if
-        (process_string(this->iter_, node_name, "UUID", iad.UUID));
+        (process_string (this->iter_, node_name, "UUID", iad.UUID));
       else if
-        (process_string_seq(this->iter_, node_name, "location", iad.location));
+        (process_string_seq (this->iter_, node_name, "location", 
+                             iad.location));
       else if
-        (process_sequence_common<Deployment::Property>(this->doc_, this->iter_, node,
-                                                       node_name, "execParameter", iad.execParameter,
-                                                       &Property_Handler::process_Property,
-                                                       this->id_map_));
+        (process_sequence_common<Deployment::Property>
+           (this->doc_, this->iter_, node,
+            node_name, "execParameter", iad.execParameter,
+            &Property_Handler::process_Property,
+            this->id_map_));
       else if
-        (process_sequence_common<Deployment::Requirement>(node->getOwnerDocument(), this->iter_, node,
-                                                          node_name, "deployRequirement", iad.deployRequirement,
-                                                          &Requirement_Handler::process_Requirement,
-                                                          this->id_map_));
+        (process_sequence_common<Deployment::Requirement>
+           (node->getOwnerDocument(), this->iter_, node,
+            node_name, "deployRequirement", iad.deployRequirement,
+            &Requirement_Handler::process_Requirement,
+            this->id_map_));
       else if
-        (process_sequence_remote<Deployment::NamedImplementationArtifact, NIA_Handler>
-         (this->doc_, this->iter_, node,
-          node_name, "dependsOn", iad.dependsOn,
-          &NIA_Handler::process_NamedImplementationArtifact, this->id_map_));
+        (process_sequence_remote<Deployment::NamedImplementationArtifact, 
+                                 NIA_Handler>
+           (this->doc_, this->iter_, node,
+            node_name, "dependsOn", iad.dependsOn,
+            &NIA_Handler::process_NamedImplementationArtifact, this->id_map_));
       else if
-        (process_sequence_common<Deployment::Property>(this->doc_, this->iter_, node,
-                                                       node_name, "infoProperty", iad.infoProperty,
-                                                       &Property_Handler::process_Property,
-                                                       this->id_map_));
+        (process_sequence_common<Deployment::Property>
+           (this->doc_, this->iter_, node,
+            node_name, "infoProperty", iad.infoProperty,
+            &Property_Handler::process_Property,
+            this->id_map_));
       else
         {
           this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp
index 33116c8a1bc..e1506fcd2f1 100644
--- a/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/IR_Handler.cpp
@@ -2,7 +2,6 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "IAD_Handler.h"
 #include "IR_Handler.h"
 #include "RUK_Handler.h"
@@ -11,11 +10,6 @@
 #include "Process_Element.h"
 #include "Property_Handler.h"
 
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the package configuration and populate it
@@ -32,22 +26,23 @@ void IR_Handler::process_ImplementationRequirement
         (ACE_TEXT ("Deployment:ImplementationRequirement")))
         {
         }
-      // TODO:
-      //      else if (node_name == XStr (ACE_TEXT ("resourceUsage")))
-      //        RUK_Handler::process_ResourceUsageKind (this->iter_, ir.resourceUsage);
       else if
-        (process_string (this->iter_, node_name, "resourcePort", ir.resourcePort));
+        (process_string (this->iter_, node_name, "resourcePort", 
+                         ir.resourcePort));
       else if
-        (process_string (this->iter_, node_name, "componentPort", ir.componentPort));
+        (process_string (this->iter_, node_name, "componentPort", 
+                         ir.componentPort));
       else if
-        (process_string (this->iter_, node_name, "resourceType", ir.resourceType));
+        (process_string (this->iter_, node_name, "resourceType", 
+                         ir.resourceType));
       else if
         (process_string (this->iter_, node_name, "name", ir.name));
       else if
-        (process_sequence_common<Deployment::Property>(this->doc_, this->iter_, node,
-                                                       node_name, "Property", ir.property,
-                                                       &Property_Handler::process_Property,
-                                                       this->id_map_));
+        (process_sequence_common<Deployment::Property>
+           (this->doc_, this->iter_, node,
+            node_name, "Property", ir.property,
+            &Property_Handler::process_Property,
+            this->id_map_));
       else
         {
           this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp
index 138ae192c7f..bce6afd2e7a 100644
--- a/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/MID_Handler.cpp
@@ -3,7 +3,6 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "Property_Handler.h"
 #include "Requirement_Handler.h"
 #include "NIA_Handler.h"
@@ -11,15 +10,10 @@
 #include "IR_Handler.h"
 #include "Process_Element.h"
 
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 void MID_Handler::process_MonolithicImplementationDescription
-(::Deployment::MonolithicImplementationDescription &mid)
+              (::Deployment::MonolithicImplementationDescription &mid)
 {
   for (DOMNode* node = this->iter_->nextNode();
        node != 0;
@@ -27,24 +21,28 @@ void MID_Handler::process_MonolithicImplementationDescription
     {
       XStr node_name (node->getNodeName());
       if (node_name == XStr 
-        (ACE_TEXT ("Deployment:MonolithicImplementationDescription")))
+               (ACE_TEXT ("Deployment:MonolithicImplementationDescription")))
         {
         }
       else if
-        (process_sequence_common<Deployment::Property>(this->doc_, this->iter_, node,
-                                                       node_name, "execParameter", mid.execParameter,
-                                                       &Property_Handler::process_Property,
-                                                       this->id_map_));
+        (process_sequence_common<Deployment::Property>
+           (this->doc_, this->iter_, node,
+            node_name, "execParameter", mid.execParameter,
+            &Property_Handler::process_Property,
+            this->id_map_));
       else if
-        (process_sequence_remote<Deployment::NamedImplementationArtifact, NIA_Handler>
-         (this->doc_, this->iter_, node,
-          node_name, "primaryArtifact", mid.primaryArtifact,
-          &NIA_Handler::process_NamedImplementationArtifact, this->id_map_));
+        (process_sequence_remote<Deployment::NamedImplementationArtifact, 
+                                 NIA_Handler>
+           (this->doc_, this->iter_, node,
+            node_name, "primaryArtifact", mid.primaryArtifact,
+            &NIA_Handler::process_NamedImplementationArtifact, 
+            this->id_map_));
       else if
-        (process_sequence_remote<Deployment::ImplementationRequirement, IR_Handler>
-         (this->doc_, this->iter_, node,
-          node_name, "deployRequirement", mid.deployRequirement,
-          &IR_Handler::process_ImplementationRequirement, this->id_map_));
+        (process_sequence_remote<Deployment::ImplementationRequirement, 
+                                 IR_Handler>
+           (this->doc_, this->iter_, node,
+            node_name, "deployRequirement", mid.deployRequirement,
+            &IR_Handler::process_ImplementationRequirement, this->id_map_));
       else
         {
           this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp
index e37528262ef..4d382f14f9a 100644
--- a/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/NIA_Handler.cpp
@@ -3,18 +3,11 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "IAD_Handler.h"
 #include "NIA_Handler.h"
-
 #include "Process_Basic_Type.h"
 #include "Process_Element.h"
 
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the package configuration and populate it
@@ -27,16 +20,18 @@ void NIA_Handler::process_NamedImplementationArtifact
     {
       XStr node_name (node->getNodeName());
       if (node_name == XStr 
-        (ACE_TEXT ("Deployment:NamedImplementationArtifact")))
+               (ACE_TEXT ("Deployment:NamedImplementationArtifact")))
         {
         }
       else if
-        (process_string(this->iter_, node_name, "name", nia.name));
+        (process_string (this->iter_, node_name, "name", nia.name));
       else if
-        (process_element_remote<Deployment::ImplementationArtifactDescription, IAD_Handler>
-         (this->doc_, this->iter_, node,
-          node_name, "referencedArtifact", nia.referencedArtifact,
-          &IAD_Handler::process_ImplementationArtifactDescription, this->id_map_));
+        (process_element_remote<Deployment::ImplementationArtifactDescription,
+                                IAD_Handler>
+           (this->doc_, this->iter_, node,
+            node_name, "referencedArtifact", nia.referencedArtifact,
+            &IAD_Handler::process_ImplementationArtifactDescription, 
+            this->id_map_));
       else
        {
          this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp
index 2c8f0f949a9..3fe95ebf758 100644
--- a/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/PCI_Handler.cpp
@@ -3,22 +3,16 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "CompImplDesc_Handler.h"
 #include "PCI_Handler.h"
 #include "Process_Basic_Type.h"
 #include "Process_Element.h"
 
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the package configuration and populate it
 void PCI_Handler::process_PackagedComponentImplementation
-(::Deployment::PackagedComponentImplementation &pci)
+                      (::Deployment::PackagedComponentImplementation &pci)
 {
   for (DOMNode* node = this->iter_->nextNode();
        node != 0;
@@ -27,16 +21,19 @@ void PCI_Handler::process_PackagedComponentImplementation
       XStr node_name (node->getNodeName());
 
       if (node_name == XStr 
-          (ACE_TEXT ("Deployment:PackagedComponentImplementation")))
+            (ACE_TEXT ("Deployment:PackagedComponentImplementation")))
         {
         }
       else if
-        (process_string(this->iter_, node_name, "name", pci.name));
+        (process_string (this->iter_, node_name, "name", pci.name));
       else if
-        (process_element_remote<Deployment::ComponentImplementationDescription, CompImplDesc_Handler>
-         (this->doc_, this->iter_, node,
-          node_name, "referencedImplementation", pci.referencedImplementation,
-          &CompImplDesc_Handler::process_ComponentImplementationDescription, this->id_map_));
+        (process_element_remote<Deployment::ComponentImplementationDescription,
+                                CompImplDesc_Handler>
+           (this->doc_, this->iter_, node,
+            node_name, "referencedImplementation", 
+            pci.referencedImplementation,
+            &CompImplDesc_Handler::process_ComponentImplementationDescription, 
+            this->id_map_));
       else
         {
           this->iter_->previousNode ();
diff --git a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp
index 1ea577548d6..d7cc84c08b6 100644
--- a/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp
+++ b/TAO/CIAO/DnC/Config_Handlers/PC_Handler.cpp
@@ -3,7 +3,6 @@
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
-
 #include "Property_Handler.h"
 #include "Requirement_Handler.h"
 #include "CPR_Handler.h"
@@ -12,15 +11,11 @@
 #include "Process_Element.h"
 #include "Process_Basic_Type.h"
 
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
 BEGIN_DEPLOYMENT_NAMESPACE
 
 /// handle the package configuration and populate it
-void PC_Handler::process_PackageConfiguration(::Deployment::PackageConfiguration &pc)
+void PC_Handler::process_PackageConfiguration
+                    (::Deployment::PackageConfiguration &pc)
 {
   for (DOMNode* node = this->iter_->nextNode();
        node != 0;
@@ -28,13 +23,13 @@ void PC_Handler::process_PackageConfiguration(::Deployment::PackageConfiguration
     {
       XStr node_name (node->getNodeName());
       if (node_name == XStr 
-          (ACE_TEXT ("Deployment:PackageConfiguration")))
+                    (ACE_TEXT ("Deployment:PackageConfiguration")))
         {
         }
-      else if (process_string(this->iter_, node_name, "label", pc.label))
+      else if (process_string (this->iter_, node_name, "label", pc.label))
         {
         }
-      else if (process_string(this->iter_, node_name, "UUID", pc.UUID))
+      else if (process_string (this->iter_, node_name, "UUID", pc.UUID))
         {
         }
       else if (process_sequence_remote