ChangeLogTag: Sat Jul 3 10:03:22 2004 Tao Lu <lu@dre.vanderbilt.edu>

6 files changed, 476 insertions, 457 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 004a28e377d..dd5ce914a50 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Sat Jul  3 10:03:22 2004  Tao Lu  <lu@dre.vanderbilt.edu>
+
+	* DAnCE/ciao/Deployment_Base.idl:
+	* DAnCE/ciao/Deployment_Data.idl:
+	* DAnCE/ciao/Deployment.idl:
+	The original Deployment.idl is splited into the above 3 files to
+	get rid of the VC warning.
+
+	* DAnCE/ciao/Deployment_Ex.idl:
+	This file is removed due to the bad name.
+
+	* DAnCE/ciao/CCM_Core.idl:
+	The MPC file is changed to follow the above changes.
+
 Thu Jul  1 16:27:07 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
         * CIAOTAO.mwc:
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index ecacdbb7eda..2bd7cdc291b 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -99,18 +99,16 @@ project(Deployment_stub) : taolib_with_idl, valuetype , ciao_server_dnc {
   dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
 
   IDL_Files {
-     Deployment_Ex.idl
-     NodeApplication_CallBack.idl
-  }
-
- IDL_Files {
-     idlflags += -St
-     Deployment.idl
+    NodeApplication_CallBack.idl
+    Deployment_Base.idl
+    Deployment_Data.idl
+    Deployment.idl
   }
 
   Source_Files {
+    Deployment_BaseC.cpp
+    Deployment_DataC.cpp
     DeploymentC.cpp
-    Deployment_ExC.cpp
     NodeApplication_CallBackC.cpp
   }
 }
@@ -129,8 +127,9 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, ciao_server_dnc {
   }
 
   Source_Files {
+    Deployment_BaseS.cpp
+    Deployment_DataS.cpp
     DeploymentS.cpp
-    Deployment_ExS.cpp
     NodeApp_CB_Impl.cpp
     NodeApplication_CallBackS.cpp
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment.idl b/TAO/CIAO/DAnCE/ciao/Deployment.idl
index 33ec0a15378..c046e73facb 100644
--- a/TAO/CIAO/DAnCE/ciao/Deployment.idl
+++ b/TAO/CIAO/DAnCE/ciao/Deployment.idl
@@ -1,277 +1,48 @@
 // $Id$
-#include <orb.idl>
-#include "tao/ULongSeq.pidl"
-#include "Deployment_Core.idl"
-#include "Deployment_Ex.idl"
+#include "Deployment_Data.idl"
 
 module Deployment {
 
-  enum SatisfierPropertyKind {
-    Quantity,
-    Capacity,
-    Minimum,
-    Maximum,
-    _Attribute,
-    Selection
-  };
-
-  struct SatisfierProperty {
-    string name;
-    SatisfierPropertyKind kind;
-    any value;
-  };
-
-  typedef sequence < SatisfierProperty > SatisfierProperties;
-
-  struct SharedResource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    ::CORBA::ULongSeq nodeRef;
-    SatisfierProperties property;
-  };
-
-  typedef sequence < SharedResource > SharedResources;
-
-  struct Resource {
+  exception ResourceNotAvailable {
     string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
-
-  typedef sequence < Resource > Resources;
-
-  struct Node {
-    string name;
-    string label;
-    ::CORBA::ULongSeq sharedResourceRef;
-    ::CORBA::ULongSeq connectionRef;
-    Resources resource;
-  };
-
-  typedef sequence < Node > Nodes;
-
-  struct Interconnect {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectionRef;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
-
-  typedef sequence < Interconnect > Interconnects;
-
-  struct Bridge {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
-
-  typedef sequence < Bridge > Bridges;
-
-  struct Domain {
-    string UUID;
-    string label;
-    SharedResources sharedResource;
-    Nodes node;
-    Interconnects interconnect;
-    Bridges bridge;
-    Properties infoProperty;
-  };
-
-  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 Requirement {
     string resourceType;
-    string name;
-    Properties property;
-  };
-
-  typedef sequence < Requirement > Requirements;
-
-  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 propertyName;
+    string elementName;
     string resourceName;
-    any resourceValue;
   };
 
-  typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
-
-  struct InstanceDeploymentDescription {
+  exception PlanError {
     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;
+    string reason;
   };
 
-  typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
-
-  struct ConnectionResourceDeploymentDescription {
-    string targetName;
-    string requirementName;
-    string resourceName;
-    any resourceValue;
-  };
-
-  typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
-
-  struct PlanConnectionDescription {
+  exception InvalidProperty {
     string name;
-    ::CORBA::StringSeq source;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    PlanSubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-    ConnectionResourceDeploymentDescriptions deployedResource;
+    string reason;
   };
 
-  typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions;
-
-  struct PlanSubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences;
-
-  struct PlanPropertyMapping {
+  exception StopError {
     string name;
-    ::CORBA::StringSeq source;
-    string externalName;
-    PlanSubcomponentPropertyReferences delegatesTo;
+    string reason;
   };
 
-  typedef sequence < PlanPropertyMapping > PlanPropertyMappings;
-
-  struct ImplementationDependency {
-    string requiredType;
+  exception NameExists {
   };
 
-  typedef sequence < ImplementationDependency > ImplementationDependencies;
-
-  struct ResourceDeploymentDescription {
-    string requirementName;
-    string resourceName;
-    any resourceValue;
+  exception PackageError {
+    string source;
+    string reason;
   };
 
-  typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
-
-  struct ArtifactDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq location;
-    string node;
-    ::CORBA::StringSeq source;
-    Properties execParameter;
-    Requirements deployRequirement;
-    ResourceDeploymentDescriptions deployedResource;
+  exception NoSuchName {
   };
 
-  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;
-  };
-
-  enum DomainUpdateKind {
-    Add,
-    Delete,
-    UpdateAll,
-    UpdateAvailable
+  exception LastConfiguration {
   };
 
-  interface TargetManager {
-    Domain getAllResources ();
-    Domain getAvailableResources ();
-    void commitResources (in DeploymentPlan plan)
-      raises (ResourceNotAvailable, PlanError);
-    void releaseResources (in DeploymentPlan argname);
-    void updateDomain (in ::CORBA::StringSeq elements, in Domain domainSubset, in DomainUpdateKind updateKind);
+  exception InvalidReference {
   };
 
-
   interface ApplicationManager {
     Application startLaunch (in Properties configProperty, out Connections providedReference, in boolean start)
       raises (ResourceNotAvailable, StartError, InvalidProperty);
@@ -304,6 +75,15 @@ module Deployment {
       raises (StopError);
   };
 
+  interface TargetManager {
+    Domain getAllResources ();
+    Domain getAvailableResources ();
+    void commitResources (in DeploymentPlan plan)
+      raises (ResourceNotAvailable, PlanError);
+    void releaseResources (in DeploymentPlan argname);
+    void updateDomain (in ::CORBA::StringSeq elements, in Domain domainSubset, in DomainUpdateKind updateKind);
+  };
+
   interface Logger {
   };
 
@@ -321,158 +101,6 @@ module Deployment {
       raises (StopError);
   };
 
-  struct PackageConfiguration;
-
-  typedef sequence < PackageConfiguration > PackageConfigurations;
-
-  struct ComponentPackageDescription;
-
-  typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
-
-  struct ComponentPackageReference {
-    string requiredUUID;
-    string requiredName;
-    string requiredType;
-  };
-
-  typedef sequence < ComponentPackageReference > ComponentPackageReferences;
-
-  struct SubcomponentInstantiationDescription {
-    string name;
-    ComponentPackageDescriptions package;
-    Properties configProperty;
-    Requirements selectRequirement;
-    ComponentPackageReferences reference;
-  };
-
-  typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
-
-  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;
-
-  struct ComponentAssemblyDescription {
-    SubcomponentInstantiationDescriptions instance;
-    AssemblyConnectionDescriptions connection;
-    AssemblyPropertyMappings externalProperty;
-  };
-
-  typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
-
-  struct NamedImplementationArtifact;
-
-  typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
-
-  struct ImplementationArtifactDescription {
-    string label;
-    string UUID;
-    ::CORBA::StringSeq location;
-    Properties execParameter;
-    Requirements deployRequirement;
-    NamedImplementationArtifacts dependsOn;
-    Properties infoProperty;
-  };
-
-  struct NamedImplementationArtifact {
-    string name;
-    ImplementationArtifactDescription referencedArtifact;
-  };
-
-  typedef sequence < ResourceUsageKind > ResourceUsageKinds;
-
-  struct ImplementationRequirement {
-    ResourceUsageKinds resourceUsage;
-    string resourcePort;
-    string componentPort;
-    string resourceType;
-    string name;
-    Properties property;
-  };
-
-  typedef sequence < ImplementationRequirement > ImplementationRequirements;
-
-  struct MonolithicImplementationDescription {
-    Properties execParameter;
-    NamedImplementationArtifacts primaryArtifact;
-    ImplementationRequirements deployRequirement;
-  };
-
-  typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
-
-  struct Capability {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
-
-  typedef sequence < Capability > Capabilities;
-
-  struct ComponentImplementationDescription {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription implements;
-    ComponentAssemblyDescriptions assemblyImpl;
-    MonolithicImplementationDescriptions monolithicImpl;
-    Properties configProperty;
-    Capabilities capability;
-    ImplementationDependencies dependsOn;
-    Properties infoProperty;
-  };
-
-  struct PackagedComponentImplementation {
-    string name;
-    ComponentImplementationDescription referencedImplementation;
-  };
-
-  typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations;
-
-  struct ComponentPackageDescription {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription realizes;
-    Properties configProperty;
-    PackagedComponentImplementations implementation;
-    Properties infoProperty;
-  };
-
-  struct PackageConfiguration {
-    string label;
-    string UUID;
-    PackageConfigurations specializedConfig;
-    ComponentPackageDescriptions basePackage;
-    ComponentPackageReferences reference;
-    Requirements selectRequirement;
-    Properties configProperty;
-  };
-
   interface RepositoryManager {
     void installPackage (in string installationName, in string location)
       raises (NameExists, PackageError);
@@ -489,9 +117,4 @@ module Deployment {
       raises (NoSuchName);
   };
 
-  struct RequirementSatisfier {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
 };
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment_Base.idl b/TAO/CIAO/DAnCE/ciao/Deployment_Base.idl
new file mode 100644
index 00000000000..7a9e9219ef9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ciao/Deployment_Base.idl
@@ -0,0 +1,81 @@
+//$Id$
+#include <orb.idl>
+#include "tao/ULongSeq.pidl"
+#include "Deployment_Core.idl"
+
+module Deployment {
+
+  enum SatisfierPropertyKind {
+    Quantity,
+    Capacity,
+    Minimum,
+    Maximum,
+    _Attribute,
+    Selection
+  };
+
+  struct SatisfierProperty {
+    string name;
+    SatisfierPropertyKind kind;
+    any value;
+  };
+
+  typedef sequence < SatisfierProperty > SatisfierProperties;
+
+  struct SharedResource {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    ::CORBA::ULongSeq nodeRef;
+    SatisfierProperties property;
+  };
+
+  typedef sequence < SharedResource > SharedResources;
+
+  struct Resource {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    SatisfierProperties property;
+  };
+
+  typedef sequence < Resource > Resources;
+
+  struct Node {
+    string name;
+    string label;
+    ::CORBA::ULongSeq sharedResourceRef;
+    ::CORBA::ULongSeq connectionRef;
+    Resources resource;
+  };
+
+  typedef sequence < Node > Nodes;
+
+  struct Interconnect {
+    string name;
+    string label;
+    ::CORBA::ULongSeq connectionRef;
+    ::CORBA::ULongSeq connectRef;
+    Resources resource;
+  };
+
+  typedef sequence < Interconnect > Interconnects;
+
+  struct Bridge {
+    string name;
+    string label;
+    ::CORBA::ULongSeq connectRef;
+    Resources resource;
+  };
+
+  typedef sequence < Bridge > Bridges;
+
+  struct Domain {
+    string UUID;
+    string label;
+    SharedResources sharedResource;
+    Nodes node;
+    Interconnects interconnect;
+    Bridges bridge;
+    Properties infoProperty;
+  };
+
+};
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment_Data.idl b/TAO/CIAO/DAnCE/ciao/Deployment_Data.idl
new file mode 100644
index 00000000000..e56e2a1bf4e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ciao/Deployment_Data.idl
@@ -0,0 +1,347 @@
+// $Id$
+
+#include "Deployment_Base.idl"
+
+module Deployment {
+
+  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 Requirement {
+    string resourceType;
+    string name;
+    Properties property;
+  };
+
+  typedef sequence < Requirement > Requirements;
+
+  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;
+    any resourceValue;
+  };
+
+  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;
+    any resourceValue;
+  };
+
+  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;
+    any resourceValue;
+  };
+
+  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;
+  };
+
+  enum DomainUpdateKind {
+    Add,
+    Delete,
+    UpdateAll,
+    UpdateAvailable
+  };
+
+  struct PackageConfiguration;
+
+  typedef sequence < PackageConfiguration > PackageConfigurations;
+
+  struct ComponentPackageDescription;
+
+  typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
+
+  struct ComponentPackageReference {
+    string requiredUUID;
+    string requiredName;
+    string requiredType;
+  };
+
+  typedef sequence < ComponentPackageReference > ComponentPackageReferences;
+
+  struct SubcomponentInstantiationDescription {
+    string name;
+    ComponentPackageDescriptions package;
+    Properties configProperty;
+    Requirements selectRequirement;
+    ComponentPackageReferences reference;
+  };
+
+  typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
+
+  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;
+
+  struct ComponentAssemblyDescription {
+    SubcomponentInstantiationDescriptions instance;
+    AssemblyConnectionDescriptions connection;
+    AssemblyPropertyMappings externalProperty;
+  };
+
+  typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
+
+  struct NamedImplementationArtifact;
+
+  typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
+
+  struct ImplementationArtifactDescription {
+    string label;
+    string UUID;
+    ::CORBA::StringSeq location;
+    Properties execParameter;
+    Requirements deployRequirement;
+    NamedImplementationArtifacts dependsOn;
+    Properties infoProperty;
+  };
+
+  struct NamedImplementationArtifact {
+    string name;
+    ImplementationArtifactDescription referencedArtifact;
+  };
+
+  typedef sequence < ResourceUsageKind > ResourceUsageKinds;
+
+  struct ImplementationRequirement {
+    ResourceUsageKinds resourceUsage;
+    string resourcePort;
+    string componentPort;
+    string resourceType;
+    string name;
+    Properties property;
+  };
+
+  typedef sequence < ImplementationRequirement > ImplementationRequirements;
+
+  struct MonolithicImplementationDescription {
+    Properties execParameter;
+    NamedImplementationArtifacts primaryArtifact;
+    ImplementationRequirements deployRequirement;
+  };
+
+  typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
+
+  struct Capability {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    SatisfierProperties property;
+  };
+
+  typedef sequence < Capability > Capabilities;
+
+  struct ComponentImplementationDescription {
+    string label;
+    string UUID;
+    ComponentInterfaceDescription implements;
+    ComponentAssemblyDescriptions assemblyImpl;
+    MonolithicImplementationDescriptions monolithicImpl;
+    Properties configProperty;
+    Capabilities capability;
+    ImplementationDependencies dependsOn;
+    Properties infoProperty;
+  };
+
+  struct PackagedComponentImplementation {
+    string name;
+    ComponentImplementationDescription referencedImplementation;
+  };
+
+  typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations;
+
+  struct ComponentPackageDescription {
+    string label;
+    string UUID;
+    ComponentInterfaceDescription realizes;
+    Properties configProperty;
+    PackagedComponentImplementations implementation;
+    Properties infoProperty;
+  };
+
+  struct PackageConfiguration {
+    string label;
+    string UUID;
+    PackageConfigurations specializedConfig;
+    ComponentPackageDescriptions basePackage;
+    ComponentPackageReferences reference;
+    Requirements selectRequirement;
+    Properties configProperty;
+  };
+
+  struct RequirementSatisfier {
+    string name;
+    ::CORBA::StringSeq resourceType;
+    SatisfierProperties property;
+  };
+};
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment_Ex.idl b/TAO/CIAO/DAnCE/ciao/Deployment_Ex.idl
deleted file mode 100644
index 236bae7f838..00000000000
--- a/TAO/CIAO/DAnCE/ciao/Deployment_Ex.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#include <orb.idl>
-
-module Deployment {
-
-  exception ResourceNotAvailable {
-    string name;
-    string resourceType;
-    string propertyName;
-    string elementName;
-    string resourceName;
-  };
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-
-  exception InvalidProperty {
-    string name;
-    string reason;
-  };
-
-  exception StopError {
-    string name;
-    string reason;
-  };
-
-  exception NameExists {
-  };
-
-  exception PackageError {
-    string source;
-    string reason;
-  };
-
-  exception NoSuchName {
-  };
-
-  exception LastConfiguration {
-  };
-
-  exception InvalidReference {
-  };
-};