niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix xsd generation in ddsconf

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2020-06-26 09:32:24 +02:00
parent 93c75186f0
commit f4e99f41f6
13 changed files with 132 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/cyclonedds.rnc
View file

@ -101,7 +101,7 @@ CycloneDDS configuration""" ] ]
text
}
}*
}?
}*
& [ a:documentation [ xml:lang="en" """
<p>This element statically configures an addresses for discovery.</p>""" ] ]
element Peer {
@ -983,7 +983,7 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br>
}?
}?
}?
}*
}?
& [ a:documentation [ xml:lang="en" """
<p>The Sizing element specifies a variety of configuration settings dealing with expected system sizes, buffer sizes, &c.</p>""" ] ]
element Sizing {
@ -1180,4 +1180,4 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br>
duration = xsd:token { pattern = "0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([num]?s|min|hr|day)" }
duration_inf = xsd:token { pattern = "inf|0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([num]?s|min|hr|day)" }
memsize = xsd:token { pattern = "0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([kMG]i?)?B" }
}
}

32
etc/cyclonedds.xsd
View file

@ -17,17 +17,17 @@ CycloneDDS configuration</xs:documentation>
&lt;p&gt;The General element specifying Domain related settings.&lt;/p&gt;</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice minOccurs="0">
<xs:element ref="config:Compatibility"/>
<xs:element ref="config:Discovery"/>
<xs:element ref="config:General"/>
<xs:element ref="config:Internal"/>
<xs:element ref="config:Partitioning"/>
<xs:element ref="config:SSL"/>
<xs:element maxOccurs="unbounded" ref="config:Security"/>
<xs:element ref="config:Sizing"/>
<xs:element ref="config:TCP"/>
<xs:element ref="config:ThreadPool"/>
<xs:all>
<xs:element minOccurs="0" ref="config:Compatibility"/>
<xs:element minOccurs="0" ref="config:Discovery"/>
<xs:element minOccurs="0" ref="config:General"/>
<xs:element minOccurs="0" ref="config:Internal"/>
<xs:element minOccurs="0" ref="config:Partitioning"/>
<xs:element minOccurs="0" ref="config:SSL"/>
<xs:element minOccurs="0" ref="config:Security"/>
<xs:element minOccurs="0" ref="config:Sizing"/>
<xs:element minOccurs="0" ref="config:TCP"/>
<xs:element minOccurs="0" ref="config:ThreadPool"/>
<xs:element minOccurs="0" name="Threads">
<xs:annotation>
<xs:documentation>
@ -39,8 +39,8 @@ CycloneDDS configuration</xs:documentation>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element ref="config:Tracing"/>
</xs:choice>
<xs:element minOccurs="0" ref="config:Tracing"/>
</xs:all>
<xs:attribute name="Id">
<xs:annotation>
<xs:documentation>
@ -179,9 +179,9 @@ CycloneDDS configuration</xs:documentation>
&lt;p&gt;This element statically configures addresses for discovery.&lt;/p&gt;</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice minOccurs="0">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="config:Group"/>
<xs:element maxOccurs="unbounded" ref="config:Peer"/>
<xs:element ref="config:Peer"/>
</xs:choice>
</xs:complexType>
</xs:element>
@ -1779,4 +1779,4 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==&lt;br&gt;
<xs:pattern value="0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([kMG]i?)?B"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
</xs:schema>