Wed Sep 22 12:29:52 2004 Jules White <jules@dre.vanderbilt.edu>

6 files changed, 281 insertions, 6 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
index ef81a2d76b4..2d7d23639d9 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
@@ -5,6 +5,9 @@
 #include "ADD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "Prop_Handler.h"
+#include "Req_Handler.h"
+#include "RDD_Handler.h"
 
 
 
@@ -49,12 +52,42 @@ namespace CIAO
            item (desc.begin_location ());
            item != desc.end_location ();
            ++item)
-       {	 
-         toconfig.location.length (
-           toconfig.location.length () + 1);
-         toconfig.location[toconfig.location.length () - 1] =
-           CORBA::string_dup (item->c_str ());
-       }
+        {	 
+           toconfig.location.length (
+             toconfig.location.length () + 1);
+           toconfig.location[toconfig.location.length () - 1] =
+             CORBA::string_dup (item->c_str ());
+        }
+      
+      if (desc.execParameter_p ())
+        {
+	 			  Prop_Handler handler;
+          toconfig.execParameter.length (
+            toconfig.execParameter.length () + 1);
+          handler.get_Property (
+            toconfig.execParameter[toconfig.execParameter.length () - 1],
+            desc.execParameter ());
+        }
+      
+      if (desc.deployRequirement_p ())
+        {
+	 			  Req_Handler handler;
+          toconfig.deployRequirement.length (
+            toconfig.deployRequirement.length () + 1);
+          handler.get_Requirement (
+            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
+            desc.deployRequirement ());
+        }
+      
+      if (desc.deployedResource_p ())
+        {
+	 			  RDD_Handler handler;
+          toconfig.deployedResource.length (
+            toconfig.deployedResource.length () + 1);
+          handler.get_ResourceDeploymentDescription (
+            toconfig.deployedResource[toconfig.deployedResource.length () - 1],
+            desc.deployedResource ());
+        }
 
       
     }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
index cdd12c6a930..afba4da3a73 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
@@ -1,4 +1,17 @@
+Wed Sep 22 12:29:52 2004  Jules White <jules@dre.vanderbilt.edu>
+
+  * Any_Handler.h:
+  * Any_Handler.cpp:
+  * ADD_Handler.h:
+  * ADD_Handler.cpp:
+  * RDD_Handler.h:
+  * RDD_Handler.cpp:
+  
+    Added a class to handle ImplementationDependency. Changed ADD_Handler
+    to use RDD_Handler for ResourceDeploymentDependencies. 
+    
 Wed Sep 22 10:47:02 2004  Jules White <jules@dre.vanderbilt.edu>
+
   * Any_Handler.h:
   * Any_Handler.cpp:
   
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp
new file mode 100644
index 00000000000..8e09f935c03
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp
@@ -0,0 +1,41 @@
+
+// $Id$
+
+
+#include "ID_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+
+    ID_Handler::ID_Handler (void)
+    {
+    }
+
+    ID_Handler::~ID_Handler (void)
+    {
+    }
+
+
+    void
+    ID_Handler::get_ImplementationDependency (
+                    Deployment::ImplementationDependency& toconfig, 
+                    ImplementationDependency& desc)
+    {
+
+
+      
+      toconfig.requiredType=
+           CORBA::string_dup (desc.requiredType ().c_str ());
+
+      
+    }
+
+  }
+
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
new file mode 100644
index 00000000000..fbf47b28c5b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
@@ -0,0 +1,69 @@
+
+      //==============================================================
+/**
+ *  @file  ID_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
+//================================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_ID_Handler_H
+#define CIAO_CONFIG_HANDLERS_ID_Handler_H
+#include /**/ "ace/pre.h"
+
+#include "Base_Handler.h"
+#include "Config_Handlers_export.h"
+#include "ace/config-lite.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+
+namespace Deployment
+{
+  class ImplementationDependency;
+}
+
+
+namespace CIAO
+{
+
+  namespace Config_Handlers
+  {
+
+   class ImplementationDependency;
+
+
+   /*
+    * @class ID_Handler
+    *
+    * @brief Handler class for <ImplementationDependency> types.
+    *
+    * This class defines handler methods to map values from
+    * XSC ImplementationDependency objects, parsed from the descriptor files, to the
+    * corresponding CORBA IDL Any type.
+    *
+    */
+    
+    class Config_Handlers_Export ID_Handler : public Base_Handler{
+     
+      public:
+
+        ID_Handler (void);
+        virtual ~ID_Handler (void);
+
+        void get_ImplementationDependency (
+             Deployment::ImplementationDependency& toconfig, 
+             ImplementationDependency& desc);
+
+    };
+  }
+}
+
+#include /**/ "ace/post.h" 
+#endif /* CIAO_CONFIG_HANDLERS_ID_Handler_H */
+
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp
new file mode 100644
index 00000000000..730fc9bb711
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp
@@ -0,0 +1,50 @@
+
+// $Id$
+
+
+#include "RDD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "Any_Handler.h"
+
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+
+    RDD_Handler::RDD_Handler (void)
+    {
+    }
+
+    RDD_Handler::~RDD_Handler (void)
+    {
+    }
+
+
+    void
+    RDD_Handler::get_ResourceDeploymentDescription (
+                    Deployment::ResourceDeploymentDescription& toconfig, 
+                    ResourceDeploymentDescription& desc)
+    {
+
+
+      
+      toconfig.requirementName=
+           CORBA::string_dup (desc.requirementName ().c_str ());
+      
+      toconfig.resourceName=
+           CORBA::string_dup (desc.resourceName ().c_str ());
+      
+      Any_Handler resourceValue_handler;
+         resourceValue_handler.get_Any (
+           toconfig.resourceValue,
+           desc.resourceValue ());
+
+      
+    }
+
+  }
+
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h
new file mode 100644
index 00000000000..1696c58c5f5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RDD_Handler.h
@@ -0,0 +1,69 @@
+
+      //==============================================================
+/**
+ *  @file  RDD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
+//================================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_RDD_Handler_H
+#define CIAO_CONFIG_HANDLERS_RDD_Handler_H
+#include /**/ "ace/pre.h"
+
+#include "Base_Handler.h"
+#include "Config_Handlers_export.h"
+#include "ace/config-lite.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+
+namespace Deployment
+{
+  class ResourceDeploymentDescription;
+}
+
+
+namespace CIAO
+{
+
+  namespace Config_Handlers
+  {
+
+   class ResourceDeploymentDescription;
+
+
+   /*
+    * @class RDD_Handler
+    *
+    * @brief Handler class for <ResourceDeploymentDescription> types.
+    *
+    * This class defines handler methods to map values from
+    * XSC ResourceDeploymentDescription objects, parsed from the descriptor files, to the
+    * corresponding CORBA IDL Any type.
+    *
+    */
+    
+    class Config_Handlers_Export RDD_Handler : public Base_Handler{
+     
+      public:
+
+        RDD_Handler (void);
+        virtual ~RDD_Handler (void);
+
+        void get_ResourceDeploymentDescription (
+             Deployment::ResourceDeploymentDescription& toconfig, 
+             ResourceDeploymentDescription& desc);
+
+    };
+  }
+}
+
+#include /**/ "ace/post.h" 
+#endif /* CIAO_CONFIG_HANDLERS_RDD_Handler_H */
+