Skip to content
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

Merge V1.1 RC1 into Orchestra master #198

Merged
merged 52 commits into from
Jan 15, 2024
Merged

Merge V1.1 RC1 into Orchestra master #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e353311
Orchestra v1.1
donmendelson Jul 28, 2021
22681a4
[repository schema] sort attribute of codeType should be numeric #113
donmendelson Nov 19, 2021
1d04455
Restricted characters in message and components Name_t #118
donmendelson Nov 19, 2021
52f1f18
Restricted characters in fix:code #119
donmendelson Nov 19, 2021
f47323b
Repository schema: Annotations for top-level elements #127
donmendelson Nov 19, 2021
8e2a81a
[repository schema] allow empty collection elements #128
donmendelson Nov 19, 2021
566cc81
[repository schema] Propose to define identifier attributes as token …
donmendelson Nov 19, 2021
323e518
[repository schema] Version attribute should not be so restrictive #132
donmendelson Nov 19, 2021
df29c58
Allow name in fieldRef, groupRef, componentRef #136
donmendelson Nov 19, 2021
0d39d60
Allow name in fieldRef, groupRef, componentRef #136
donmendelson Nov 19, 2021
4a54515
[repository schema] Allow a message without a structure #123
donmendelson Nov 19, 2021
09138bd
[repository schema] latestEP attribute is redundant #122
donmendelson Nov 19, 2021
54dae1c
#132
donmendelson Nov 22, 2021
0476508
Scenarios ID prototype
donmendelson Nov 29, 2021
16948f8
Proposal for version 1.1
donmendelson Feb 15, 2022
37b8058
[interfaces schema] document effective date of an interface #149
donmendelson Feb 16, 2022
1e150ee
[repository and interfaces schemas] Propose to define identifier attr…
donmendelson Mar 9, 2022
e468b70
[repositorySchema] datatypes lack scenarios #151
donmendelson Mar 9, 2022
9758da2
Merge pull request #156 from donmendelson/v1.1interfaces
donmendelson Mar 24, 2022
de1d8a6
Merge branch 'v1.1RC1' into v1.1schema
donmendelson Mar 24, 2022
223ede2
Merge pull request #155 from donmendelson/v1.1schema
donmendelson Mar 24, 2022
887908b
Update workflows/maven.yml
donmendelson Mar 24, 2022
a34c35f
Merge pull request #157 from donmendelson/v1.1scenarios
donmendelson Mar 24, 2022
af317c9
Merge pull request #158 from donmendelson/v1.1datatypes
donmendelson Mar 24, 2022
ec5218f
Task: create a branch to merge proposed changes for v1.1 #153
donmendelson Mar 24, 2022
7ab4750
Update README.md
donmendelson Mar 24, 2022
da08a11
[repositorySchema] mappedDatatype lacks size attribute #152
donmendelson Mar 25, 2022
9bae267
Merge pull request #159 from donmendelson/issue152
donmendelson Apr 20, 2022
84f162f
unionDataType should be an attribute of a code set, not field #161
donmendelson Jun 14, 2022
4da9981
Explicit link between a field and related fields for its encoded vers…
donmendelson Jun 14, 2022
3a56a02
Explicit link between a field and related fields for its encoded vers…
donmendelson Jun 16, 2022
ee09886
unionDataType should be an attribute of a code set, not field #161
donmendelson Jun 16, 2022
059a453
Merge pull request #162 from donmendelson/issue161
donmendelson Jul 20, 2022
bf708b6
Merge pull request #163 from donmendelson/issue94
donmendelson Jul 20, 2022
af6d7b4
[repositorySchema] Correlating an incoming tag-value message to its s…
donmendelson Aug 17, 2022
786e934
[repository schema] allow empty collection elements #128
donmendelson Aug 19, 2022
37d034f
#128
donmendelson Aug 19, 2022
6341fc7
[repository schema] Field type attribute does not distinguish between…
donmendelson Sep 22, 2022
00dbcd4
Merge pull request #171 from donmendelson/issue170
donmendelson Oct 19, 2022
85f44cd
Merge pull request #167 from donmendelson/issue166
donmendelson Oct 19, 2022
85512e1
Merge pull request #168 from donmendelson/issue128
donmendelson Oct 19, 2022
93bab16
Corrected typo
chrjohn Jul 21, 2023
51ac252
Merge pull request #185 from chrjohn/v1.1RC1
kleihan Aug 17, 2023
0df219f
Removed latestEP for fields #122
kleihan Aug 29, 2023
9bc2ee1
Normalized codeSet keyword #174
kleihan Aug 29, 2023
32c36e0
Typo correction #176
kleihan Aug 29, 2023
d1e60c1
Updated expected publication date #177
kleihan Aug 29, 2023
cfa62ec
Added RC1 to version #178
kleihan Aug 29, 2023
2c9dd2e
Remove simple type Edition_t #180
kleihan Aug 29, 2023
8f62281
Update documentation (#112)
kleihan Oct 27, 2023
e465655
Change year to 2023
kleihan Nov 10, 2023
c7ade7e
Changed attribute name for #94
kleihan Nov 15, 2023
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
6 changes: 1 addition & 5 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

name: Java CI with Maven

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
on: [push, pull_request]

jobs:
build:
Expand Down
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[![Java CI with Maven](https://github.com/FIXTradingCommunity/fix-orchestra/actions/workflows/maven.yml/badge.svg)](https://github.com/FIXTradingCommunity/fix-orchestra/actions/workflows/maven.yml)

![](FIXorchestraLogo.png)

# FIX Orchestra Resources

This project contains resources and sample code for FIX Orchestra version 1.0. Technical specifications for FIX Orchestra are in project [fix-orchestra-spec](https://github.com/FIXTradingCommunity/fix-orchestra-spec).
This project contains resources and sample code for FIX Orchestra version 1.1. Technical specifications for FIX Orchestra are in project [fix-orchestra-spec](https://github.com/FIXTradingCommunity/fix-orchestra-spec).

FIX Orchestra is intended to provide a standard and some reference implementation for *machine readable rules of engagement* between counterparties. The goal is to reduce the time to get counterparties trading, and improve accuracy of implementations.

Expand Down Expand Up @@ -97,7 +99,7 @@ This module generates code that is conformant to the QuickFIX/J API for validati
A demonstration of session configuration for QuickFIX open-source FIX engine. It consumes an XML file in the `interfaces` schema.

## License
© Copyright 2016-2021 FIX Protocol Limited
© Copyright 2016-2022 FIX Protocol Limited

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion dsl-antlr/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ The module may be included as a dependency in a Maven project as follows:
<dependency>
<groupId>io.fixprotocol.orchestra</groupId>
<artifactId>dsl-antlr</artifactId>
<version>1.6.10</version>
<version>1.8.0</version>
</dependency>
```
2 changes: 1 addition & 1 deletion dsl-antlr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.fixprotocol.orchestra</groupId>
<version>1.7.4-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dsl-antlr</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion interfaces-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fixprotocol.orchestra</groupId>
<artifactId>parent</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>interfaces-util</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
Expand Down
4 changes: 2 additions & 2 deletions interfaces/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This module provides an XML schema for service offerings, protocols and session

See documentation of the schema in [Orchestra specifications](https://github.com/FIXTradingCommunity/fix-orchestra-spec/tree/master/v1-0-RC5)

The XML namespace for the schema is `http://fixprotocol.io/2020/orchestra/interfaces`.
The XML namespace for the schema is `http://fixprotocol.io/2022/orchestra/interfaces`.

## Build

Expand All @@ -14,6 +14,6 @@ In addition to providing the XML schema as a resource, this module builds Java b
<dependency>
<groupId>io.fixprotocol.orchestra</groupId>
<artifactId>interfaces</artifactId>
<version>1.6.10</version>
<version>1.8.0</version>
</dependency>
```
2 changes: 1 addition & 1 deletion interfaces/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fixprotocol.orchestra</groupId>
<artifactId>parent</artifactId>
<version>1.7.4-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>interfaces</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
Expand Down
4 changes: 2 additions & 2 deletions interfaces/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
requires transitive java.xml.bind;
requires transitive jaxb2.basics.runtime;

exports io.fixprotocol._2020.orchestra.interfaces;
opens io.fixprotocol._2020.orchestra.interfaces;
exports io.fixprotocol._2022.orchestra.interfaces;
opens io.fixprotocol._2022.orchestra.interfaces;
exports org.purl.dc.elements._1;
opens org.purl.dc.elements._1;
exports org.purl.dc.terms;
Expand Down
127 changes: 53 additions & 74 deletions interfaces/src/main/resources/xsd/dc.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://purl.org/dc/elements/1.1/"
targetNamespace="http://purl.org/dc/elements/1.1/"
elementFormDefault="qualified"
attributeFormDefault="unqualified">

<xs:annotation>
<xs:documentation xml:lang="en">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://purl.org/dc/elements/1.1/" targetNamespace="http://purl.org/dc/elements/1.1/" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation xml:lang="en">
DCMES 1.1 XML Schema
XML Schema for http://purl.org/dc/elements/1.1/ namespace

Expand Down Expand Up @@ -34,17 +29,11 @@
which means that the default type for all elements is dc:SimpleLiteral.

</xs:documentation>

</xs:annotation>


<xs:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/03/xml.xsd">
</xs:import>

<xs:complexType name="SimpleLiteral">
<xs:annotation>
<xs:documentation xml:lang="en">
</xs:annotation>
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
<xs:complexType name="SimpleLiteral" mixed="true">
<xs:annotation>
<xs:documentation xml:lang="en">
This is the default type for all of the DC elements.
It permits text content only with optional
xml:lang attribute.
Expand All @@ -55,65 +44,55 @@
This complexType allows for restriction or extension permitting
child elements.
</xs:documentation>
</xs:annotation>

<xs:complexContent mixed="true">
<xs:restriction base="xs:anyType">
<xs:sequence>
<xs:any processContents="lax" minOccurs="0" maxOccurs="0"/>
</xs:sequence>
<xs:attribute ref="xml:lang" use="optional"/>
</xs:restriction>
</xs:complexContent>
</xs:complexType>

<xs:element name="any" type="SimpleLiteral" abstract="true"/>

<xs:element name="title" substitutionGroup="any"/>
<xs:element name="creator" substitutionGroup="any"/>
<xs:element name="subject" substitutionGroup="any"/>
<xs:element name="description" substitutionGroup="any"/>
<xs:element name="publisher" substitutionGroup="any"/>
<xs:element name="contributor" substitutionGroup="any"/>
<xs:element name="date" substitutionGroup="any"/>
<xs:element name="type" substitutionGroup="any"/>
<xs:element name="format" substitutionGroup="any"/>
<xs:element name="identifier" substitutionGroup="any"/>
<xs:element name="source" substitutionGroup="any"/>
<xs:element name="language" substitutionGroup="any"/>
<xs:element name="relation" substitutionGroup="any"/>
<xs:element name="coverage" substitutionGroup="any"/>
<xs:element name="rights" substitutionGroup="any"/>

<xs:group name="elementsGroup">
<xs:annotation>
<xs:documentation xml:lang="en">
</xs:annotation>
<xs:complexContent>
<xs:restriction base="xs:anyType">
<xs:sequence>
<xs:any processContents="lax" minOccurs="0" maxOccurs="0"/>
</xs:sequence>
<xs:attribute ref="xml:lang" use="optional"/>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
<xs:element name="any" type="SimpleLiteral" abstract="true"/>
<xs:element name="title" substitutionGroup="any"/>
<xs:element name="creator" substitutionGroup="any"/>
<xs:element name="subject" substitutionGroup="any"/>
<xs:element name="description" substitutionGroup="any"/>
<xs:element name="publisher" substitutionGroup="any"/>
<xs:element name="contributor" substitutionGroup="any"/>
<xs:element name="date" substitutionGroup="any"/>
<xs:element name="type" substitutionGroup="any"/>
<xs:element name="format" substitutionGroup="any"/>
<xs:element name="identifier" substitutionGroup="any"/>
<xs:element name="source" substitutionGroup="any"/>
<xs:element name="language" substitutionGroup="any"/>
<xs:element name="relation" substitutionGroup="any"/>
<xs:element name="coverage" substitutionGroup="any"/>
<xs:element name="rights" substitutionGroup="any"/>
<xs:group name="elementsGroup">
<xs:annotation>
<xs:documentation xml:lang="en">
This group is included as a convenience for schema authors
who need to refer to all the elements in the
http://purl.org/dc/elements/1.1/ namespace.
</xs:documentation>
</xs:annotation>

<xs:sequence>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="any"/>
</xs:choice>
</xs:sequence>
</xs:group>

<xs:complexType name="elementContainer">
<xs:annotation>
<xs:documentation xml:lang="en">
</xs:annotation>
<xs:sequence>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="any"/>
</xs:choice>
</xs:sequence>
</xs:group>
<xs:complexType name="elementContainer">
<xs:annotation>
<xs:documentation xml:lang="en">
This complexType is included as a convenience for schema authors who need to define a root
or container element for all of the DC elements.
</xs:documentation>
</xs:annotation>

<xs:choice>
<xs:group ref="elementsGroup"/>
</xs:choice>
</xs:complexType>


</xs:schema>

</xs:annotation>
<xs:choice>
<xs:group ref="elementsGroup"/>
</xs:choice>
</xs:complexType>
</xs:schema>
2 changes: 1 addition & 1 deletion interfaces/src/main/resources/xsd/dcterms.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@


<xs:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/03/xml.xsd">
schemaLocation="xml.xsd">
</xs:import>

<xs:import namespace="http://purl.org/dc/elements/1.1/"
Expand Down
Loading
Loading