Mon Sep 27 15:42:12 2004 Jules White <jules@dre.vanderbilt.edu>

6 files changed, 55 insertions, 40 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h
index 52fc4797548..4c918944f33 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h
@@ -45,7 +45,7 @@ namespace CIAO
     *       // @@ Jules, why Any type?
     * descriptor files, to the  corresponding CORBA IDL Any type.
     */
-    class Config_Handlers_Export ADD_Handler : public Base_Handler
+    class Config_Handlers_Export ADD_Handler 
     {
     public:
       ADD_Handler (void);
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
index 43d77a6d924..a0f3bbbb602 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
@@ -1,3 +1,13 @@
+Mon Sep 27 15:42:12 2004  Jules White <jules@dre.vanderbilt.edu>
+  
+  * DAnCE/Config_Handlers/ID_Handler.h:
+  * DAnCE/Config_Handlers/IDD_Handler.h:
+  * DAnCE/Config_Handlers/ADD_Handler.h:
+  * DAnCE/Config_Handlers/RDD_Handler.h:
+  * DAnCE/Config_Handelrs/ComponentPropertyDescription_Handler.h:
+  
+  Removed references to Base_Handler.
+
 Sat Sep 25 14:56:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
  	* DAnCE/Config_Handlers/ADD_Handler.cpp:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h
index dc23e2a4572..5ab46a0aca3 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h
@@ -1,4 +1,4 @@
-//================================================
+//==============================================================
 /**
  *  @file  ComponentPropertyDescription_Handler.h
  *
@@ -6,57 +6,64 @@
  *
  *  @author Jules White <jules@dre.vanderbilt.edu>
  */
-//================================================
-
-#ifndef COMPONENTPROPERTYDESCRIPTION_HANDLER_H
-#define COMPONENTPROPERTYDESCRIPTION_HANDLER_H
+//================================================================
 
+#ifndef CIAO_CONFIG_HANDLERS_ComponentPropertyDescription_Handler_H
+#define CIAO_CONFIG_HANDLERS_ComponentPropertyDescription_Handler_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
-#include "Basic_Deployment_Data.hpp"
 
+#include "Basic_Deployment_Data.hpp"
+#include "Config_Handlers_export.h"
+#include "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-namespace CIAO{
 
-  namespace Config_Handlers{
+namespace Deployment
+{
+  class ComponentPropertyDescription;
+}
 
-  /*
-   * @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.
-   *
-   */
 
-    // @@ Jules, all of the classes require the export macro to be usable.
+namespace CIAO
+{
 
-   class ComponentPropertyDescription_Handler{
+  namespace Config_Handlers
+  {
 
-    public:
+   class ComponentPropertyDescription;
 
-      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);
-   };
+   /*
+    * @class ComponentPropertyDescription_Handler
+    *
+    * @brief Handler class for <ComponentPropertyDescription> types.
+    *
+    * This class defines handler methods to map values from
+    * XSC ComponentPropertyDescription objects, parsed from the descriptor files, to the
+    * corresponding CORBA IDL Any type.
+    *
+    */
+    
+    class Config_Handlers_Export ComponentPropertyDescription_Handler{
+     
+      public:
 
- }
+        ComponentPropertyDescription_Handler (void);
+        virtual ~ComponentPropertyDescription_Handler (void);
+
+        void get_ComponentPropertyDescription (
+             Deployment::ComponentPropertyDescription& toconfig, 
+             ComponentPropertyDescription& desc);
+
+    };
+  }
 }
 
-#include /**/ "ace/post.h"
-#endif /* COMPONENTPROPERTYDESCRIPTION_HANDLER_H */
+#include /**/ "ace/post.h" 
+#endif /* CIAO_CONFIG_HANDLERS_ComponentPropertyDescription_Handler_H */
+
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
index fbf47b28c5b..b1a1b4d878d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
@@ -49,7 +49,7 @@ namespace CIAO
     *
     */
     
-    class Config_Handlers_Export ID_Handler : public Base_Handler{
+    class Config_Handlers_Export ID_Handler {
      
       public:
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h
index af320cad47d..a97490504c5 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h
@@ -13,8 +13,6 @@
 #define CIAO_CONFIG_HANDLERS_MDD_Handler_H
 #include /**/ "ace/pre.h"
 
-#include "Base_Handler.h"
-
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h
index 1696c58c5f5..a4afbab935b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h
@@ -49,7 +49,7 @@ namespace CIAO
     *
     */
     
-    class Config_Handlers_Export RDD_Handler : public Base_Handler{
+    class Config_Handlers_Export RDD_Handler {
      
       public: