Skip to content

Commit

Permalink
More XML formatting cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jonasbn committed Sep 12, 2018
1 parent 28a2164 commit aa62c17
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 80 deletions.
4 changes: 2 additions & 2 deletions dkhm-2.5.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@


<!--
End of schema.
-->
End of schema.
-->
</schema>
4 changes: 2 additions & 2 deletions dkhm-epp-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<element name="pwType" type="pwType" />

<!--
End of schema.
-->
End of schema.
-->
</schema>
4 changes: 2 additions & 2 deletions dkhm-redefines.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<element name="pwType" type="pwType" />

<!--
End of schema.
-->
End of schema.
-->
</schema>
11 changes: 2 additions & 9 deletions domain-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@
<complexType name="sNameType">
<sequence>
<element name="name" type="eppcom:labelType"/>




</sequence>
</complexType>
<!--
Expand Down Expand Up @@ -165,9 +161,6 @@
<sequence>
<element name="name" type="eppcom:labelType"/>
<element name="curExpDate" type="date"/>



<element name="period" type="domain:periodType" minOccurs="0"/>
</sequence>
</complexType>
Expand Down Expand Up @@ -387,6 +380,6 @@
</complexType>

<!--
End of schema.
-->
End of schema.
-->
</schema>
4 changes: 2 additions & 2 deletions epp-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,6 @@
</restriction>
</simpleType>
<!--
End of schema.
-->
End of schema.
-->
</schema>
4 changes: 2 additions & 2 deletions eppcom-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
</restriction>
</simpleType>
<!--
End of schema.
-->
End of schema.
-->
</schema>
58 changes: 29 additions & 29 deletions host-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

<!--
Import common element types.
-->
Import common element types.
-->
<import namespace="urn:ietf:params:xml:ns:eppcom-1.0" schemaLocation="eppcom-1.0.xsd"/>
<import namespace="urn:ietf:params:xml:ns:epp-1.0" schemaLocation="epp-1.0.xsd"/>

Expand All @@ -20,17 +20,17 @@
</annotation>

<!--
Child elements found in EPP commands.
-->
Child elements found in EPP commands.
-->
<element name="check" type="host:mNameType"/>
<element name="create" type="host:createType"/>
<element name="delete" type="host:sNameType"/>
<element name="info" type="host:sNameType"/>
<element name="update" type="host:updateType"/>

<!--
Child elements of the <create> command.
-->
Child elements of the <create> command.
-->
<complexType name="createType">
<sequence>
<element name="name" type="eppcom:labelType"/>
Expand Down Expand Up @@ -61,25 +61,25 @@
</simpleType>

<!--
Child elements of the <delete> and <info> commands.
-->
Child elements of the <delete> and <info> commands.
-->
<complexType name="sNameType">
<sequence>
<element name="name" type="eppcom:labelType"/>
</sequence>
</complexType>

<!--
Child element of commands that accept multiple names.
-->
Child element of commands that accept multiple names.
-->
<complexType name="mNameType">
<sequence>
<element name="name" type="eppcom:labelType" maxOccurs="unbounded"/>
</sequence>
</complexType>
<!--
Child elements of the <update> command.
-->
Child elements of the <update> command.
-->
<complexType name="updateType">
<sequence>
<element name="name" type="eppcom:labelType"/>
Expand All @@ -90,8 +90,8 @@
</complexType>

<!--
Data elements that can be added or removed.
-->
Data elements that can be added or removed.
-->
<complexType name="addRemType">
<sequence>
<element name="addr" type="host:addrType" minOccurs="0" maxOccurs="unbounded"/>
Expand All @@ -100,25 +100,25 @@
</complexType>

<!--
Data elements that can be changed.
-->
Data elements that can be changed.
-->
<complexType name="chgType">
<sequence>
<element name="name" type="eppcom:labelType"/>
</sequence>
</complexType>

<!--
Child response elements.
-->
Child response elements.
-->
<element name="chkData" type="host:chkDataType"/>
<element name="creData" type="host:creDataType"/>
<element name="infData" type="host:infDataType"/>
<element name="panData" type="host:panDataType"/>

<!--
<check> response elements.
-->
<check> response elements.
-->
<complexType name="chkDataType">
<sequence>
<element name="cd" type="host:checkType" maxOccurs="unbounded"/>
Expand All @@ -141,8 +141,8 @@
</complexType>

<!--
<create> response elements.
-->
<create> response elements.
-->
<complexType name="creDataType">
<sequence>
<element name="name" type="eppcom:labelType"/>
Expand All @@ -151,8 +151,8 @@
</complexType>

<!--
<info> response elements.
-->
<info> response elements.
-->
<complexType name="infDataType">
<sequence>
<element name="name" type="eppcom:labelType"/>
Expand All @@ -169,9 +169,9 @@
</complexType>

<!--
Status is a combination of attributes and an optional human-readable
message that may be expressed in languages other than English.
-->
Status is a combination of attributes and an optional human-readable
message that may be expressed in languages other than English.
-->
<complexType name="statusType">
<simpleContent>
<extension base="normalizedString">
Expand Down Expand Up @@ -215,6 +215,6 @@
</complexType>

<!--
End of schema.
-->
End of schema.
-->
</schema>
20 changes: 10 additions & 10 deletions secDNS-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
</documentation>
</annotation>
<!--
Child elements found in EPP commands.
-->
Child elements found in EPP commands.
-->
<element name="create" type="secDNS:dsType"/>
<element name="update" type="secDNS:updateType"/>
<!--
Child elements of the <create> command.
-->
Child elements of the <create> command.
-->
<complexType name="dsType">
<sequence>
<element name="dsData" type="secDNS:dsDataType" maxOccurs="unbounded"/>
Expand Down Expand Up @@ -50,8 +50,8 @@
</restriction>
</simpleType>
<!--
Child elements of the <update> command.
-->
Child elements of the <update> command.
-->
<complexType name="updateType">
<choice>
<element name="add" type="secDNS:dsType"/>
Expand All @@ -66,10 +66,10 @@
</sequence>
</complexType>
<!--
Child response elements.
-->
Child response elements.
-->
<element name="infData" type="secDNS:dsType"/>
<!--
End of schema.
-->
End of schema.
-->
</schema>
44 changes: 22 additions & 22 deletions secDNS-1.1.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
</documentation>
</annotation>
<!--
Child elements found in EPP commands.
-->
Child elements found in EPP commands.
-->
<element name="create" type="secDNS:dsOrKeyType"/>
<element name="update" type="secDNS:updateType"/>
<!--
Child elements supporting either the
dsData or the keyData interface.
-->
Child elements supporting either the
dsData or the keyData interface.
-->
<complexType name="dsOrKeyType">
<sequence>
<element name="maxSigLife" type="secDNS:maxSigLifeType" minOccurs="0"/>
Expand All @@ -27,16 +27,16 @@
</sequence>
</complexType>
<!--
Definition for the maximum signature lifetime (maxSigLife)
-->
Definition for the maximum signature lifetime (maxSigLife)
-->
<simpleType name="maxSigLifeType">
<restriction base="int">
<minInclusive value="1"/>
</restriction>
</simpleType>
<!--
Child elements of dsData used for dsData interface
-->
Child elements of dsData used for dsData interface
-->
<complexType name="dsDataType">
<sequence>
<element name="keyTag" type="unsignedShort"/>
Expand All @@ -47,9 +47,9 @@
</sequence>
</complexType>
<!--
Child elements of keyData used for keyData interface
and optionally with dsData interface
-->
Child elements of keyData used for keyData interface
and optionally with dsData interface
-->
<complexType name="keyDataType">
<sequence>
<element name="flags" type="unsignedShort"/>
Expand All @@ -59,16 +59,16 @@
</sequence>
</complexType>
<!--
Definition for the public key
-->
Definition for the public key
-->
<simpleType name="keyType">
<restriction base="base64Binary">
<minLength value="1"/>
</restriction>
</simpleType>
<!--
Child elements of the <update> element.
-->
Child elements of the <update> element.
-->
<complexType name="updateType">
<sequence>
<element name="rem" type="secDNS:remType" minOccurs="0"/>
Expand All @@ -78,8 +78,8 @@
<attribute name="urgent" type="boolean" default="false"/>
</complexType>
<!--
Child elements of the <rem> command.
-->
Child elements of the <rem> command.
-->
<complexType name="remType">
<choice>
<element name="all" type="boolean"/>
Expand All @@ -88,15 +88,15 @@
</choice>
</complexType>
<!--
Child elements supporting the <chg> element.
-->
Child elements supporting the <chg> element.
-->
<complexType name="chgType">
<sequence>
<element name="maxSigLife" type="secDNS:maxSigLifeType" minOccurs="0"/>
</sequence>
</complexType>
<!--
Child response elements.
-->
Child response elements.
-->
<element name="infData" type="secDNS:dsOrKeyType"/>
</schema>

0 comments on commit aa62c17

Please sign in to comment.