1 files changed, 4 insertions, 36 deletions

diff --git a/TAO/CIAO/ciao/Deployment_Data.idl b/TAO/CIAO/ciao/Deployment_Data.idl
index 62b5c7a2ce6..d4e0628ebce 100644
--- a/TAO/CIAO/ciao/Deployment_Data.idl
+++ b/TAO/CIAO/ciao/Deployment_Data.idl
@@ -68,7 +68,7 @@ module Deployment {
     ResourceUsageKind resourceUsage;
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
@@ -110,7 +110,7 @@ module Deployment {
     string targetName;
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
@@ -152,7 +152,7 @@ module Deployment {
   struct ResourceDeploymentDescription {
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
@@ -176,7 +176,7 @@ module Deployment {
     MonolithicDeploymentDescriptions implementation;
     InstanceDeploymentDescriptions instance;
     PlanConnectionDescriptions connection;
-    PlanPropertyMappings externalProperty;
+            PlanPropertyMappings externalProperty;
     ImplementationDependencies dependsOn;
     ArtifactDeploymentDescriptions artifact;
     Properties infoProperty;
@@ -197,38 +197,6 @@ module Deployment {
 
   typedef sequence < ComponentPackageReference > ComponentPackageReferences;
 
-  struct SubcomponentPortEndpoint {
-    string portName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
-
-  struct AssemblyConnectionDescription {
-    string name;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    SubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-  };
-
-  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-
-  struct SubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
-
-  struct AssemblyPropertyMapping {
-    string name;
-    string externalName;
-    SubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
-
   typedef sequence < ResourceUsageKind > ResourceUsageKinds;
 
   struct ImplementationRequirement {