diff options
Diffstat (limited to 'TAO/CIAO/docs/schema/cid.xsd')
| -rw-r--r-- | TAO/CIAO/docs/schema/cid.xsd | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/TAO/CIAO/docs/schema/cid.xsd b/TAO/CIAO/docs/schema/cid.xsd index c8ecb846d33..7e5233d770f 100644 --- a/TAO/CIAO/docs/schema/cid.xsd +++ b/TAO/CIAO/docs/schema/cid.xsd @@ -4,80 +4,75 @@ xmlns:Deployment="http://www.omg.org/Deployment" targetNamespace="http://www.omg.org/Deployment"> - <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> - <xsd:include schemaLocation="cpd.xsd" /> - <xsd:include schemaLocation="iad.xsd" /> - + <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> + <xsd:include schemaLocation="cpd.xsd" /> + <xsd:include schemaLocation="iad.xsd" /> + <xsd:include schemaLocation="pcd.xsd" /> <xsd:complexType name="SubcomponentInstantiationDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/> + <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" /> + <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" /> + <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/> + <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> - <xsd:complexType name="SubcomponentPropertyReference"> <xsd:sequence> <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> + <xsd:element name="instance" type="xsd:IDREF"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="AssemblyPropertyMapping"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> + <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> <xsd:complexType name="ComponentAssemblyDescription"> <xsd:sequence> <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/> - <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> + <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" minOccurs="0" maxOccurs="unbounded"/> + <!-- <xsd:element name="locality" type="Deployment:Locality" minOccurs="0" maxOccurs="unbounded" /> --> + <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> <xsd:complexType name="MonolithicImplementationDescription"> <xsd:sequence> - <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="nodeExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="componentExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/> </xsd:sequence> </xsd:complexType> <xsd:complexType name="ComponentImplementationDescription"> - <!-- @@mxiong: added minOccurs="0" maxOccurs="unbounded" - when adding config_handler support - for repoMan - --> <xsd:choice minOccurs="0" maxOccurs="1"> <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/> + <xsd:element name="label" type="xsd:string" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> + <!-- @@ MAJO : Hack: Implements should be required. --> + <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0" /> <xsd:choice> <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/> <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/> </xsd:choice> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="capability" type="Deployment:Capability" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> - <!-- @@mxiong: added href - when adding config_handler support - for repoMan - --> <xsd:attribute name="href" type="xsd:string" use="optional"/> </xsd:complexType> |