diff options
Diffstat (limited to 'TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd')
| -rw-r--r-- | TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd | 112 |
1 files changed, 31 insertions, 81 deletions
diff --git a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd index a14a8f508d9..1d386841ea5 100644 --- a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd +++ b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd @@ -50,10 +50,9 @@ <xsd:sequence> <xsd:element name="kind" type="Deployment:TCKind"/> <xsd:element name="enum" type="Deployment:EnumType" minOccurs="0"/> -<!-- +<!-- @@ not supported now.. - <xsd:element name="objref" type="Deployment:ObjrefType"/> <xsd:element name="boundedString" type="Deployment:BoundedStringType"/> <xsd:element name="fixed" type="Deployment:FixedType"/> @@ -67,7 +66,6 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="DataValue"> <xsd:choice maxOccurs="unbounded"> <xsd:element name="short" type="xsd:short"/> @@ -107,19 +105,17 @@ <xsd:complexType name="Any"> <xsd:sequence> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="Property"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="value" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> - <!-- End of base definitions. --> <xsd:simpleType name="SatisfierPropertyKind"> @@ -133,16 +129,15 @@ </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="SatisfierProperty"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="dynamic" type="xsd:boolean" /> + <xsd:element name="value" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="Resource"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -155,22 +150,20 @@ <xsd:sequence> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> - <!-- Deployment --> <xsd:complexType name="ResourceDeploymentDescription"> <xsd:sequence> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ArtifactDeploymentDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -184,7 +177,6 @@ <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> - <xsd:complexType name="MonolithicDeploymentDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -206,32 +198,28 @@ </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="InstanceResourceDeploymentDescription"> <xsd:sequence> <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="InstanceDeploymentDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="node" type="xsd:string"/> <xsd:element name="source" type="xsd:string"/> <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription --> - <xsd:element name="configProperty" type="Deployment:Property" - minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/> <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> - <xsd:simpleType name="CCMComponentPortKind"> <xsd:restriction base="xsd:NCName"> <xsd:enumeration value="Facet"/> @@ -243,21 +231,20 @@ </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="ComponentPortDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="exclusiveProvider" type="xsd:string"/> - <xsd:element name="exclusiveUser" type="xsd:string"/> - <xsd:element name="optional" type="xsd:string"/> + <!-- @@MAJO: Hack - specific/supported types should be required. --> + <xsd:element name="specificType" type="xsd:string" minOccurs="0"/> + <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="provider" type="xsd:boolean"/> + <xsd:element name="exclusiveProvider" type="xsd:boolean"/> + <xsd:element name="exclusiveUser" type="xsd:boolean"/> + <xsd:element name="optional" type="xsd:boolean"/> <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ComponentPropertyDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -265,14 +252,12 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ComponentExternalPortEndpoint"> <xsd:sequence> - <xsd:element name="portName" type="xsd:string"/> + <xsd:element name="portName" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="PlanSubcomponentPortEndpoint"> <xsd:sequence> <xsd:element name="portName" type="xsd:string"/> @@ -282,24 +267,21 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ExternalReferenceEndpoint"> <xsd:sequence> - <xsd:element name="location" type="xsd:string"/> + <xsd:element name="location" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ConnectionResourceDeploymentDescription"> <xsd:sequence> <xsd:element name="targetName" type="xsd:string"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="PlanConnectionDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -312,72 +294,41 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ImplementationDependency"> <xsd:sequence> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - <!-- Implementation --> - <xsd:complexType name="Capability"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="resourceType" type="xsd:string" maxOccurs="unbounded" /> + <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ImplementationRequirement"> <xsd:sequence> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="resourcePort" type="xsd:string"/> - <xsd:element name="componentPort" type="xsd:string"/> + <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind" minOccurs="0"/> + <xsd:element name="resourcePort" type="xsd:string" minOccurs="0" /> + <xsd:element name="componentPort" type="xsd:string" minOccurs="0"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:sequence> - </xsd:complexType> - - -<!-- Bala commented - <xsd:complexType name="MonolithicImplementationDescription"> - <xsd:sequence> - <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> ---> - <xsd:complexType name="ComponentPackageReference"> <xsd:sequence> - <xsd:element name="requiredUUID" type="xsd:string"/> - <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredUUID" type="xsd:string" minOccurs="0" /> + <xsd:element name="requiredName" type="xsd:string" minOccurs="0" /> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - -<!-- Bala commented - <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:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> ---> - - <xsd:complexType name="SubcomponentPortEndpoint"> <xsd:sequence> <xsd:element name="portName" type="xsd:string"/> @@ -385,13 +336,12 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="AssemblyConnectionDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> |