Skip to content

Commit aa69002

Browse files
update to use new version of quickfifj-orchestra and add an example of a Field extending UTCDateOnly to the xsl for minimal-fix-latest
1 parent d6d7208 commit aa69002

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ target/
1212
# ignore NetBeans configuration
1313
nb-configuration.xml
1414
*.bak
15+
.mvn/
16+
mvn*

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<commons.io.version>2.11.0</commons.io.version>
106106
<guava.version>32.0.0-jre</guava.version>
107107
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
108-
<org.quickfixj.orchestra.tools.version>1.0.1</org.quickfixj.orchestra.tools.version>
108+
<org.quickfixj.orchestra.tools.version>1.0.2</org.quickfixj.orchestra.tools.version>
109109
<proxool.version>0.9.1</proxool.version>
110110
<jaxen.version>2.0.0</jaxen.version>
111111
</properties>

quickfixj-messages/quickfixj-messages-all/src/main/xsl/minimiseOrchestra.xsl

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</xsl:template>
1616

1717
<!-- filter out fields that are not used in QFJ tests -->
18+
<!-- Field 1492 ComplexEventStartDate is included to prove successful compilation of a field extending UTCDateOnly -->
1819
<xsl:template
1920
match="fixr:fields/fixr:field[not(
2021
@id = '6' or
@@ -124,6 +125,10 @@
124125
@id = '1402' or
125126
@id = '1403' or
126127
@id = '1404' or
128+
@id = '1483' or
129+
@id = '1484' or
130+
@id = '1491' or
131+
@id = '1492' or
127132
@id = '1779' or
128133
@id = '321007')]"/>
129134

@@ -143,7 +148,9 @@
143148
@id = '2045' or
144149
@id = '2046' or
145150
@id = '2059' or
146-
@id = '2085')]"/>
151+
@id = '2085' or
152+
@id = '2145' or
153+
@id = '2146' )]"/>
147154

148155
<!-- filter out messages that are not used in QFJ tests -->
149156
<xsl:template
@@ -184,7 +191,7 @@
184191
<xsl:template
185192
match="fixr:components/fixr:component[(@id='1003')]/fixr:componentRef" />
186193
<xsl:template
187-
match="fixr:components/fixr:component[(@id='1003')]/fixr:groupRef" />
194+
match="fixr:components/fixr:component[(@id='1003')]/fixr:groupRef[not(@id='2145')]" />
188195

189196
<!-- InstrumentLeg -->
190197
<xsl:template
@@ -261,7 +268,23 @@
261268
match="fixr:groups/fixr:group[(@id='2059')]/fixr:fieldRef[not(@id='54' or
262269
@id='11')]" />
263270

264-
<!-- HopGrp 2085 ______________ -->
271+
<!-- Complex Events -->
272+
<xsl:template
273+
match="fixr:groups/fixr:group[(@id='2145')]/fixr:componentRef" />
274+
<xsl:template
275+
match="fixr:groups/fixr:group[(@id='2145')]/fixr:fieldRef[not(@id='1484')]" />
276+
<xsl:template
277+
match="fixr:groups/fixr:group[(@id='2145')]/fixr:groupRef[not(@id='2146')]" />
278+
279+
<!-- Complex Event Dates -->
280+
<xsl:template
281+
match="fixr:groups/fixr:group[(@id='2146')]/fixr:componentRef" />
282+
<xsl:template
283+
match="fixr:groups/fixr:group[(@id='2146')]/fixr:groupRef" />
284+
<xsl:template
285+
match="fixr:groups/fixr:group[(@id='2146')]/fixr:fieldRef[not(@id='1492')]" />
286+
287+
<!-- HopGrp 2085 ______________ -->
265288
<!-- include everything -->
266289

267290
<!-- ******************************** -->

0 commit comments

Comments
 (0)