Merge branch 'v1-1-RC2'

FIXTradingCommunity · Dec 20, 2024 · a98b512 · a98b512
2 parents a871fce + cd3606f
commit a98b512
Show file tree

Hide file tree

Showing 14 changed files with 171 additions and 141 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ See [Orchestra tutorials](https://github.com/FIXTradingCommunity/fix-orchestra/w
 
 ### Version 1.1 Release Candidate
 
-The first Release Candidate for Orchestra version 1.1 was released for public review  in November 2023. A second Release Candidate is currently work in progress in the Orchestra Subcommittee of the FIX Trading Community.
+The first Release Candidate for Orchestra version 1.1 was released for public review in November 2023. A second Release Candidate is currently work in progress in the Orchestra Subcommittee of the FIX Trading Community.
 
 ### Version 1.0 Technical Standard
 

diff --git a/interfaces/src/main/java/module-info.java b/interfaces/src/main/java/module-info.java
@@ -1,11 +1,11 @@
 module orchestra.interfaces {
   requires transitive java.xml.bind;
   requires transitive jaxb2.basics.runtime;
-  
-  exports io.fixprotocol._2023.orchestra.interfaces;
-  opens io.fixprotocol._2023.orchestra.interfaces;
+
+  exports io.fixprotocol._2024.orchestra.interfaces;
+  opens io.fixprotocol._2024.orchestra.interfaces;
   exports org.purl.dc.elements._1;
   opens org.purl.dc.elements._1;
   exports org.purl.dc.terms;
   opens org.purl.dc.terms;
-}
+}
diff --git a/interfaces/src/main/resources/xsd/interfaces.xsd b/interfaces/src/main/resources/xsd/interfaces.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixi="http://fixprotocol.io/2023/orchestra/interfaces" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2023/orchestra/interfaces" elementFormDefault="qualified" version="1.1-rc1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixi="http://fixprotocol.io/2024/orchestra/interfaces" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2024/orchestra/interfaces" elementFormDefault="qualified" version="1.1-rc2">
 	<xs:annotation>
 		<xs:documentation>
 			FIX interface configuration
-			© Copyright 2016-2023 FIX Protocol Limited
+			© Copyright 2016-2024 FIX Protocol Limited
 			Creative Commons Attribution-NoDerivatives 4.0
 			International Public License
 		</xs:documentation>

diff --git a/message-model/src/main/java/io/fixprotocol/orchestra/message/CodeSetScope.java b/message-model/src/main/java/io/fixprotocol/orchestra/message/CodeSetScope.java
@@ -15,8 +15,8 @@
 package io.fixprotocol.orchestra.message;
 
 import java.util.List;
-import io.fixprotocol._2023.orchestra.repository.CodeSetType;
-import io.fixprotocol._2023.orchestra.repository.CodeType;
+import io.fixprotocol._2024.orchestra.repository.CodeSetType;
+import io.fixprotocol._2024.orchestra.repository.CodeType;
 import io.fixprotocol.orchestra.model.FixNode;
 import io.fixprotocol.orchestra.model.FixType;
 import io.fixprotocol.orchestra.model.FixValue;

diff --git a/message-model/src/main/java/io/fixprotocol/orchestra/message/Populator.java b/message-model/src/main/java/io/fixprotocol/orchestra/message/Populator.java
@@ -14,7 +14,7 @@
  */
 package io.fixprotocol.orchestra.message;
 
-import io.fixprotocol._2023.orchestra.repository.MessageType;
+import io.fixprotocol._2024.orchestra.repository.MessageType;
 import io.fixprotocol.orchestra.model.ModelException;
 
 /**

diff --git a/message-model/src/main/java/io/fixprotocol/orchestra/message/Validator.java b/message-model/src/main/java/io/fixprotocol/orchestra/message/Validator.java
@@ -14,7 +14,7 @@
  */
 package io.fixprotocol.orchestra.message;
 
-import io.fixprotocol._2023.orchestra.repository.MessageType;
+import io.fixprotocol._2024.orchestra.repository.MessageType;
 
 /**
  * Validate a message against an Orchestra file
@@ -28,7 +28,7 @@ public interface Validator<M> {
   /**
    * Validates a message. A {@code Validator} checks field presence, data range, and membership of a
    * code in a codeSet.
-   * 
+   *
    * @param message to validate
    * @param messageType Orchestra declaration of a message type
    * @throws TestException if a message is invalid

diff --git a/orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java b/orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java
@@ -45,30 +45,30 @@
 import org.stringtemplate.v4.STWriter;
 import org.stringtemplate.v4.misc.STMessage;
 
-import io.fixprotocol._2023.orchestra.repository.ActorType;
-import io.fixprotocol._2023.orchestra.repository.Actors;
-import io.fixprotocol._2023.orchestra.repository.CatComponentTypeT;
-import io.fixprotocol._2023.orchestra.repository.Categories;
-import io.fixprotocol._2023.orchestra.repository.CategoryType;
-import io.fixprotocol._2023.orchestra.repository.CodeSetType;
-import io.fixprotocol._2023.orchestra.repository.CodeType;
-import io.fixprotocol._2023.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2023.orchestra.repository.ComponentType;
-import io.fixprotocol._2023.orchestra.repository.Datatype;
-import io.fixprotocol._2023.orchestra.repository.FieldRefType;
-import io.fixprotocol._2023.orchestra.repository.FieldRuleType;
-import io.fixprotocol._2023.orchestra.repository.FieldType;
-import io.fixprotocol._2023.orchestra.repository.FlowType;
-import io.fixprotocol._2023.orchestra.repository.GroupRefType;
-import io.fixprotocol._2023.orchestra.repository.GroupType;
-import io.fixprotocol._2023.orchestra.repository.MessageRefType;
-import io.fixprotocol._2023.orchestra.repository.MessageType;
-import io.fixprotocol._2023.orchestra.repository.MessageType.Responses;
-import io.fixprotocol._2023.orchestra.repository.PresenceT;
-import io.fixprotocol._2023.orchestra.repository.Repository;
-import io.fixprotocol._2023.orchestra.repository.ResponseType;
-import io.fixprotocol._2023.orchestra.repository.StateMachineType;
-import io.fixprotocol._2023.orchestra.repository.SupportType;
+import io.fixprotocol._2024.orchestra.repository.ActorType;
+import io.fixprotocol._2024.orchestra.repository.Actors;
+import io.fixprotocol._2024.orchestra.repository.CatComponentTypeT;
+import io.fixprotocol._2024.orchestra.repository.Categories;
+import io.fixprotocol._2024.orchestra.repository.CategoryType;
+import io.fixprotocol._2024.orchestra.repository.CodeSetType;
+import io.fixprotocol._2024.orchestra.repository.CodeType;
+import io.fixprotocol._2024.orchestra.repository.ComponentRefType;
+import io.fixprotocol._2024.orchestra.repository.ComponentType;
+import io.fixprotocol._2024.orchestra.repository.Datatype;
+import io.fixprotocol._2024.orchestra.repository.FieldRefType;
+import io.fixprotocol._2024.orchestra.repository.FieldRuleType;
+import io.fixprotocol._2024.orchestra.repository.FieldType;
+import io.fixprotocol._2024.orchestra.repository.FlowType;
+import io.fixprotocol._2024.orchestra.repository.GroupRefType;
+import io.fixprotocol._2024.orchestra.repository.GroupType;
+import io.fixprotocol._2024.orchestra.repository.MessageRefType;
+import io.fixprotocol._2024.orchestra.repository.MessageType;
+import io.fixprotocol._2024.orchestra.repository.MessageType.Responses;
+import io.fixprotocol._2024.orchestra.repository.PresenceT;
+import io.fixprotocol._2024.orchestra.repository.Repository;
+import io.fixprotocol._2024.orchestra.repository.ResponseType;
+import io.fixprotocol._2024.orchestra.repository.StateMachineType;
+import io.fixprotocol._2024.orchestra.repository.SupportType;
 
 /**
  * @author Don Mendelson
@@ -100,7 +100,7 @@ public void close() throws Exception {
 
   /**
    * Generates documentation
-   * 
+   *
    * @param args command line arguments
    *        <ol>
    *        <li>Name of an Orchestra input file.
@@ -197,7 +197,7 @@ private String severityToString(final int severity) {
 
   /**
    * Constructs a DocGenerator
-   * 
+   *
    * @param inputStream input Orchestra file
    * @param outputRootDir root of file system to write documentation files. If the path ends in
    *        <code>.zip</code>, then a zip archive is created. If the path contains
@@ -214,7 +214,7 @@ public DocGenerator(final InputStream inputStream, final String outputRootDir, f
 
   /**
    * Generates documentation
-   * 
+   *
    * @throws Exception if input cannot be read or output cannot be written to a file
    */
   public void generate() throws Exception {
@@ -419,7 +419,7 @@ private void generateAllComponentsList(final Path messagesDocPath, final List<Co
       st.write(writer, templateErrorListener);
     }
   }
-  
+
   private void generateAllGroupsList(final Path messagesDocPath, final List<GroupType> componentList)
       throws Exception {
     final ST st = stGroup.getInstanceOf("groups");
@@ -736,7 +736,7 @@ private FieldType getField(final int id) {
     }
     return null;
   }
-  
+
   private String getFieldPresence(final FieldRefType fieldRef) {
     switch (fieldRef.getPresence()) {
       case CONSTANT:
@@ -816,7 +816,7 @@ private String getTypeLink(String type, String scenario) {
   private STWriterWrapper getWriter(final Path path) throws IOException {
     return new STWriterWrapper(this.pathManager.getWriter(path));
   }
-  
+
   private Repository unmarshal(final InputStream inputStream) throws JAXBException {
     final JAXBContext jaxbContext = JAXBContext.newInstance(Repository.class);
     final Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();

diff --git a/orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/ImgGenerator.java b/orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/ImgGenerator.java
@@ -26,12 +26,12 @@
 import org.stringtemplate.v4.STGroupFile;
 import org.stringtemplate.v4.STWriter;
 
-import io.fixprotocol._2023.orchestra.repository.FlowType;
-import io.fixprotocol._2023.orchestra.repository.MessageRefType;
-import io.fixprotocol._2023.orchestra.repository.MessageType;
-import io.fixprotocol._2023.orchestra.repository.ResponseType;
-import io.fixprotocol._2023.orchestra.repository.StateMachineType;
-import io.fixprotocol._2023.orchestra.repository.Synchronization;
+import io.fixprotocol._2024.orchestra.repository.FlowType;
+import io.fixprotocol._2024.orchestra.repository.MessageRefType;
+import io.fixprotocol._2024.orchestra.repository.MessageType;
+import io.fixprotocol._2024.orchestra.repository.ResponseType;
+import io.fixprotocol._2024.orchestra.repository.StateMachineType;
+import io.fixprotocol._2024.orchestra.repository.Synchronization;
 import net.sourceforge.plantuml.SourceStringReader;
 
 public class ImgGenerator {

diff --git a/orchestra2doc/src/test/resources/mit_2016.xml b/orchestra2doc/src/test/resources/mit_2016.xml
diff --git a/...sitory-util/src/main/java/io/fixprotocol/orchestra/transformers/RepositoryCompressor.java b/...sitory-util/src/main/java/io/fixprotocol/orchestra/transformers/RepositoryCompressor.java
@@ -43,25 +43,25 @@
 import org.purl.dc.elements._1.ObjectFactory;
 import org.purl.dc.elements._1.SimpleLiteral;
 import org.purl.dc.terms.ElementOrRefinementContainer;
-import io.fixprotocol._2023.orchestra.repository.Actors;
-import io.fixprotocol._2023.orchestra.repository.Categories;
-import io.fixprotocol._2023.orchestra.repository.CategoryType;
-import io.fixprotocol._2023.orchestra.repository.CodeSetType;
-import io.fixprotocol._2023.orchestra.repository.CodeSets;
-import io.fixprotocol._2023.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2023.orchestra.repository.ComponentType;
-import io.fixprotocol._2023.orchestra.repository.Components;
-import io.fixprotocol._2023.orchestra.repository.Datatypes;
-import io.fixprotocol._2023.orchestra.repository.FieldRefType;
-import io.fixprotocol._2023.orchestra.repository.FieldType;
-import io.fixprotocol._2023.orchestra.repository.Fields;
-import io.fixprotocol._2023.orchestra.repository.GroupRefType;
-import io.fixprotocol._2023.orchestra.repository.GroupType;
-import io.fixprotocol._2023.orchestra.repository.Groups;
-import io.fixprotocol._2023.orchestra.repository.MessageType;
-import io.fixprotocol._2023.orchestra.repository.Messages;
-import io.fixprotocol._2023.orchestra.repository.Repository;
-import io.fixprotocol._2023.orchestra.repository.Sections;
+import io.fixprotocol._2024.orchestra.repository.Actors;
+import io.fixprotocol._2024.orchestra.repository.Categories;
+import io.fixprotocol._2024.orchestra.repository.CategoryType;
+import io.fixprotocol._2024.orchestra.repository.CodeSetType;
+import io.fixprotocol._2024.orchestra.repository.CodeSets;
+import io.fixprotocol._2024.orchestra.repository.ComponentRefType;
+import io.fixprotocol._2024.orchestra.repository.ComponentType;
+import io.fixprotocol._2024.orchestra.repository.Components;
+import io.fixprotocol._2024.orchestra.repository.Datatypes;
+import io.fixprotocol._2024.orchestra.repository.FieldRefType;
+import io.fixprotocol._2024.orchestra.repository.FieldType;
+import io.fixprotocol._2024.orchestra.repository.Fields;
+import io.fixprotocol._2024.orchestra.repository.GroupRefType;
+import io.fixprotocol._2024.orchestra.repository.GroupType;
+import io.fixprotocol._2024.orchestra.repository.Groups;
+import io.fixprotocol._2024.orchestra.repository.MessageType;
+import io.fixprotocol._2024.orchestra.repository.Messages;
+import io.fixprotocol._2024.orchestra.repository.Repository;
+import io.fixprotocol._2024.orchestra.repository.Sections;
 
 /**
  * Selectively compresses an Orchestra file <br>
@@ -362,7 +362,7 @@ public boolean compress() {
     } catch (IOException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
-      
+
       return false;
     }
   }

diff --git a/repository-util/src/test/resources/OrchestraFIXLatest.xml b/repository-util/src/test/resources/OrchestraFIXLatest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fixr:repository xmlns:dc="http://purl.org/dc/elements/1.1/"
-                 xmlns:fixr="http://fixprotocol.io/2023/orchestra/repository"
+                 xmlns:fixr="http://fixprotocol.io/2024/orchestra/repository"
                  xmlns:functx="http://www.functx.com"
                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
                  name="FIX.Latest"

diff --git a/repository/src/main/java/module-info.java b/repository/src/main/java/module-info.java
@@ -1,11 +1,11 @@
 module orchestra.repository {
   requires transitive java.xml.bind;
   requires transitive jaxb2.basics.runtime;
-  
-  exports io.fixprotocol._2023.orchestra.repository;
-  opens io.fixprotocol._2023.orchestra.repository;
+
+  exports io.fixprotocol._2024.orchestra.repository;
+  opens io.fixprotocol._2024.orchestra.repository;
   exports org.purl.dc.elements._1;
   opens org.purl.dc.elements._1;
   exports org.purl.dc.terms;
   opens org.purl.dc.terms;
-}
+}
diff --git a/repository/src/main/resources/xsd/repository.xsd b/repository/src/main/resources/xsd/repository.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixr="http://fixprotocol.io/2023/orchestra/repository" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2023/orchestra/repository" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1-rc1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixr="http://fixprotocol.io/2024/orchestra/repository" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2024/orchestra/repository" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1-rc2">
 	<xs:annotation>
 		<xs:documentation>
 			FIX Repository standard structure of messages with workflow
-			© Copyright 2016-2023 FIX Protocol Limited
+			© Copyright 2016-2024 FIX Protocol Limited
 			Creative Commons Attribution-NoDerivatives 4.0
 			International Public License
 		</xs:documentation>
@@ -108,27 +108,6 @@
 			<xs:field xpath="@name"/>
 		</xs:key>
 	</xs:element>
-	<xs:element name="datatype">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="mappedDatatype" type="fixr:mappedDatatype" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="annotation" type="fixr:annotation" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="fixr:Name_t" use="required"/>
-			<xs:attribute name="scenario" type="fixr:Name_t" default="base">
-				<xs:annotation>
-					<xs:documentation>The use case of a datatype by name</xs:documentation>
-				</xs:annotation>
-			</xs:attribute>
-			<xs:attribute name="scenarioId" type="fixr:id_t" default="1">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of a scenario. Default is '1' for base scenario.</xs:documentation>
-				</xs:annotation>
-			</xs:attribute>
-			<xs:attribute name="baseType" type="fixr:Name_t"/>
-			<xs:attributeGroup ref="fixr:entityAttribGrp"/>
-		</xs:complexType>
-	</xs:element>
 	<xs:element name="datatypes">
 		<xs:complexType>
 			<xs:sequence>
@@ -247,7 +226,6 @@
 					<xs:documentation>An associated namespace as URI</xs:documentation>
 				</xs:annotation>
 			</xs:attribute>
-			<xs:attribute name="applVerId" type="xs:string"/>
 			<xs:attribute name="expressionLanguage" type="xs:string" default="Score">
 				<xs:annotation>
 					<xs:documentation>The syntax of 'expressionType'</xs:documentation>