diff options
| author | jules <jules@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-12 21:29:07 +0000 |
|---|---|---|
| committer | jules <jules@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-12 21:29:07 +0000 |
| commit | bca714628d8622e2876b24f2009728a603aadb50 (patch) | |
| tree | 49d743d9a198e063314355d3595ce62bfeb855c4 | |
| parent | 99f6a1b24a9202977fbea6610db7ceed022d0c3b (diff) | |
| download | ATCD-bca714628d8622e2876b24f2009728a603aadb50.tar.gz | |
Thu Aug 12 14:14:00 Jules White <jules@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/CIAO/docs/schema/Modified_Deployment.xsd | 29 | ||||
| -rw-r--r-- | TAO/CIAO/docs/schema/cdp.xsd | 29 |
3 files changed, 34 insertions, 30 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index d801dfebbc0..581b1fa0a93 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 12 14:14:00 Jules White <jules@dre.vanderbilt.edu> + * docs/schema/cdp.xsd: + * docs/schema/Modified_Deployment.xsd: + + Changed the schema so that it was more compliant with the spec. + Thu Aug 12 15:25:44 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/NEWS: diff --git a/TAO/CIAO/docs/schema/Modified_Deployment.xsd b/TAO/CIAO/docs/schema/Modified_Deployment.xsd index 2531cc323eb..af2f1885837 100644 --- a/TAO/CIAO/docs/schema/Modified_Deployment.xsd +++ b/TAO/CIAO/docs/schema/Modified_Deployment.xsd @@ -381,23 +381,22 @@ <xsd:complexType name="DeploymentPlan"> - <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" maxOccurs="unbounded"/> - <xsd:element name="connection" type="Deployment:PlanConnectionDescription" maxOccurs="unbounded"/> - -<!-- potentially recursive, not used + <xsd:sequence> + <xsd:element name="label" type="xsd:string" minOccurs="0"/> + <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> + <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" /> + <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" /> + <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/> + <!-- potentially recursive, not used <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> ---> + --> + <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> +</xsd:complexType> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" maxOccurs="unbounded"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> - </xsd:sequence> - </xsd:complexType> diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd index 6a667d8d4d9..b907f4df0af 100644 --- a/TAO/CIAO/docs/schema/cdp.xsd +++ b/TAO/CIAO/docs/schema/cdp.xsd @@ -6,23 +6,22 @@ <xsd:include schemaLocation="ccd.xsd" /> -<xsd:complexType name="DeploymentPlan"> + <xsd:complexType name="DeploymentPlan"> <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/> - <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded"/> - <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" maxOccurs="unbounded"/> - <xsd:element name="connection" type="Deployment:PlanConnectionDescription" maxOccurs="unbounded"/> - -<!-- potentially recursive, not used + <xsd:element name="label" type="xsd:string" minOccurs="0"/> + <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> + <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" /> + <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" /> + <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/> + <!-- potentially recursive, not used <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/> ---> - - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" maxOccurs="unbounded"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> - </xsd:sequence> + --> + <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> </xsd:complexType> + </xsd:schema> |