Skip to content

Add AttributeDeadline and AttributeOneWayPassword; improve compatibility to iTop definitions #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rudnerbjoern merged 6 commits into from
Jun 20, 2025
Merged

Add AttributeDeadline and AttributeOneWayPassword; improve compatibility to iTop definitions #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d907df3
Update stimulus element type to ObjectStimulus and rename StimulusBas…
rudnerbjoern Jun 20, 2025
716a515
Refactor XML schema: update sequence minOccurs attributes and simplif…
rudnerbjoern Jun 20, 2025
bd2e626
allow indexes/index to be altered
rudnerbjoern Jun 20, 2025
1217cc9
Add AttributeDeadline complex type extending AttributeDateTime
rudnerbjoern Jun 20, 2025
e6ec39c
Add AttributeOneWayPassword complex type extending AttributeDefinition
rudnerbjoern Jun 20, 2025
3b1fab2
Update index element minOccurs and make it alterable
rudnerbjoern Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 43 additions & 16 deletions 3.2/itop_design.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<xs:sequence maxOccurs="unbounded">
<xs:element name="index" minOccurs="1">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="attributes">
<xs:complexType>
<xs:sequence maxOccurs="unbounded">
Expand All @@ -135,6 +135,7 @@
</xs:element>
</xs:sequence>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -230,7 +231,7 @@
<xs:element name="stimuli" minOccurs="0">
<xs:complexType>
<xs:sequence maxOccurs="unbounded">
<xs:element name="stimulus" type="StimulusBase" />
<xs:element name="stimulus" type="ObjectStimulus" />
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down Expand Up @@ -286,7 +287,7 @@
<xs:element name="target" type="xs:string" minOccurs="0" />
<xs:element name="flags" minOccurs="0">
<xs:complexType>
<xs:sequence maxOccurs="unbounded">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="attribute">
<xs:complexType>
<xs:all>
Expand Down Expand Up @@ -754,15 +755,7 @@
<xs:element name="imports" minOccurs="0">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="import">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="alteredString">
<xs:attribute name="id" type="xs:string" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="import" />
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down Expand Up @@ -1518,7 +1511,7 @@
</xs:simpleType>

<!-- ########################### Stimuli ########################### -->
<xs:complexType name="StimulusBase" abstract="true">
<xs:complexType name="ObjectStimulus" abstract="true">
<xs:annotation>
<xs:documentation>
Abstract base type for state transition stimuli in iTop lifecycle.
Expand Down Expand Up @@ -1551,7 +1544,7 @@
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="StimulusBase" />
<xs:extension base="ObjectStimulus" />
</xs:complexContent>
</xs:complexType>

Expand All @@ -1563,7 +1556,7 @@
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="StimulusBase" />
<xs:extension base="ObjectStimulus" />
</xs:complexContent>
</xs:complexType>
<!-- ########################### /Stimuli ########################### -->
Expand Down Expand Up @@ -1640,6 +1633,14 @@
</xs:annotation>
<xs:restriction base="string" />
</xs:simpleType>

<xs:complexType name="utilities">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="id" type="xs:string" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<!-- ########################### /action parameters ########################### -->

<!-- ##################################################################
Expand All @@ -1664,7 +1665,7 @@
Each dependency refers to an attribute by its 'id'.
</xs:documentation>
</xs:annotation>
<xs:sequence maxOccurs="unbounded">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="attribute">
<xs:complexType>
<xs:attribute name="id" type="xs:string" use="required" />
Expand Down Expand Up @@ -1850,6 +1851,14 @@
</xs:complexType>
<!-- ########################### /AttributeDateTime ########################### -->

<!-- ########################### AttributeDeadline ########################### -->
<xs:complexType name="AttributeDeadline">
<xs:complexContent>
<xs:extension base="AttributeDateTime" />
</xs:complexContent>
</xs:complexType>
<!-- ########################### /AttributeDeadline ########################### -->

<!-- ########################### AttributeDecimal ########################### -->
<xs:complexType name="AttributeDecimal">
<xs:complexContent>
Expand Down Expand Up @@ -2338,6 +2347,24 @@
</xs:complexType>
<!-- ########################### /AttributeObjectKey ########################### -->

<!-- ########################### AttributeOneWayPassword ########################### -->
<xs:complexType name="AttributeOneWayPassword">
<xs:complexContent>
<xs:extension base="AttributeDefinition">
<xs:all>
<xs:element name="sql" type="xs:string" minOccurs="0" />
<xs:element name="default_value" type="xs:string" minOccurs="0" />
<xs:element name="is_null_allowed" type="xs:boolean" minOccurs="0" />
<xs:element name="validation_pattern" type="xs:string" minOccurs="0" />
<xs:element name="tracking_level" type="trackingLevelEnumeration" minOccurs="0" />
<xs:element name="always_load_in_tables" type="xs:boolean" minOccurs="0" default="false" />
<xs:element name="dependencies" type="dependenciesType" minOccurs="0" />
</xs:all>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<!-- ########################### /AttributeOneWayPassword ########################### -->

<!-- ########################### AttributePassword ########################### -->
<xs:complexType name="AttributePassword">
<xs:complexContent>
Expand Down
12 changes: 12 additions & 0 deletions test/datamodel.must-validate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<attribute id="4" />
</attributes>
</index>
<index id="3" _delta="delete_if_exists" />
</indexes>
<archive>
<enabled>true</enabled>
Expand Down Expand Up @@ -692,6 +693,17 @@
<is_null_allowed>false</is_null_allowed>
<class_attcode>attcode</class_attcode>
</field>
<field id="password1" xsi:type="AttributeOneWayPassword">
<sql>pwd1</sql>
<is_null_allowed>false</is_null_allowed>
<default_value>pwd1</default_value>
</field>
<field id="password2" xsi:type="AttributePassword">
<sql>pwd2</sql>
<is_null_allowed>false</is_null_allowed>
<default_value />
<validation_pattern>pattern</validation_pattern>
</field>
<field id="p1" xsi:type="AttributePercentage">
<sql>p1</sql>
<default_value>10</default_value>
Expand Down