diff options
| author | Kevin Rocard <kevinx.rocard@intel.com> | 2013-11-20 18:42:02 +0100 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:04:14 +0100 |
| commit | f7ca601a1e33fabffc7213e8bbc44b5f2680e478 (patch) | |
| tree | e7041afa6b1c9f37f57f7c1002b561ca441e2586 /Schemas | |
| parent | bf76f6b8651886e7cf5ae1a0904af3afc4f4cb99 (diff) | |
| download | external_parameter-framework-f7ca601a1e33fabffc7213e8bbc44b5f2680e478.zip external_parameter-framework-f7ca601a1e33fabffc7213e8bbc44b5f2680e478.tar.gz external_parameter-framework-f7ca601a1e33fabffc7213e8bbc44b5f2680e478.tar.bz2 | |
Allow component in parameter block in xsd schemas
BZ: 154054
Components are now allowed in parameter block since the patch 140555.
Reflect that in xsd schemas.
Change-Id: I43c03d6fd7754096b4e19d7fa5d10dce6bb2b10e
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
Reviewed-on: http://android.intel.com:8080/146241
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Denneulin, Guillaume <guillaume.denneulin@intel.com>
Reviewed-by: De Chivre, Renaud <renaud.de.chivre@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: Balestriere, VianneyX <vianneyx.balestriere@intel.com>
Tested-by: Balestriere, VianneyX <vianneyx.balestriere@intel.com>
Diffstat (limited to 'Schemas')
| -rw-r--r-- | Schemas/ConfigurableDomains.xsd | 5 | ||||
| -rw-r--r-- | Schemas/Parameter.xsd | 1 | ||||
| -rw-r--r-- | Schemas/ParameterSettings.xsd | 1 | ||||
| -rw-r--r-- | Schemas/Subsystem.xsd | 10 |
4 files changed, 8 insertions, 9 deletions
diff --git a/Schemas/ConfigurableDomains.xsd b/Schemas/ConfigurableDomains.xsd index f0cc11e..e4f5747 100644 --- a/Schemas/ConfigurableDomains.xsd +++ b/Schemas/ConfigurableDomains.xsd @@ -47,10 +47,9 @@ </xs:sequence> </xs:complexType> <xs:group name="ComponentGroup"> - <xs:choice> + <xs:sequence> <xs:group ref="ParameterBlockGroup"/> - <xs:element name="Component" type="ComponentType"/> - </xs:choice> + </xs:sequence> </xs:group> <xs:complexType name="ComponentType"> <xs:sequence> diff --git a/Schemas/Parameter.xsd b/Schemas/Parameter.xsd index f198e82..ad3d739 100644 --- a/Schemas/Parameter.xsd +++ b/Schemas/Parameter.xsd @@ -152,6 +152,7 @@ <xs:element ref="FixedPointParameter"/>
<xs:element ref="BitParameterBlock"/>
<xs:element ref="StringParameter"/>
+ <xs:element name="Component" type="ComponentInstance"/>
<xs:element name="ParameterBlock" type="ParameterBlockType">
<xs:unique name="ParameterBlockSubElementsUniqueness">
<xs:selector xpath="*"/>
diff --git a/Schemas/ParameterSettings.xsd b/Schemas/ParameterSettings.xsd index 1e346b2..9943d8e 100644 --- a/Schemas/ParameterSettings.xsd +++ b/Schemas/ParameterSettings.xsd @@ -74,6 +74,7 @@ </xs:unique>
</xs:element>
<xs:element name="StringParameter" type="StringParameterType"/>
+ <xs:element name="Component" type="ParameterBlockType"/>
<xs:element name="ParameterBlock" type="ParameterBlockType">
<xs:unique name="ParameterBlockSubElementsUniqueness">
<xs:selector xpath="*"/>
diff --git a/Schemas/Subsystem.xsd b/Schemas/Subsystem.xsd index bd2e091..aa2c35c 100644 --- a/Schemas/Subsystem.xsd +++ b/Schemas/Subsystem.xsd @@ -12,10 +12,9 @@ </xs:complexType>
<xs:complexType name="ComponentType">
<xs:sequence>
- <xs:choice maxOccurs="unbounded">
+ <xs:sequence maxOccurs="unbounded">
<xs:group ref="ParameterBlockGroup"/>
- <xs:element name="Component" type="ComponentInstance"/>
- </xs:choice>
+ </xs:sequence>
</xs:sequence>
<xs:attributeGroup ref="Nameable"/>
<xs:attribute name="Extends" use="optional"/>
@@ -38,10 +37,9 @@ <xs:element name="InstanceDefinition">
<xs:complexType>
<xs:sequence>
- <xs:choice maxOccurs="unbounded">
+ <xs:sequence maxOccurs="unbounded">
<xs:group ref="ParameterBlockGroup"/>
- <xs:element name="Component" type="ComponentInstance"/>
- </xs:choice>
+ </xs:sequence>
</xs:sequence>
</xs:complexType>
<xs:unique name="InstanceDefintionSubElementsUniqueness">
|