Skip to content

Add presence attributes #304

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

Open
kleihan wants to merge 7 commits into
base: v1-1-RC4
Choose a base branch
from
Open

Add presence attributes #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f03291d
Update repositorytypes.xsd
kleihan Aug 11, 2026
011715b
Remove default presence attribute for element references
kleihan Aug 14, 2026
c79471d
Moved presence attribute out of fieldAttribGrp
kleihan Aug 18, 2026
542ebb8
Update maven.yml
kleihan Aug 18, 2026
6371a34
Syntax error
kleihan Aug 18, 2026
94bc264
Merge branch '291_presence_attributes' of https://github.com/FIXTradi…
kleihan Aug 18, 2026
7d07b27
Update pom.xml
kleihan Aug 18, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<module>repository-util</module>
<module>orchestra-common</module>
<module>interfaces-util</module>
<module>orchestra2doc</module>
<!-- <module>orchestra2doc</module> -->
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
33 changes: 30 additions & 3 deletions repository/src/main/resources/xsd/repositorytypes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
</xs:sequence>
<xs:attributeGroup ref="fixr:refidGrp"/>
<xs:attributeGroup ref="fixr:entityAttribGrp"/>
<xs:attribute name="presence" type="fixr:presence_t" default="optional"/>
<xs:attribute name="presence" type="fixr:presence_t"/>
<xs:attribute name="instanceName" type="fixr:ComponentName_t">
<xs:annotation>
<xs:documentation>Override the component name for this instance, for
Expand Down Expand Up @@ -300,7 +300,6 @@
</xs:attribute>
<xs:attribute name="implMinLength" type="xs:short"/>
<xs:attribute name="implMaxLength" type="xs:short"/>
<xs:attribute name="presence" type="fixr:presence_t" default="optional"/>
<xs:attribute name="encoding" type="xs:string">
<xs:annotation>
<xs:documentation>Character encoding if other than US-ASCII
Expand Down Expand Up @@ -355,6 +354,7 @@
</xs:annotation>
</xs:attribute>
<xs:attributeGroup ref="fixr:fieldAttribGrp"/>
<xs:attribute name="presence" type="fixr:presence_t"/>
<xs:attribute name="instanceName" type="fixr:Name_t">
<xs:annotation>
<xs:documentation>Override the field name for this instance, for
Expand Down Expand Up @@ -402,7 +402,24 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attributeGroup ref="fixr:fieldAttribGrp"/>
<xs:attributeGroup ref="fixr:fieldAttribGrp">
<xs:annotation>
<xs:documentation>Overrides attributes of the referenced field, e.g. range or length.
</xs:documentation>
</xs:annotation>
</xs:attributeGroup>
<xs:attribute name="implMinOccurs" type="xs:nonNegativeInteger">
<xs:annotation>
<xs:documentation>Overrides the minimum multiplicity of the referenced field.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="implMaxOccurs" type="fixr:unboundedIntType">
<xs:annotation>
<xs:documentation>Overrides the maximum multiplicity of the referenced field.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:complexType name="fieldType">
<xs:sequence>
Expand Down Expand Up @@ -736,6 +753,16 @@
<xs:documentation>The field or component MUST be present.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="recommended">
<xs:annotation>
<xs:documentation>The field or component SHOULD be present.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="deprecated">
<xs:annotation>
<xs:documentation>The field or component SHOULD NOT be present.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="forbidden">
<xs:annotation>
<xs:documentation>The field or component MUST NOT be present.</xs:documentation>
Expand Down
Loading