Skip to content
This repository was archived by the owner on May 22, 2024. It is now read-only.

Commit 6f32927

Browse files
committed
Merge branch '__rultor'
2 parents bc76c93 + 9e4d2a6 commit 6f32927

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

xml/pm/claims/simple.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ SOFTWARE.
4343
<created>2016-12-29T09:03:21.684Z</created>
4444
<token>user;yegor256</token>
4545
</claim>
46-
<claim id="2722301000">
46+
<claim id="e5241c4e-e47d-4b85-b07f-27afbeba090c">
4747
<type>bootstrap the project</type>
4848
<created>2016-12-29T09:03:21.684Z</created>
4949
<token>github;yegor256</token>
5050
</claim>
51-
<claim id="2722301077">
51+
<claim id="83199f5d-d808-4136-b918-b871537fb96e">
5252
<type>Notify</type>
5353
<created>2016-12-29T09:03:21.684Z</created>
5454
<token>project;C99998888</token>

xsd/pm/claims.xsd

+9-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ SOFTWARE.
5353
</xs:complexType>
5454
</xs:element>
5555
</xs:all>
56-
<xs:attribute name="id" type="xs:long" use="required"/>
56+
<!--
57+
@todo #388:30min Restrict id type as uuid.
58+
Claim id was changed from long to uuid, but to keep
59+
system working the migration should be done in two steps:
60+
change claim id from long to string to accept both types
61+
(numbers and uuids), then change this type to uuid (see types.xsd).
62+
-->
63+
<xs:attribute name="id" type="xs:string" use="required"/>
5764
</xs:complexType>
5865
<xs:element name="claims">
5966
<xs:complexType>
@@ -64,7 +71,7 @@ SOFTWARE.
6471
<xs:attribute name="version" use="required" type="version"/>
6572
<xs:attribute name="busy" use="optional" type="xs:dateTime"/>
6673
</xs:complexType>
67-
<xs:unique name="uniqueID">
74+
<xs:unique name="claimID">
6875
<xs:selector xpath="claim"/>
6976
<xs:field xpath="@id"/>
7077
</xs:unique>

xsd/pmo/types.xsd

+5
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,9 @@ SOFTWARE.
5151
<xs:pattern value="[A-Za-z\d\-]{1,39}/[A-Za-z\d\-]{1,39}"/>
5252
</xs:restriction>
5353
</xs:simpleType>
54+
<xs:simpleType name="uuid">
55+
<xs:restriction base="xs:string">
56+
<xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>
57+
</xs:restriction>
58+
</xs:simpleType>
5459
</xs:schema>

0 commit comments

Comments
 (0)