Merge pull request #222 from patricklucas/221_update_xsd_uris

[#221] Update XSD namespace URIs
FIXTradingCommunity · Sep 6, 2024 · b05e6da · b05e6da
2 parents 82a80a1 + 5426ca0
commit b05e6da
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 66 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
@@ -2,8 +2,8 @@
   requires transitive java.xml.bind;
   requires transitive jaxb2.basics.runtime;
 
-  exports io.fixprotocol._2022.orchestra.interfaces;
-  opens io.fixprotocol._2022.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;

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-rc1">
 	<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._2022.orchestra.repository.CodeSetType;
-import io.fixprotocol._2022.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._2022.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._2022.orchestra.repository.MessageType;
+import io.fixprotocol._2024.orchestra.repository.MessageType;
 
 /**
  * Validate a message against an Orchestra file

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._2022.orchestra.repository.ActorType;
-import io.fixprotocol._2022.orchestra.repository.Actors;
-import io.fixprotocol._2022.orchestra.repository.CatComponentTypeT;
-import io.fixprotocol._2022.orchestra.repository.Categories;
-import io.fixprotocol._2022.orchestra.repository.CategoryType;
-import io.fixprotocol._2022.orchestra.repository.CodeSetType;
-import io.fixprotocol._2022.orchestra.repository.CodeType;
-import io.fixprotocol._2022.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2022.orchestra.repository.ComponentType;
-import io.fixprotocol._2022.orchestra.repository.Datatype;
-import io.fixprotocol._2022.orchestra.repository.FieldRefType;
-import io.fixprotocol._2022.orchestra.repository.FieldRuleType;
-import io.fixprotocol._2022.orchestra.repository.FieldType;
-import io.fixprotocol._2022.orchestra.repository.FlowType;
-import io.fixprotocol._2022.orchestra.repository.GroupRefType;
-import io.fixprotocol._2022.orchestra.repository.GroupType;
-import io.fixprotocol._2022.orchestra.repository.MessageRefType;
-import io.fixprotocol._2022.orchestra.repository.MessageType;
-import io.fixprotocol._2022.orchestra.repository.MessageType.Responses;
-import io.fixprotocol._2022.orchestra.repository.PresenceT;
-import io.fixprotocol._2022.orchestra.repository.Repository;
-import io.fixprotocol._2022.orchestra.repository.ResponseType;
-import io.fixprotocol._2022.orchestra.repository.StateMachineType;
-import io.fixprotocol._2022.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

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._2022.orchestra.repository.FlowType;
-import io.fixprotocol._2022.orchestra.repository.MessageRefType;
-import io.fixprotocol._2022.orchestra.repository.MessageType;
-import io.fixprotocol._2022.orchestra.repository.ResponseType;
-import io.fixprotocol._2022.orchestra.repository.StateMachineType;
-import io.fixprotocol._2022.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._2022.orchestra.repository.Actors;
-import io.fixprotocol._2022.orchestra.repository.Categories;
-import io.fixprotocol._2022.orchestra.repository.CategoryType;
-import io.fixprotocol._2022.orchestra.repository.CodeSetType;
-import io.fixprotocol._2022.orchestra.repository.CodeSets;
-import io.fixprotocol._2022.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2022.orchestra.repository.ComponentType;
-import io.fixprotocol._2022.orchestra.repository.Components;
-import io.fixprotocol._2022.orchestra.repository.Datatypes;
-import io.fixprotocol._2022.orchestra.repository.FieldRefType;
-import io.fixprotocol._2022.orchestra.repository.FieldType;
-import io.fixprotocol._2022.orchestra.repository.Fields;
-import io.fixprotocol._2022.orchestra.repository.GroupRefType;
-import io.fixprotocol._2022.orchestra.repository.GroupType;
-import io.fixprotocol._2022.orchestra.repository.Groups;
-import io.fixprotocol._2022.orchestra.repository.MessageType;
-import io.fixprotocol._2022.orchestra.repository.Messages;
-import io.fixprotocol._2022.orchestra.repository.Repository;
-import io.fixprotocol._2022.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>

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/2022/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
@@ -2,8 +2,8 @@
   requires transitive java.xml.bind;
   requires transitive jaxb2.basics.runtime;
 
-  exports io.fixprotocol._2022.orchestra.repository;
-  opens io.fixprotocol._2022.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;

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-rc1">
 	<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>

diff --git a/repository/src/main/resources/xsd/repositorytypes.xsd b/repository/src/main/resources/xsd/repositorytypes.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fixr="http://fixprotocol.io/2023/orchestra/repository" 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fixr="http://fixprotocol.io/2024/orchestra/repository" targetNamespace="http://fixprotocol.io/2024/orchestra/repository" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1-rc1">
 	<xs:annotation>
 		<xs:documentation>
-			© Copyright 2016-2023 FIX Protocol Limited Creative
+			© Copyright 2016-2024 FIX Protocol Limited Creative
 			Commons Attribution-NoDerivatives 4.0
 			International Public License
 		</xs:documentation>