Mon Nov 27 14:55:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 228 insertions, 207 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7f074626135..acb6f7c69fc 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,32 @@
+Mon Nov 27 14:55:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Core.mpc:
+          Added new Deployment_DeploymentPlan
+
+        * ciao/Deployment_Data.idl
+        * ciao/Deployment_DeploymentPlan.idl:
+          Moved types related to DeploymentPlan to their own file
+
+        * ciao/Deployment_Data.idl
+          Removed RequirementSatisfier, it is superfluous.
+
+        * ciao/Deployment.idl:
+          No need to include Deployment_Data
+
+        * ciao/Target_Data.idl:
+          Removed not needed include
+
+        * ciao/Deployment_Connection.idl:
+        * ciao/TargetManager.idl:
+        * RACE/Output_Adapters/Interface/PlanEgress.idl:
+        * RACE/Plan_Analyzer/Interface/PlanIngress.idl:
+        * RACE/Planner_Manager/Interface/Planner_Manager_I.idl:
+        * RACE/Planners/Interface/Planner_I.idl:
+          Updated include because of move above
+
+        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
+          Removed RequirementSatisfier
+
 Mon Nov 27 14:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Deployment.idl:
diff --git a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
index cd42287f4d2..911c9966f06 100644
--- a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
+++ b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
@@ -4,12 +4,12 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_Data.idl"
+#include "Deployment_DeploymentPlan.idl"
 #endif
 
 module CIAO
 {
-  
+
   module RACE
   {
     interface PlanEgress
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
index 1127e42c167..1074b4f4da3 100644
--- a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
+++ b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
@@ -4,7 +4,7 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_Data.idl"
+#include "Deployment_DeploymentPlan.idl"
 #endif
 
 module CIAO
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
index 560a2ad92b1..7ad88444a52 100644
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
+++ b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
@@ -4,7 +4,7 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_Data.idl"
+#include "Deployment_DeploymentPlan.idl"
 #endif
 
 #include "../../common/RACE_common.idl"
diff --git a/CIAO/RACE/Planners/Interface/Planner_I.idl b/CIAO/RACE/Planners/Interface/Planner_I.idl
index b947c132540..954a61f5269 100644
--- a/CIAO/RACE/Planners/Interface/Planner_I.idl
+++ b/CIAO/RACE/Planners/Interface/Planner_I.idl
@@ -4,12 +4,12 @@
 
 #ifndef INCLUDED_DEPLOYMENT_DATA
 #define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_Data.idl"
+#include "Deployment_DeploymentPlan.idl"
 #endif
 
 module CIAO
 {
-  
+
   module RACE
   {
     interface Planner_I
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index ceb4d9755e7..6c547f4723d 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -168,6 +168,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_Base.idl
     Deployment_Connection.idl
     Deployment_Data.idl
+    Deployment_DeploymentPlan.idl
     Deployment_TargetData.idl
     ServerResources.idl
     Deployment_Events.idl
@@ -193,6 +194,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_BaseC.cpp
     Deployment_ConnectionC.cpp
     Deployment_DataC.cpp
+    Deployment_DeploymentPlanC.cpp
     Deployment_TargetDataC.cpp
     Deployment_NodeApplicationC.cpp
     Deployment_ApplicationC.cpp
diff --git a/CIAO/ciao/Deployment.idl b/CIAO/ciao/Deployment.idl
index 976653b25a5..f06112f4bdb 100644
--- a/CIAO/ciao/Deployment.idl
+++ b/CIAO/ciao/Deployment.idl
@@ -3,7 +3,6 @@
 #ifndef DEPLOYMENT_IDL
 #define DEPLOYMENT_IDL
 
-#include "Deployment_Data.idl"
 #include "Packaging_Data.idl"
 #include "Target_Data.idl"
 #include "ServerResources.idl"
diff --git a/CIAO/ciao/Deployment_Connection.idl b/CIAO/ciao/Deployment_Connection.idl
index e8908eaeaba..8fb182ecf2e 100644
--- a/CIAO/ciao/Deployment_Connection.idl
+++ b/CIAO/ciao/Deployment_Connection.idl
@@ -3,7 +3,7 @@
 #if !defined (DEPLOYMENT_CONNECTION_IDL)
 #define DEPLOYMENT_CONNECTION_IDL
 
-#include "Deployment_Data.idl"
+#include "Deployment_DeploymentPlan.idl"
 #include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
 
 // *************** Packaging and Deployment ***************
diff --git a/CIAO/ciao/Deployment_Data.idl b/CIAO/ciao/Deployment_Data.idl
index a6ea27638ca..ebc07ca809e 100644
--- a/CIAO/ciao/Deployment_Data.idl
+++ b/CIAO/ciao/Deployment_Data.idl
@@ -2,188 +2,10 @@
 
 #ifndef DEPLOYMENT_DATA_IDL
 #define DEPLOYMENT_DATA_IDL
-#include "Deployment_Base.idl"
+#include "Deployment_DeploymentPlan.idl"
 
 module Deployment {
 
-  enum CCMComponentPortKind
-  {
-    Facet,
-    SimplexReceptacle,
-    MultiplexReceptacle,
-    EventEmitter,
-    EventPublisher,
-    EventConsumer
-  };
-
-  struct ComponentPortDescription {
-    string name;
-    string specificType;
-    ::CORBA::StringSeq supportedType;
-    boolean provider;
-    boolean exclusiveProvider;
-    boolean exclusiveUser;
-    boolean optional;
-    CCMComponentPortKind kind;
-  };
-
-  typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
-
-  struct ComponentPropertyDescription {
-    string name;
-    CORBA::TypeCode type;
-  };
-
-  typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions;
-
-  struct ComponentInterfaceDescription {
-    string label;
-    string UUID;
-    string specificType;
-    ::CORBA::StringSeq supportedType;
-    ::CORBA::StringSeq idlFile;
-    Properties configProperty;
-    ComponentPortDescriptions port;
-    ComponentPropertyDescriptions property;
-    Properties infoProperty;
-  };
-
-  struct MonolithicDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq source;
-    ::CORBA::ULongSeq artifactRef;
-    Properties execParameter;
-    Requirements deployRequirement;
-  };
-
-  typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions;
-
-  enum ResourceUsageKind {
-    None,
-    InstanceUsesResource,
-    ResourceUsesInstance,
-    PortUsesResource,
-    ResourceUsesPort
-  };
-
-  struct InstanceResourceDeploymentDescription {
-    ResourceUsageKind resourceUsage;
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
-
-  struct InstanceDeploymentDescription {
-    string name;
-    string node;
-    ::CORBA::StringSeq source;
-    unsigned long implementationRef;
-    Properties configProperty;
-    InstanceResourceDeploymentDescriptions deployedResource;
-    InstanceResourceDeploymentDescriptions deployedSharedResource;
-  };
-
-  typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions;
-
-  struct ComponentExternalPortEndpoint {
-    string portName;
-  };
-
-  typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints;
-
-  struct PlanSubcomponentPortEndpoint {
-    string portName;
-    boolean provider;
-    CCMComponentPortKind kind;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints;
-
-  struct ExternalReferenceEndpoint {
-    string location;
-  };
-
-  typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
-
-  struct ConnectionResourceDeploymentDescription {
-    string targetName;
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
-
-  struct PlanConnectionDescription {
-    string name;
-    ::CORBA::StringSeq source;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    PlanSubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-    ConnectionResourceDeploymentDescriptions deployedResource;
-  };
-
-  typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions;
-
-  struct PlanSubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences;
-
-  struct PlanPropertyMapping {
-    string name;
-    ::CORBA::StringSeq source;
-    string externalName;
-    PlanSubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < PlanPropertyMapping > PlanPropertyMappings;
-
-  struct ImplementationDependency {
-    string requiredType;
-  };
-
-  typedef sequence < ImplementationDependency > ImplementationDependencies;
-
-  struct ResourceDeploymentDescription {
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
-
-  struct ArtifactDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq location;
-    string node;
-    ::CORBA::StringSeq source;
-    Properties execParameter;
-    Requirements deployRequirement;
-    ResourceDeploymentDescriptions deployedResource;
-  };
-
-  typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
-
-  struct DeploymentPlan {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription realizes;
-    MonolithicDeploymentDescriptions implementation;
-    InstanceDeploymentDescriptions instance;
-    PlanConnectionDescriptions connection;
-            PlanPropertyMappings externalProperty;
-    ImplementationDependencies dependsOn;
-    ArtifactDeploymentDescriptions artifact;
-    Properties infoProperty;
-  };
-
   struct ComponentPackageReference {
     string requiredUUID;
     string requiredName;
@@ -212,12 +34,6 @@ module Deployment {
   };
 
   typedef sequence < Capability > Capabilities;
-
-  struct RequirementSatisfier {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
 };
 
 #endif /* DEPLOYMENT_DATA_IDL */
diff --git a/CIAO/ciao/Deployment_DeploymentPlan.idl b/CIAO/ciao/Deployment_DeploymentPlan.idl
new file mode 100644
index 00000000000..af667ce6d93
--- /dev/null
+++ b/CIAO/ciao/Deployment_DeploymentPlan.idl
@@ -0,0 +1,188 @@
+// $Id$
+
+#ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL
+#define DEPLOYMENT_DEPLOYMENTPLAN_IDL
+#include "Deployment_Base.idl"
+
+module Deployment {
+
+  enum CCMComponentPortKind
+  {
+    Facet,
+    SimplexReceptacle,
+    MultiplexReceptacle,
+    EventEmitter,
+    EventPublisher,
+    EventConsumer
+  };
+
+  struct ComponentPortDescription {
+    string name;
+    string specificType;
+    ::CORBA::StringSeq supportedType;
+    boolean provider;
+    boolean exclusiveProvider;
+    boolean exclusiveUser;
+    boolean optional;
+    CCMComponentPortKind kind;
+  };
+
+  typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
+
+  struct ComponentPropertyDescription {
+    string name;
+    CORBA::TypeCode type;
+  };
+
+  typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions;
+
+  struct ComponentInterfaceDescription {
+    string label;
+    string UUID;
+    string specificType;
+    ::CORBA::StringSeq supportedType;
+    ::CORBA::StringSeq idlFile;
+    Properties configProperty;
+    ComponentPortDescriptions port;
+    ComponentPropertyDescriptions property;
+    Properties infoProperty;
+  };
+
+  struct MonolithicDeploymentDescription {
+    string name;
+    ::CORBA::StringSeq source;
+    ::CORBA::ULongSeq artifactRef;
+    Properties execParameter;
+    Requirements deployRequirement;
+  };
+
+  typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions;
+
+  enum ResourceUsageKind {
+    None,
+    InstanceUsesResource,
+    ResourceUsesInstance,
+    PortUsesResource,
+    ResourceUsesPort
+  };
+
+  struct InstanceResourceDeploymentDescription {
+    ResourceUsageKind resourceUsage;
+    string requirementName;
+    string resourceName;
+    Properties property;
+  };
+
+  typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
+
+  struct InstanceDeploymentDescription {
+    string name;
+    string node;
+    ::CORBA::StringSeq source;
+    unsigned long implementationRef;
+    Properties configProperty;
+    InstanceResourceDeploymentDescriptions deployedResource;
+    InstanceResourceDeploymentDescriptions deployedSharedResource;
+  };
+
+  typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions;
+
+  struct ComponentExternalPortEndpoint {
+    string portName;
+  };
+
+  typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints;
+
+  struct PlanSubcomponentPortEndpoint {
+    string portName;
+    boolean provider;
+    CCMComponentPortKind kind;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints;
+
+  struct ExternalReferenceEndpoint {
+    string location;
+  };
+
+  typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
+
+  struct ConnectionResourceDeploymentDescription {
+    string targetName;
+    string requirementName;
+    string resourceName;
+    Properties property;
+  };
+
+  typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
+
+  struct PlanConnectionDescription {
+    string name;
+    ::CORBA::StringSeq source;
+    Requirements deployRequirement;
+    ComponentExternalPortEndpoints externalEndpoint;
+    PlanSubcomponentPortEndpoints internalEndpoint;
+    ExternalReferenceEndpoints externalReference;
+    ConnectionResourceDeploymentDescriptions deployedResource;
+  };
+
+  typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions;
+
+  struct PlanSubcomponentPropertyReference {
+    string propertyName;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences;
+
+  struct PlanPropertyMapping {
+    string name;
+    ::CORBA::StringSeq source;
+    string externalName;
+    PlanSubcomponentPropertyReferences delegatesTo;
+  };
+
+  typedef sequence < PlanPropertyMapping > PlanPropertyMappings;
+
+  struct ImplementationDependency {
+    string requiredType;
+  };
+
+  typedef sequence < ImplementationDependency > ImplementationDependencies;
+
+  struct ResourceDeploymentDescription {
+    string requirementName;
+    string resourceName;
+    Properties property;
+  };
+
+  typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
+
+  struct ArtifactDeploymentDescription {
+    string name;
+    ::CORBA::StringSeq location;
+    string node;
+    ::CORBA::StringSeq source;
+    Properties execParameter;
+    Requirements deployRequirement;
+    ResourceDeploymentDescriptions deployedResource;
+  };
+
+  typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
+
+  struct DeploymentPlan {
+    string label;
+    string UUID;
+    ComponentInterfaceDescription realizes;
+    MonolithicDeploymentDescriptions implementation;
+    InstanceDeploymentDescriptions instance;
+    PlanConnectionDescriptions connection;
+            PlanPropertyMappings externalProperty;
+    ImplementationDependencies dependsOn;
+    ArtifactDeploymentDescriptions artifact;
+    Properties infoProperty;
+  };
+};
+
+#endif /* DEPLOYMENT_DATA_IDL */
diff --git a/CIAO/ciao/TargetManager.idl b/CIAO/ciao/TargetManager.idl
index e604a237161..cf212a66fd2 100644
--- a/CIAO/ciao/TargetManager.idl
+++ b/CIAO/ciao/TargetManager.idl
@@ -5,6 +5,7 @@
 
 #include "Target_Data.idl"
 #include "Deployment_TargetData.idl"
+#include "Deployment_DeploymentPlan.idl"
 
 module Deployment {
 
diff --git a/CIAO/ciao/Target_Data.idl b/CIAO/ciao/Target_Data.idl
index 683f16dc2ff..48bbedc6503 100644
--- a/CIAO/ciao/Target_Data.idl
+++ b/CIAO/ciao/Target_Data.idl
@@ -3,8 +3,6 @@
 #ifndef TARGET_DATA_IDL
 #define TARGET_DATA_IDL
 
-#include "Deployment_Data.idl"
-
 module Deployment {
 
   exception PlanError {
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 050f0307344..4b3476e15f6 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -736,16 +736,6 @@ namespace Deployment
     dump_sequence ("configProperty", pc.configProperty);
   }
 
-  // Requirement Satisfier
-  void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs)
-  {
-    Dump_Obj dump_obj("RequirementSatisfier");
-
-    dump ("name", rs.name);
-    dump ("resourceType", rs.resourceType);
-    dump_sequence ("property", rs.property);
-  }
-
   // Property
   void DnC_Dump::dump (const Deployment::Property& property)
   {
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.h b/CIAO/tools/Config_Handlers/DnC_Dump.h
index aa48ea6d3fa..ae8b587ff62 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -141,8 +141,6 @@ static void dump(const ResourceDeploymentDescription &rdd);
 
 static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
 
-static void dump (const Deployment::RequirementSatisfier& rs);
-
 private:
 static void dump (const ::CORBA::Any &any);
 // Helper function to print an Any