Thu Sep 02 15:01:21 2004 Jules White <jules@dre.vanderbilt.edu>

12 files changed, 446 insertions, 182 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.cpp
index 3203b0ad7a4..f7c145d0da7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.cpp
@@ -18,7 +18,7 @@ namespace CIAO
 
 
     void
-    ANY_Handler::get_any (CORBA::Any& toconfig,
+    ANY_Handler::get_Any (CORBA::Any& toconfig,
                           Any& desc)
     {
 
@@ -33,7 +33,7 @@ namespace CIAO
         {
           // @@ Jules, please try using regular C++ casts
           toconfig <<=
-            static_cast <CORBA::Short> (value.short ());
+            static_cast <CORBA::Short> (value.short_ ());
         }
       else if (value.ushort_p ())
         {
@@ -43,7 +43,7 @@ namespace CIAO
       else if (value.long_p ())
         {
           toconfig <<=
-            static_cast <CORBA::UShort> (value.long ());
+            static_cast <CORBA::UShort> (value.long_ ());
         }
       else if (value.ulong_p ())
         {
@@ -58,7 +58,7 @@ namespace CIAO
       else if (value.double_p ())
         {
           toconfig <<=
-            static_cast <CORBA::Double> (value.double ());
+            static_cast <CORBA::Double> (value.double_ ());
         }
       else if (value.float_p ())
         {
@@ -85,12 +85,7 @@ namespace CIAO
           toconfig <<=
             static_cast <CORBA::ULongLong> (value.ulonglong ());
         }
- //if(value.longdouble_p()){
- //   toconfig <<= ACE_static_cast (CORBA::LongDouble,
- //                               CORBA::LongDouble(value.longdouble()));
- // }
-
-      return toconfig;
+        
     }
   }
 }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h
index 989cb071f3a..08a72795ae5 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h
@@ -14,7 +14,6 @@
 
 #include "Basic_Deployment_Data.hpp"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -39,20 +38,17 @@ namespace CIAO
     * corresponding CORBA IDL Any type.
     *
     */
-
-    class ANY_Handler
-    {
-    public:
-
-      ANY_Handler (void);
-
-      virtual ~ANY_Handler (void);
-
-      static void get_any(CORBA::Any& toconfig,
-                          Any& desc);
+    
+    class ANY_Handler{
+     
+      public:
+       
+        ANY_Handler (void);
+        virtual ~ANY_Handler (void);
+  
+        static void get_Any (CORBA::Any& toconfig, Any& desc);          
 
     };
-
   }
 }
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp
index b1a56970789..ae0df2dcedf 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp
@@ -3,8 +3,8 @@
 #include "CID_Handler.h"
 #include "Prop_Handler.h"
 #include "CPD_Handler.h"
+#include "ComponentPropertyDescription_Handler.h"
 
-typedef ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
 
 namespace CIAO
 {
@@ -47,53 +47,63 @@ namespace CIAO
         //Copy the values of the sequence types idlFile and
         //supportedType to the
         //<Deployment::ComponentInterfaceDescription>.
-        if(!desc.supportedType().empty())
-        {
-         toconfig.supportedType.length (1);
-         toconfig.supportedType[0] =
-                  CORBA::string_dup (desc.supportedType().c_str());
-        }
-    }
-
-    //Make sure the <idlFile> property
-    //is actually present before attempting
-    //any operations on it.
-    if(desc.idlFile_p () ){
-        if(!desc.idlFile().empty())
-        {
-         toconfig.idlFile.length (1);
-         toconfig.idlFile[0] =
-                  CORBA::string_dup (desc.idlFile().c_str());
-        }
-    }
-
-
-    Prop_Handler propertyhandler;
-
-    //The IDL for the <configProperty> specifies
-    //a sequence of <Property> structs but the schema
-    //specifies <configProperty> as a single
-    //<Property>. We construct that single property
-    //element and assign it to the first position in the
-    //<configProperty> sequence. We only do this if it
-    //is present.
-    if(desc.configProperty_p () )
-    {
-     //First construct the <Deployment::Property>
-     //to configure.
-     Deployment::Property prop;
-
-     //Now, propogate the values from the <desc> into <prop>.
-     propertyhandler.get_Property (prop,desc.configProperty());
+        if (desc.supportedType ().empty () == 0)
+          {
+            toconfig.supportedType.length (toconfig.supportedType.length () + 1);
+            toconfig.supportedType[toconfig.supportedType.length () - 1] =
+                     CORBA::string_dup (desc.supportedType ().c_str ());
+  
+          }
+      }
+        
+     //Make sure the <idlFile> property
+     //is actually present before attempting
+     //any operations on it.
+     if (desc.idlFile_p ())
+       {           
+         if (desc.idlFile ().empty () == 0)
+           {
+             toconfig.idlFile.length (toconfig.idlFile.length () + 1);
+             toconfig.idlFile [toconfig.idlFile.length () - 1] = 
+                      CORBA::string_dup (desc.idlFile ().c_str ());
+           }           
+       }
+        
+        
+     Prop_Handler propertyhandler;
+        
+     //The IDL for the <configProperty> specifies
+     //a sequence of <Property> structs but the schema
+     //specifies <configProperty> as a single 
+     //<Property>. We construct that single property
+     //element and assign it to the first position in the
+     //<configProperty> sequence. We only do this if it
+     //is present.
+     if (desc.configProperty_p ())
+       {
+         //First construct the <Deployment::Property>
+         //to configure.
+         Deployment::Property prop;
+          
+         //Now, propogate the values from the <desc> into <prop>.
+         propertyhandler.get_Property (prop,desc.configProperty ());
+             
+         //Increase the size of the sequence to handle
+         //the new value.
+         toconfig.configProperty.length (
+                  toconfig.configProperty.length () + 1);
+             
+          //Finally, add it to the sequence.
+          toconfig.configProperty [toconfig.configProperty.length () - 1] = prop;
 
-     //Finally, add it to the sequence.
-     toconfig.configProperty.length (1);
-     toconfig.configProperty[0] = prop;
-    }
+      }
 
-    //Create the handler for the
-    //<ComponentPortDescriptions>.
-        CPD_Handler cpd_handler;
+    
+        
+     //Create the handler for the
+     //<ComponentPortDescriptions>.
+     CPD_Handler cpd_handler; 
+    	
 
     //Iterate through each of the XSC Component
     //Port Descriptions and use the CPD_Handler
@@ -103,27 +113,60 @@ namespace CIAO
            port (desc.begin_port ());
            port != desc.end_port ();
            ++port)
-    {
-         toconfig.port.length (toconfig.port.length () + 1);
-         cpd_handler.get_ComponentPortDescription(
-                     toconfig.port[toconfig.port.length () - 1],
-                     *port);
-    }
-
-    /*ComponentPropertyDescription stuff
-     *
-     *
-     *
-     *
-     *
-     */
-
-
-
-
-
-
-
+      {
+        toconfig.port.length (toconfig.port.length () + 1);
 
-        return toconfig;
+        cpd_handler.get_ComponentPortDescription (
+                     toconfig.port [toconfig.port.length () - 1],
+                     *port); 
+      }
+        
+        
+     //If there is a 
+     //<CIAO::ConfigHandlers::ComponentPropertyDescription>
+     //then propogate its value to the 
+     //<Deployment::ComponentInterfaceDescription>.
+     if (desc.property_p ())
+       {
+         //Create the ComponentPropertyDescription handler.
+         ComponentPropertyDescription_Handler cprop_handler;
+            
+         //Increase the size of the property sequence.
+         toconfig.property.length (
+                           toconfig.property.length () + 1);
+         //Now delegate the propogation to the
+         //<ComponentPropertyDescription_Handler>.
+         cprop_handler.get_ComponentPropertyDescription (
+                       toconfig.property [toconfig.property.length () -1],
+                       desc.property ());
+       }
+         
+         
+         
+     //The IDL for the <infoProperty> specifies
+     //a sequence of <Property> structs but the schema
+     //specifies <infoProperty> as a single 
+     //<Property>. We construct that single property
+     //element and assign it to the first position in the
+     //<infoProperty> sequence. We only do this if it
+     //is present.
+     if (desc.infoProperty_p () )
+       {
+         //First construct the <Deployment::Property>
+         //to configure.
+         Deployment::Property prop;
+                 
+         //Now, propogate the values from the <desc> into <prop>.
+         propertyhandler.get_Property (prop,desc.infoProperty ());
+                 
+         //Finally, add it to the sequence.
+         toconfig.infoProperty.length (
+                  toconfig.infoProperty.length () + 1);
+         toconfig.infoProperty [toconfig.infoProperty.length () - 1] = prop;
+       }
+
+     
+     return 1;
+    }
+  }
 }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h
index 0413a4a8fce..7a33ab38bad 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h
@@ -21,7 +21,7 @@
 
 namespace Deployment
 {
-  namespace ComponentInterfaceDescription;
+  class ComponentInterfaceDescription;
 }
 
 namespace CIAO
@@ -42,6 +42,7 @@ namespace CIAO
     {
       public:
 
+
       CID_Handler (void);
       virtual ~CID_Handler(void);
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp
index a3f5aa695d9..9aa57aa10e6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp
@@ -1,52 +1,53 @@
 // $Id$
 
-
 #include "CPD_Handler.h"
 
-
-
-CIAO::Config_Handlers::CPD_Handler::CPD_Handler()
-{}
-CIAO::Config_Handlers::CPD_Handler::~CPD_Handler()
-{}
-
-using CIAO::Config_Handlers;
-
-///This method maps the values from the
-///XSC object <ComponentPortDescription> to
-///the CORBA IDL type <Deployment::ComponentPortDescription>.
-Deployment::ComponentPortDescription &
-CIAO::Config_Handlers::CPD_Handler::get_ComponentPortDescription(
-                   Deployment::ComponentPortDescription& toconfig,
-				   ComponentPortDescription& desc)
+namespace CIAO
 {
-	//We make sure that a value exists for supportedType
-    //before increasing the size of the sequence.
+  namespace Config_Handlers
+  {
     
-    if(!desc.supportedType().empty())
+    CPD_Handler::CPD_Handler (void)
     {
-        toconfig.supportedType.length(1);
-		toconfig.supportedType[0] = 
-            CORBA::string_dup(desc.supportedType().c_str());
     }
-   
-    
-    toconfig.name = CORBA::string_dup(desc.name().c_str());
-    toconfig.specificType =
-                CORBA::string_dup(desc.specificType().c_str());
-    
 
-    //The DnC spec maps these CORBA IDL booleans to 
-    //strings. Therefore, we set them to true if a 
-    //value was provided (and they aren't an empty string)
-    //and false otherwise.
-    toconfig.provider = !desc.provider().empty();
-	toconfig.exclusiveProvider = !desc.exclusiveProvider().empty();
-    toconfig.exclusiveUser = !desc.exclusiveUser().empty();
-    toconfig.optional = !desc.optional().empty();
-    
+    CPD_Handler::~CPD_Handler (void)
+    {
+    }
 
-    //Return the Deployment::ComponentPortDescription
-	return toconfig;
-	
+    ///This method maps the values from the
+    ///XSC object <ComponentPortDescription> to
+    ///the CORBA IDL type <Deployment::ComponentPortDescription>.
+    void
+    CPD_Handler::get_ComponentPortDescription (
+                 Deployment::ComponentPortDescription& toconfig,
+                 ComponentPortDescription& desc)
+    {
+     //We make sure that a value exists for supportedType
+     //before increasing the size of the sequence.
+     if (!desc.supportedType ().empty ()) 
+       {
+         toconfig.supportedType.length (1);
+         toconfig.supportedType[0] = 
+           CORBA::string_dup (desc.supportedType ().c_str ());
+       }
+        
+       
+        
+     toconfig.name = CORBA::string_dup (desc.name ().c_str ());
+     toconfig.specificType = 
+       CORBA::string_dup (desc.specificType ().c_str ());
+        
+    
+     //The DnC spec maps these CORBA IDL booleans to 
+     //strings. Therefore, we set them to true if a 
+     //value was provided (and they aren't an empty string)
+     //and false otherwise.
+     toconfig.provider = !desc.provider ().empty ();
+     toconfig.exclusiveProvider = !desc.exclusiveProvider ().empty ();
+     toconfig.exclusiveUser = !desc.exclusiveUser ().empty ();
+     toconfig.optional = !desc.optional ().empty ();
+     
+    }
+  }
 }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h
index 26aea0f81a9..6ba7b654910 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h
@@ -23,7 +23,7 @@
 
 
 namespace CIAO{
-	
+  
   namespace Config_Handlers{
 
   /*
@@ -38,21 +38,20 @@ namespace CIAO{
    */
 
    class CPD_Handler{
-	
+  
     public:
-		
-    CPD_Handler();
-    virtual ~CPD_Handler();
-			
-    ///This method maps the values from the
-    ///XSC object <ComponentInterfaceDescription> to
-    ///the CORBA IDL type <Deployment::ComponentInterfaceDescription>.	
-	Deployment::ComponentPortDescription&
-	get_ComponentPortDescription(
-	  Deployment::ComponentPortDescription& toconfig,
-	  ComponentPortDescription& desc
-    );
-   };
+    
+      CPD_Handler (void);
+      virtual ~CPD_Handler (void);
+        
+      ///This method maps the values from the
+      ///XSC object <ComponentInterfaceDescription> to
+      ///the CORBA IDL type <Deployment::ComponentInterfaceDescription>.  
+      void
+      get_ComponentPortDescription (
+        Deployment::ComponentPortDescription& toconfig,
+        ComponentPortDescription& desc);
+       };
 
  }
 }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp
new file mode 100644
index 00000000000..1f1593f976a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -0,0 +1,35 @@
+//$Id$
+
+#include "ComponentPropertyDescription_Handler.h"
+#include "DataType_Handler.h"
+
+
+namespace CIAO{
+    
+  namespace Config_Handlers{
+
+    CIAO::Config_Handlers::ComponentPropertyDescription_Handler::ComponentPropertyDescription_Handler(void)
+    {
+    }
+    CIAO::Config_Handlers::ComponentPropertyDescription_Handler::~ComponentPropertyDescription_Handler(void)
+    {
+    }
+    
+    void
+    CIAO::Config_Handlers::ComponentPropertyDescription_Handler::get_ComponentPropertyDescription (
+            Deployment::ComponentPropertyDescription& toconfig,
+            ComponentPropertyDescription& desc)
+    {
+      //Copy the name to the CPD.
+      toconfig.name = CORBA::string_dup (desc.name ().c_str ());
+      
+      //Delegate the DataType to the
+      //DataType_Handler.
+      DataType_Handler dtypehandler;
+      CORBA::TypeCode_ptr tcptr = toconfig.type;
+      dtypehandler.get_DataType (tcptr,desc.type ());
+      
+    }
+    
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h
new file mode 100644
index 00000000000..ade659c667d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h
@@ -0,0 +1,60 @@
+//================================================
+/**
+ *  @file  ComponentPropertyDescription_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef COMPONENTPROPERTYDESCRIPTION_HANDLER_H
+#define COMPONENTPROPERTYDESCRIPTION_HANDLER_H
+
+#include /**/ "ace/pre.h"
+                                                                                
+#include "ciao/DeploymentC.h"
+#include "Basic_Deployment_Data.hpp"
+             
+                                                                                
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+namespace CIAO{
+    
+  namespace Config_Handlers{
+
+  /*
+   * @class ComponentPropertyDescription_Handler
+   * 
+   * @brief Handler class for <ComponentPortDescription> types.
+   * 
+   * This class defines handler methods to map values from 
+   * XSC objects, parsed from the descriptor files, to the
+   * corresponding CORBA IDL type for the schema element.
+   * 
+   */
+
+   class ComponentPropertyDescription_Handler{
+ 
+    public:
+       
+      ComponentPropertyDescription_Handler (void);
+      virtual ~ComponentPropertyDescription_Handler (void);
+              
+      ///This method maps the values from the
+      ///XSC object <ComponentPropertyDescription> to
+      ///the CORBA IDL type <Deployment::ComponentPropertyDescription>.    
+      void
+      get_ComponentPropertyDescription (
+          Deployment::ComponentPropertyDescription& toconfig,
+          ComponentPropertyDescription& desc);
+   };
+
+ }
+}
+
+#include /**/ "ace/post.h"
+#endif /* COMPONENTPROPERTYDESCRIPTION_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp
new file mode 100644
index 00000000000..1cfa7f9b03a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp
@@ -0,0 +1,71 @@
+//$Id$
+
+#include "DataType_Handler.h"
+
+
+namespace CIAO{
+    
+  namespace Config_Handlers{
+    
+    CIAO::Config_Handlers::DataType_Handler::DataType_Handler (void)
+    {
+    }
+    CIAO::Config_Handlers::DataType_Handler::~DataType_Handler (void)
+    {
+    }
+    
+    ///This method takes a <CIAO::Config_Handlers::DataType>
+    ///and returns the corresponding CORBA::TypeCode.
+    void
+    CIAO::Config_Handlers::DataType_Handler::get_DataType (
+                                CORBA::TypeCode_ptr& type,
+                                DataType& desc)
+    {
+      
+        TCKind kind (desc.kind ());
+        
+        if (kind == TCKind::tk_null)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+        else if (kind == TCKind::tk_short)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
+        else if (kind == TCKind::tk_long)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
+        else if (kind == TCKind::tk_ushort)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
+        else if (kind == TCKind::tk_ulong)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
+        else if (kind == TCKind::tk_float)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
+        else if (kind == TCKind::tk_double)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
+        else if (kind == TCKind::tk_boolean)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
+        else if (kind == TCKind::tk_char)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
+        else if (kind == TCKind::tk_octet)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
+        else if (kind == TCKind::tk_string)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+        else if (kind == TCKind::tk_longlong)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
+        else if (kind == TCKind::tk_ulonglong)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
+        else if (kind == TCKind::tk_longdouble)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
+        else if (kind == TCKind::tk_wchar)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
+        else if (kind == TCKind::tk_wstring)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+        else if (kind == TCKind::tk_any)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
+        else if (kind == TCKind::tk_TypeCode)
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
+          
+    //   This case used to be supported...is it not in the schema?
+    //    else if (kind == TCKind::tk_Object)
+    //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
+      
+    }
+    
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.h
new file mode 100644
index 00000000000..7f97f76b1c0
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.h
@@ -0,0 +1,58 @@
+//================================================
+/**
+ *  @file  DataType_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef DATATYPE_HANDLER_H
+#define DATATYPE_HANDLER_H
+
+#include /**/ "ace/pre.h"
+                                                                                
+#include "ciao/DeploymentC.h"
+#include "Basic_Deployment_Data.hpp"
+             
+                                                                                
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+namespace CIAO{
+    
+  namespace Config_Handlers{
+
+  /*
+   * @class DataType_Handler
+   * 
+   * @brief Handler class for <ComponentPortDescription> types.
+   * 
+   * This class defines handler methods to map values from 
+   * XSC objects, parsed from the descriptor files, to the
+   * corresponding CORBA IDL type for the schema element.
+   * 
+   */
+
+   class DataType_Handler{
+ 
+    public:
+       
+      DataType_Handler (void);
+      virtual ~DataType_Handler (void);
+              
+      ////This method takes a <CIAO::Config_Handlers::DataType>
+      ///and returns the corresponding CORBA::TypeCode.
+      void
+      get_DataType (CORBA::TypeCode_ptr& type,
+                    DataType& desc);
+    };
+
+ }
+}
+
+#include /**/ "ace/post.h"
+#endif /* DATATYPE_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp
index 19adfe7285d..9b6279a3b3d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp
@@ -3,29 +3,36 @@
 #include "Prop_Handler.h"
 #include "ANY_Handler.h"
 
-CIAO::Config_Handlers::Prop_Handler::Prop_Handler()
-{}
-CIAO::Config_Handlers::Prop_Handler::~Prop_Handler()
-{}
-
-            
-///This method maps the values from the
-///XSC object <CIAO::Config_Handlers::Property> to
-///the CORBA IDL type <Deployment::Property>.    
-Deployment::Property&
-CIAO::Config_Handlers::Prop_Handler::get_Property(
-                                    Deployment::Property& toconfig,
-                                    Property& desc)
+namespace CIAO
 {
-  toconfig.name = CORBA::string_dup (desc.name().c_str());
-  
-  //Create the ANY_Handler to
-  //delegate the Any configuration
-  //to.
-  ANY_Handler anyhandler;
-  
-  //Delegate the Any configuration.
-  anyhandler.get_Any (toconfig.value, desc.value());
-  
-  return toconfig;
+  namespace Config_Handlers
+  {
+
+    CIAO::Config_Handlers::Prop_Handler::Prop_Handler (void)
+    {
+    }
+    CIAO::Config_Handlers::Prop_Handler::~Prop_Handler (void)
+    {
+    }    
+                
+    ///This method maps the values from the
+    ///XSC object <CIAO::Config_Handlers::Property> to
+    ///the CORBA IDL type <Deployment::Property>.    
+    void
+    CIAO::Config_Handlers::Prop_Handler::get_Property (
+                                         Deployment::Property& toconfig,
+                                         Property& desc)
+    {
+      toconfig.name = CORBA::string_dup (desc.name ().c_str ());
+      
+      //Create the ANY_Handler to
+      //delegate the Any configuration
+      //to.
+      ANY_Handler anyhandler;
+      
+      //Delegate the Any configuration.
+      anyhandler.get_Any (toconfig.value, desc.value ());
+      
+    }
+  }
 }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h
index ee3c9ac2ff0..c583124a433 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h
@@ -41,16 +41,14 @@ namespace CIAO{
  
     public:
        
-    Prop_Handler();
-    virtual ~Prop_Handler();
-            
-    ///This method maps the values from the
-    ///XSC object <CIAO::Config_Handlers::Property> to
-    ///the CORBA IDL type <Deployment::Property>.    
-    Deployment::Property&
-    get_Property(
-        Deployment::Property& toconfig,
-        Property& desc);
+      Prop_Handler (void);
+      virtual ~Prop_Handler (void);
+              
+      ///This method maps the values from the
+      ///XSC object <CIAO::Config_Handlers::Property> to
+      ///the CORBA IDL type <Deployment::Property>.    
+      void get_Property (Deployment::Property& toconfig,
+                         Property& desc);
    };
 
  }