Merge pull request #198 from FIXTradingCommunity/v1.1RC1

Merge V1.1 RC1 into Orchestra master
FIXTradingCommunity · Jan 15, 2024 · 489f8d1 · 489f8d1
2 parents 4a1e802 + c7ade7e
commit 489f8d1
Show file tree

Hide file tree

Showing 39 changed files with 462 additions and 347 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # 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.
 
@@ -99,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.

diff --git a/dsl-antlr/README.md b/dsl-antlr/README.md
@@ -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>
 ```
diff --git a/dsl-antlr/pom.xml b/dsl-antlr/pom.xml
@@ -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>

diff --git a/interfaces-util/pom.xml b/interfaces-util/pom.xml
@@ -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>

diff --git a/interfaces/README.md b/interfaces/README.md
@@ -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
 
@@ -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>
 ```
diff --git a/interfaces/pom.xml b/interfaces/pom.xml
@@ -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>

diff --git a/interfaces/src/main/java/module-info.java b/interfaces/src/main/java/module-info.java
@@ -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;

diff --git a/interfaces/src/main/resources/xsd/dc.xsd b/interfaces/src/main/resources/xsd/dc.xsd
@@ -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
 
@@ -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.
@@ -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>
diff --git a/interfaces/src/main/resources/xsd/dcterms.xsd b/interfaces/src/main/resources/xsd/dcterms.xsd
@@ -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/"