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

[#221] Update XSD namespace URIs #222

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[#221] Update XSD namespace URIs #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[#221] Update XSD namespace URIs 
Replace '2023' with '2024' in XSD namespace URIs.
  • Loading branch information
@patricklucas
patricklucas committed Aug 28, 2024
commit 5426ca04aa7a1a52390e7423cd34f7ffeb653bf0
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

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._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;
Expand Down
4 changes: 2 additions & 2 deletions interfaces/src/main/resources/xsd/interfaces.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions message-model/src/main/java/io/fixprotocol/orchestra/message/CodeSetScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion message-model/src/main/java/io/fixprotocol/orchestra/message/Populator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion message-model/src/main/java/io/fixprotocol/orchestra/message/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 24 additions & 24 deletions orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/ImgGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion orchestra2doc/src/test/resources/mit_2016.xml
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions ...sitory-util/src/main/java/io/fixprotocol/orchestra/transformers/RepositoryCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion repository-util/src/test/resources/OrchestraFIXLatest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions repository/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._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;
Expand Down
4 changes: 2 additions & 2 deletions repository/src/main/resources/xsd/repository.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions repository/src/main/resources/xsd/repositorytypes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading