Merge pull request #85 from donmendelson/issue82

#82 Update XML namespace
FIXTradingCommunity · Feb 4, 2020 · dbb1a4d · dbb1a4d
2 parents 084a809 + 6e7655f
commit dbb1a4d
Show file tree

Hide file tree

Showing 71 changed files with 350 additions and 217 deletions.
diff --git a/docgen/pom.xml b/docgen/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.fixprotocol.orchestra</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.4.1-RC5-SNAPSHOT</version>
+		<version>1.4.2-RC5-SNAPSHOT</version>
 	</parent>
 	<artifactId>docgen</artifactId>
 	<description>Generates humanly readable documentation</description>
@@ -13,7 +13,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>io.fixprotocol.orchestra</groupId>
-			<artifactId>repository2016</artifactId>
+			<artifactId>repository</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

diff --git a/docgen/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java b/docgen/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 FIX Protocol Ltd
+ * Copyright 2017-2020 FIX Protocol Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -45,30 +45,30 @@
 import org.stringtemplate.v4.STWriter;
 import org.stringtemplate.v4.misc.STMessage;
 
-import io.fixprotocol._2016.fixrepository.ActorType;
-import io.fixprotocol._2016.fixrepository.Actors;
-import io.fixprotocol._2016.fixrepository.CatComponentTypeT;
-import io.fixprotocol._2016.fixrepository.Categories;
-import io.fixprotocol._2016.fixrepository.CategoryType;
-import io.fixprotocol._2016.fixrepository.CodeSetType;
-import io.fixprotocol._2016.fixrepository.CodeType;
-import io.fixprotocol._2016.fixrepository.ComponentRefType;
-import io.fixprotocol._2016.fixrepository.ComponentType;
-import io.fixprotocol._2016.fixrepository.Datatype;
-import io.fixprotocol._2016.fixrepository.FieldRefType;
-import io.fixprotocol._2016.fixrepository.FieldRuleType;
-import io.fixprotocol._2016.fixrepository.FieldType;
-import io.fixprotocol._2016.fixrepository.FlowType;
-import io.fixprotocol._2016.fixrepository.GroupRefType;
-import io.fixprotocol._2016.fixrepository.GroupType;
-import io.fixprotocol._2016.fixrepository.MessageRefType;
-import io.fixprotocol._2016.fixrepository.MessageType;
-import io.fixprotocol._2016.fixrepository.MessageType.Responses;
-import io.fixprotocol._2016.fixrepository.PresenceT;
-import io.fixprotocol._2016.fixrepository.Repository;
-import io.fixprotocol._2016.fixrepository.ResponseType;
-import io.fixprotocol._2016.fixrepository.StateMachineType;
-import io.fixprotocol._2016.fixrepository.SupportType;
+import io.fixprotocol._2020.orchestra.repository.ActorType;
+import io.fixprotocol._2020.orchestra.repository.Actors;
+import io.fixprotocol._2020.orchestra.repository.CatComponentTypeT;
+import io.fixprotocol._2020.orchestra.repository.Categories;
+import io.fixprotocol._2020.orchestra.repository.CategoryType;
+import io.fixprotocol._2020.orchestra.repository.CodeSetType;
+import io.fixprotocol._2020.orchestra.repository.CodeType;
+import io.fixprotocol._2020.orchestra.repository.ComponentRefType;
+import io.fixprotocol._2020.orchestra.repository.ComponentType;
+import io.fixprotocol._2020.orchestra.repository.Datatype;
+import io.fixprotocol._2020.orchestra.repository.FieldRefType;
+import io.fixprotocol._2020.orchestra.repository.FieldRuleType;
+import io.fixprotocol._2020.orchestra.repository.FieldType;
+import io.fixprotocol._2020.orchestra.repository.FlowType;
+import io.fixprotocol._2020.orchestra.repository.GroupRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupType;
+import io.fixprotocol._2020.orchestra.repository.MessageRefType;
+import io.fixprotocol._2020.orchestra.repository.MessageType;
+import io.fixprotocol._2020.orchestra.repository.MessageType.Responses;
+import io.fixprotocol._2020.orchestra.repository.PresenceT;
+import io.fixprotocol._2020.orchestra.repository.Repository;
+import io.fixprotocol._2020.orchestra.repository.ResponseType;
+import io.fixprotocol._2020.orchestra.repository.StateMachineType;
+import io.fixprotocol._2020.orchestra.repository.SupportType;
 
 /**
  * @author Don Mendelson

diff --git a/docgen/src/main/java/io/fixprotocol/orchestra/docgen/ImgGenerator.java b/docgen/src/main/java/io/fixprotocol/orchestra/docgen/ImgGenerator.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright 2017-2020 FIX Protocol Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
 package io.fixprotocol.orchestra.docgen;
 
 import java.io.IOException;
@@ -12,12 +26,12 @@
 import org.stringtemplate.v4.STGroupFile;
 import org.stringtemplate.v4.STWriter;
 
-import io.fixprotocol._2016.fixrepository.FlowType;
-import io.fixprotocol._2016.fixrepository.MessageRefType;
-import io.fixprotocol._2016.fixrepository.MessageType;
-import io.fixprotocol._2016.fixrepository.ResponseType;
-import io.fixprotocol._2016.fixrepository.StateMachineType;
-import io.fixprotocol._2016.fixrepository.Synchronization;
+import io.fixprotocol._2020.orchestra.repository.FlowType;
+import io.fixprotocol._2020.orchestra.repository.MessageRefType;
+import io.fixprotocol._2020.orchestra.repository.MessageType;
+import io.fixprotocol._2020.orchestra.repository.ResponseType;
+import io.fixprotocol._2020.orchestra.repository.StateMachineType;
+import io.fixprotocol._2020.orchestra.repository.Synchronization;
 import net.sourceforge.plantuml.SourceStringReader;
 
 public class ImgGenerator {

diff --git a/docgen/src/test/resources/mit_2016.xml b/docgen/src/test/resources/mit_2016.xml
diff --git a/dsl-antlr/pom.xml b/dsl-antlr/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>io.fixprotocol.orchestra</groupId>
-		<version>1.4.1-RC5-SNAPSHOT</version>
+		<version>1.4.2-RC5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dsl-antlr</artifactId>

diff --git a/dsl-antlr/src/test/java/io/fixprotocol/orchestra/dsl/antlr/ScoreTranslatorTest.java b/dsl-antlr/src/test/java/io/fixprotocol/orchestra/dsl/antlr/ScoreTranslatorTest.java
@@ -92,7 +92,7 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int
     ScoreTranslator visitor = new ScoreTranslator();
     AnyExpressionContext ctx = p.anyExpression();
     String text = visitor.visitAnyExpression(ctx);
-    System.out.println(text);
+    //System.out.println(text);
   }
 
 }
diff --git a/interfaces2016/README.md → interfaces/README.md b/interfaces2016/README.md → interfaces/README.md
@@ -1,9 +1,10 @@
-# Module interfaces2016
-This module provides an XML schema for service offerings, protocols and session provisioning. Service elements may link to Orchestra files composed in the `repository2016` schema.
+# Module interfaces
+
+This module provides an XML schema for service offerings, protocols and session provisioning. Service elements may link to Orchestra files composed in the `repository` schema.
 
 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/2016/fixinterfaces`.
+The XML namespace for the schema is `http://fixprotocol.io/2020/orchestra/interfaces`.
 
 ## Build
 
@@ -12,7 +13,7 @@ In addition to providing the XML schema as a resource, this module builds Java b
 ```xml
 <dependency>
   <groupId>io.fixprotocol.orchestra</groupId>
-  <artifactId>interfaces2016</artifactId>
+  <artifactId>interfaces</artifactId>
   <version>1.4.0-RC5</version>
 </dependency>
 ```
diff --git a/interfaces2016/pom.xml → interfaces/pom.xml b/interfaces2016/pom.xml → interfaces/pom.xml
@@ -4,9 +4,9 @@
 	<parent>
 		<groupId>io.fixprotocol.orchestra</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.4.1-RC5-SNAPSHOT</version>
+		<version>1.4.2-RC5-SNAPSHOT</version>
 	</parent>
-	<artifactId>interfaces2016</artifactId>
+	<artifactId>interfaces</artifactId>
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>XML schema for FIX Orchestra session configuration</description>
 

diff --git a/interfaces2016/src/main/resources/xsd/dc.xsd → interfaces/src/main/resources/xsd/dc.xsd b/interfaces2016/src/main/resources/xsd/dc.xsd → interfaces/src/main/resources/xsd/dc.xsd
diff --git a/...s2016/src/main/resources/xsd/dcmitype.xsd → ...faces/src/main/resources/xsd/dcmitype.xsd b/...s2016/src/main/resources/xsd/dcmitype.xsd → ...faces/src/main/resources/xsd/dcmitype.xsd
diff --git a/...es2016/src/main/resources/xsd/dcterms.xsd → ...rfaces/src/main/resources/xsd/dcterms.xsd b/...es2016/src/main/resources/xsd/dcterms.xsd → ...rfaces/src/main/resources/xsd/dcterms.xsd
diff --git a/.../src/main/resources/xsd/FixInterfaces.xsd → ...ces/src/main/resources/xsd/interfaces.xsd b/.../src/main/resources/xsd/FixInterfaces.xsd → ...ces/src/main/resources/xsd/interfaces.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2017 rel. 3 (x64) (http://www.altova.com) by Don Mendelson (FIX Protocol Ltd. (FPL)) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixi="http://fixprotocol.io/2016/fixinterfaces" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2016/fixinterfaces" elementFormDefault="qualified" version="1.0-rc5">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixi="http://fixprotocol.io/2020/orchestra/interfaces" xmlns:dcterms="http://purl.org/dc/terms/" 
+targetNamespace="http://fixprotocol.io/2020/orchestra/interfaces" elementFormDefault="qualified" version="1.0-rc5">
 	<xs:annotation>
 		<xs:documentation>
 			FIX interface configuration
-			© Copyright 2016-2019 FIX Protocol Limited
+			© Copyright 2016-2020 FIX Protocol Limited
 			Creative Commons Attribution-NoDerivatives 4.0
 			International Public License
 		</xs:documentation>

diff --git a/...6/src/test/resources/examples/Examples.md → ...s/src/test/resources/examples/Examples.md b/...6/src/test/resources/examples/Examples.md → ...s/src/test/resources/examples/Examples.md
diff --git a/...t/resources/examples/SampleInterfaces.xml → ...t/resources/examples/SampleInterfaces.xml b/...t/resources/examples/SampleInterfaces.xml → ...t/resources/examples/SampleInterfaces.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fixi:interfaces xmlns:dcterms="http://purl.org/dc/terms/" xmlns:fixi="http://fixprotocol.io/2016/fixinterfaces" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://fixprotocol.io/2016/fixinterfaces ../../../main/resources/xsd/FixInterfaces.xsd">
+<fixi:interfaces xmlns:dcterms="http://purl.org/dc/terms/" xmlns:fixi="http://fixprotocol.io/2020/orchestra/interfaces" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://fixprotocol.io/2020/orchestra/interfaces ../../../main/resources/xsd/interfaces.xsd">
 	<fixi:metadata>
 		<dcterms:subject>Service offerings and sessions example file</dcterms:subject>
 		<dcterms:date>2019-08-07T09:30:00Z</dcterms:date>

diff --git a/message-model/pom.xml b/message-model/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.fixprotocol.orchestra</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.4.1-RC5-SNAPSHOT</version>
+		<version>1.4.2-RC5-SNAPSHOT</version>
 	</parent>
 	<artifactId>message-model</artifactId>
 	<name>${project.groupId}:${project.artifactId}</name>
@@ -14,7 +14,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>io.fixprotocol.orchestra</groupId>
-			<artifactId>repository2016</artifactId>
+			<artifactId>repository</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 FIX Protocol Ltd
+ * Copyright 2017-2020 FIX Protocol Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -16,8 +16,8 @@
 
 import java.util.List;
 
-import io.fixprotocol._2016.fixrepository.CodeSetType;
-import io.fixprotocol._2016.fixrepository.CodeType;
+import io.fixprotocol._2020.orchestra.repository.CodeSetType;
+import io.fixprotocol._2020.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
@@ -1,6 +1,20 @@
+/*
+ * Copyright 2017-2020 FIX Protocol Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
 package io.fixprotocol.orchestra.message;
 
-import io.fixprotocol._2016.fixrepository.MessageType;
+import io.fixprotocol._2020.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
@@ -1,6 +1,20 @@
+/*
+ * Copyright 2017-2020 FIX Protocol Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
 package io.fixprotocol.orchestra.message;
 
-import io.fixprotocol._2016.fixrepository.MessageType;
+import io.fixprotocol._2020.orchestra.repository.MessageType;
 
 /**
  * Validate a message against an Orchestra file

diff --git a/model-quickfix/pom.xml b/model-quickfix/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.fixprotocol.orchestra</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.4.1-RC5-SNAPSHOT</version>
+		<version>1.4.2-RC5-SNAPSHOT</version>
 	</parent>
 	<artifactId>model-quickfix</artifactId>
 	<description>Message validation</description>

diff --git a/...-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/AbstractMessageScope.java b/...-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/AbstractMessageScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 FIX Protocol Ltd
+ * Copyright 2017-2020 FIX Protocol Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -22,10 +22,10 @@
 import java.time.LocalTime;
 import java.util.List;
 
-import io.fixprotocol._2016.fixrepository.CodeSetType;
-import io.fixprotocol._2016.fixrepository.FieldRefType;
-import io.fixprotocol._2016.fixrepository.GroupRefType;
-import io.fixprotocol._2016.fixrepository.GroupType;
+import io.fixprotocol._2020.orchestra.repository.CodeSetType;
+import io.fixprotocol._2020.orchestra.repository.FieldRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupType;
 import io.fixprotocol.orchestra.dsl.antlr.Evaluator;
 import io.fixprotocol.orchestra.dsl.antlr.ScoreException;
 import io.fixprotocol.orchestra.message.CodeSetScope;

diff --git a/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/GroupInstanceScope.java b/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/GroupInstanceScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 FIX Protocol Ltd
+ * Copyright 2017-2020 FIX Protocol Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -16,9 +16,9 @@
 
 import java.util.List;
 
-import io.fixprotocol._2016.fixrepository.FieldRefType;
-import io.fixprotocol._2016.fixrepository.GroupRefType;
-import io.fixprotocol._2016.fixrepository.GroupType;
+import io.fixprotocol._2020.orchestra.repository.FieldRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupType;
 
 import io.fixprotocol.orchestra.dsl.antlr.Evaluator;
 

diff --git a/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/MessageScope.java b/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/MessageScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 FIX Protocol Ltd
+ * Copyright 2017-2020 FIX Protocol Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -16,10 +16,10 @@
 
 import java.util.List;
 
-import io.fixprotocol._2016.fixrepository.FieldRefType;
-import io.fixprotocol._2016.fixrepository.GroupRefType;
-import io.fixprotocol._2016.fixrepository.GroupType;
-import io.fixprotocol._2016.fixrepository.MessageType;
+import io.fixprotocol._2020.orchestra.repository.FieldRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupType;
+import io.fixprotocol._2020.orchestra.repository.MessageType;
 import io.fixprotocol.orchestra.dsl.antlr.Evaluator;
 import io.fixprotocol.orchestra.model.FixNode;
 import io.fixprotocol.orchestra.model.FixValue;

diff --git a/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/QuickfixPopulator.java b/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/QuickfixPopulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 FIX Protocol Ltd
+ * Copyright 2017-2020 FIX Protocol Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -17,13 +17,13 @@
 import java.util.List;
 import java.util.function.Function;
 
-import io.fixprotocol._2016.fixrepository.BlockAssignmentType;
-import io.fixprotocol._2016.fixrepository.CodeSetType;
-import io.fixprotocol._2016.fixrepository.ComponentRefType;
-import io.fixprotocol._2016.fixrepository.FieldRefType;
-import io.fixprotocol._2016.fixrepository.GroupRefType;
-import io.fixprotocol._2016.fixrepository.GroupType;
-import io.fixprotocol._2016.fixrepository.MessageType;
+import io.fixprotocol._2020.orchestra.repository.BlockAssignmentType;
+import io.fixprotocol._2020.orchestra.repository.CodeSetType;
+import io.fixprotocol._2020.orchestra.repository.ComponentRefType;
+import io.fixprotocol._2020.orchestra.repository.FieldRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupRefType;
+import io.fixprotocol._2020.orchestra.repository.GroupType;
+import io.fixprotocol._2020.orchestra.repository.MessageType;
 import io.fixprotocol.orchestra.dsl.antlr.Evaluator;
 import io.fixprotocol.orchestra.dsl.antlr.ScoreException;
 import io.fixprotocol.orchestra.message.CodeSetScope;