Skip to content

Commit 5b42345

Browse files
chrjohnchrjohn
committed
Merge pull request #24 from manureno/QFJ-845
QFJ-845
2 parents f4c1794 + cbcae52 commit 5b42345

File tree

22 files changed

+412
-171
lines changed

22 files changed

+412
-171
lines changed

‎pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@
5555
<plugin>
5656
<artifactId>maven-compiler-plugin</artifactId>
5757
<version>3.3</version>
58-
<configuration>
59-
<meminitial>128m</meminitial>
60-
<maxmem>512m</maxmem>
61-
<source>${jdkLevel}</source>
62-
<target>${jdkLevel}</target>
63-
</configuration>
58+
<configuration>
59+
<source>${jdkLevel}</source>
60+
<target>${jdkLevel}</target>
61+
</configuration>
62+
6463
</plugin>
6564
<plugin>
6665
<artifactId>maven-jar-plugin</artifactId>

‎quickfixj-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<goal>generate</goal>
178178
</goals>
179179
<configuration>
180-
<dictFile>../quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.xml</dictFile>
180+
<dictFile>../quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
181181
<packaging>quickfix.fix44</packaging>
182182
<fieldPackage>quickfix.field</fieldPackage>
183183
<decimal>${generator.decimal}</decimal>

‎quickfixj-core/src/test/java/quickfix/MessageTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import quickfix.field.HandlInst;
5959
import quickfix.field.Headline;
6060
import quickfix.field.HopCompID;
61-
import quickfix.field.IOIid;
61+
import quickfix.field.IOIID;
6262
import quickfix.field.LeavesQty;
6363
import quickfix.field.ListID;
6464
import quickfix.field.ListSeqNo;
@@ -285,7 +285,7 @@ public void testParsing2() throws Exception {
285285
assertHeaderField(message, "FIX.4.2", BeginString.FIELD);
286286
assertHeaderField(message, "76", BodyLength.FIELD);
287287
assertHeaderField(message, MsgType.INDICATION_OF_INTEREST, MsgType.FIELD);
288-
assertBodyField(message, "IDENTIFIER", IOIid.FIELD);
288+
assertBodyField(message, "IDENTIFIER", IOIID.FIELD);
289289
assertTrailerField(message, "037", CheckSum.FIELD);
290290
final IndicationOfInterest.NoUnderlyings valueMessageType = new IndicationOfInterest.NoUnderlyings();
291291
message.getGroup(1, valueMessageType);

‎quickfixj-messages/pom.xml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,6 @@
3838
<build>
3939
<pluginManagement>
4040
<plugins>
41-
<plugin>
42-
<groupId>org.quickfixj</groupId>
43-
<artifactId>quickfixj-codegenerator</artifactId>
44-
<version>${project.version}</version>
45-
<executions>
46-
<execution>
47-
<id>${fix.name}</id>
48-
<goals>
49-
<goal>generate</goal>
50-
</goals>
51-
<configuration>
52-
<dictFile>src/main/resources/${fix.spec}</dictFile>
53-
<packaging>quickfix.${fix.name}</packaging>
54-
<fieldPackage>quickfix.field</fieldPackage>
55-
<decimal>${generator.decimal}</decimal>
56-
</configuration>
57-
</execution>
58-
</executions>
59-
</plugin>
6041
<plugin>
6142
<groupId>org.apache.felix</groupId>
6243
<artifactId>maven-bundle-plugin</artifactId>

‎quickfixj-messages/quickfixj-messages-all/pom.xml‎

Lines changed: 163 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,172 @@
1515
<url>http://www.quickfixj.org</url>
1616

1717
<dependencies>
18-
<!--
19-
Note: dependency order matters - if a file appears in more than
20-
one dependency, the shade plugin will use the first one encountered
21-
-->
2218
<dependency>
23-
<groupId>org.quickfixj</groupId>
24-
<artifactId>quickfixj-messages-fixt11</artifactId>
25-
<version>${project.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.quickfixj</groupId>
29-
<artifactId>quickfixj-messages-fix50</artifactId>
30-
<version>${project.version}</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.quickfixj</groupId>
34-
<artifactId>quickfixj-messages-fix44</artifactId>
35-
<version>${project.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.quickfixj</groupId>
39-
<artifactId>quickfixj-messages-fix43</artifactId>
40-
<version>${project.version}</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.quickfixj</groupId>
44-
<artifactId>quickfixj-messages-fix42</artifactId>
45-
<version>${project.version}</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.quickfixj</groupId>
49-
<artifactId>quickfixj-messages-fix41</artifactId>
50-
<version>${project.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.quickfixj</groupId>
54-
<artifactId>quickfixj-messages-fix40</artifactId>
55-
<version>${project.version}</version>
56-
</dependency>
57-
58-
<!--
59-
We add these at the end to remain backwards-compatible with previous
60-
releases of the messages-all jar, in which duplicate classes were
61-
resolved by using the 5.0 version.
62-
-->
63-
<dependency>
64-
<groupId>org.quickfixj</groupId>
65-
<artifactId>quickfixj-messages-fix50sp2</artifactId>
66-
<version>${project.version}</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.quickfixj</groupId>
70-
<artifactId>quickfixj-messages-fix50sp1</artifactId>
71-
<version>${project.version}</version>
19+
<groupId>junit</groupId>
20+
<artifactId>junit</artifactId>
21+
<version>4.10</version>
22+
<scope>test</scope>
7223
</dependency>
7324
</dependencies>
7425

7526
<build>
27+
<resources>
28+
<resource>
29+
<directory>../quickfixj-messages-fixt11/src/main/resources</directory>
30+
</resource>
31+
<resource>
32+
<directory>../quickfixj-messages-fix50/src/main/resources</directory>
33+
</resource>
34+
<resource>
35+
<directory>../quickfixj-messages-fix44/src/main/resources</directory>
36+
</resource>
37+
<resource>
38+
<directory>../quickfixj-messages-fix43/src/main/resources</directory>
39+
</resource>
40+
<resource>
41+
<directory>../quickfixj-messages-fix42/src/main/resources</directory>
42+
</resource>
43+
<resource>
44+
<directory>../quickfixj-messages-fix41/src/main/resources</directory>
45+
</resource>
46+
<resource>
47+
<directory>../quickfixj-messages-fix40/src/main/resources</directory>
48+
</resource>
49+
<resource>
50+
<directory>../quickfixj-messages-fix50sp1/src/main/resources</directory>
51+
</resource>
52+
<resource>
53+
<directory>../quickfixj-messages-fix50sp2/src/main/resources</directory>
54+
</resource>
55+
</resources>
56+
7657
<plugins>
58+
<plugin>
59+
<groupId>org.quickfixj</groupId>
60+
<artifactId>quickfixj-codegenerator</artifactId>
61+
<version>${project.version}</version>
62+
<executions>
63+
<execution>
64+
<id>fixt11</id>
65+
<goals>
66+
<goal>generate</goal>
67+
</goals>
68+
<configuration>
69+
<dictFile>../quickfixj-messages-fixt11/src/main/resources/FIXT11.xml</dictFile>
70+
<packaging>quickfix.fixt11</packaging>
71+
<fieldPackage>quickfix.field</fieldPackage>
72+
<decimal>${generator.decimal}</decimal>
73+
</configuration>
74+
</execution>
75+
<execution>
76+
<id>fix50</id>
77+
<goals>
78+
<goal>generate</goal>
79+
</goals>
80+
<configuration>
81+
<dictFile>../quickfixj-messages-fix50/src/main/resources/FIX50.xml</dictFile>
82+
<packaging>quickfix.fix50</packaging>
83+
<fieldPackage>quickfix.field</fieldPackage>
84+
<decimal>${generator.decimal}</decimal>
85+
</configuration>
86+
</execution>
87+
<execution>
88+
<id>fix44</id>
89+
<goals>
90+
<goal>generate</goal>
91+
</goals>
92+
<configuration>
93+
<dictFile>../quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
94+
<packaging>quickfix.fix44</packaging>
95+
<fieldPackage>quickfix.field</fieldPackage>
96+
<decimal>${generator.decimal}</decimal>
97+
</configuration>
98+
</execution>
99+
<execution>
100+
<id>fix43</id>
101+
<goals>
102+
<goal>generate</goal>
103+
</goals>
104+
<configuration>
105+
<dictFile>../quickfixj-messages-fix43/src/main/resources/FIX43.xml</dictFile>
106+
<packaging>quickfix.fix43</packaging>
107+
<fieldPackage>quickfix.field</fieldPackage>
108+
<decimal>${generator.decimal}</decimal>
109+
</configuration>
110+
</execution>
111+
<execution>
112+
<id>fix42</id>
113+
<goals>
114+
<goal>generate</goal>
115+
</goals>
116+
<configuration>
117+
<dictFile>../quickfixj-messages-fix42/src/main/resources/FIX42.xml</dictFile>
118+
<packaging>quickfix.fix42</packaging>
119+
<fieldPackage>quickfix.field</fieldPackage>
120+
<decimal>${generator.decimal}</decimal>
121+
</configuration>
122+
</execution>
123+
<execution>
124+
<id>fix41</id>
125+
<goals>
126+
<goal>generate</goal>
127+
</goals>
128+
<configuration>
129+
<dictFile>../quickfixj-messages-fix41/src/main/resources/FIX41.xml</dictFile>
130+
<packaging>quickfix.fix41</packaging>
131+
<fieldPackage>quickfix.field</fieldPackage>
132+
<decimal>${generator.decimal}</decimal>
133+
</configuration>
134+
</execution>
135+
<execution>
136+
<id>fix40</id>
137+
<goals>
138+
<goal>generate</goal>
139+
</goals>
140+
<configuration>
141+
<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
142+
<packaging>quickfix.fix40</packaging>
143+
<fieldPackage>quickfix.field</fieldPackage>
144+
<decimal>${generator.decimal}</decimal>
145+
</configuration>
146+
</execution>
147+
<execution>
148+
<id>fix50sp2</id>
149+
<goals>
150+
<goal>generate</goal>
151+
</goals>
152+
<configuration>
153+
<dictFile>../quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
154+
<packaging>quickfix.fix50sp2</packaging>
155+
<fieldPackage>quickfix.field</fieldPackage>
156+
<decimal>${generator.decimal}</decimal>
157+
</configuration>
158+
</execution>
159+
<execution>
160+
<id>fix50sp1</id>
161+
<goals>
162+
<goal>generate</goal>
163+
</goals>
164+
<configuration>
165+
<dictFile>../quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
166+
<packaging>quickfix.fix50sp1</packaging>
167+
<fieldPackage>quickfix.field</fieldPackage>
168+
<decimal>${generator.decimal}</decimal>
169+
</configuration>
170+
</execution>
171+
</executions>
172+
</plugin>
173+
174+
<plugin>
175+
<artifactId>maven-surefire-plugin</artifactId>
176+
<configuration>
177+
<argLine>-Xmx512m -XX:MaxPermSize=128m</argLine>
178+
<includes>
179+
<include>**/*Test.java</include>
180+
</includes>
181+
</configuration>
182+
</plugin>
183+
77184
<plugin>
78185
<artifactId>maven-shade-plugin</artifactId>
79186
<executions>
@@ -109,6 +216,9 @@
109216
<plugin>
110217
<artifactId>maven-jar-plugin</artifactId>
111218
</plugin>
219+
<plugin>
220+
<artifactId>maven-source-plugin</artifactId>
221+
</plugin>
112222
</plugins>
113223
</build>
114224
</project>

‎quickfixj-messages/quickfixj-messages-all/src/test/java/quickfixj/SupportForMultipleFixVersionsTest.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package quickfixj;
2+
3+
import junit.framework.TestCase;
4+
5+
/**
6+
* Create this class after QFJ-832 where instanciation of messages raise java.lang.VerifyError
7+
*
8+
* @author Manu
9+
*
10+
*/
11+
public class SupportForMultipleFixVersionsTest extends TestCase {
12+
13+
public void testFIX40() {
14+
quickfix.fix40.MessageFactory fact = new quickfix.fix40.MessageFactory();
15+
Object newMessage = fact.create("FIX.4.0", "D");
16+
assertNotNull(newMessage);
17+
}
18+
19+
public void testFIX41() {
20+
quickfix.fix41.MessageFactory fact = new quickfix.fix41.MessageFactory();
21+
Object newMessage = fact.create("FIX.4.1", "D");
22+
assertNotNull(newMessage);
23+
}
24+
25+
public void testFIX42() {
26+
quickfix.fix42.MessageFactory fact = new quickfix.fix42.MessageFactory();
27+
Object newMessage = fact.create("FIX.4.2", "D");
28+
assertNotNull(newMessage);
29+
}
30+
31+
public void testFIX43() {
32+
quickfix.fix43.MessageFactory fact = new quickfix.fix43.MessageFactory();
33+
Object newMessage = fact.create("FIX.4.3", "D");
34+
assertNotNull(newMessage);
35+
}
36+
37+
public void testFIX44() {
38+
quickfix.fix44.MessageFactory fact = new quickfix.fix44.MessageFactory();
39+
Object newMessage = fact.create("FIX.4.4", "D");
40+
assertNotNull(newMessage);
41+
}
42+
43+
public void testFIX50() {
44+
quickfix.fix50.MessageFactory fact = new quickfix.fix50.MessageFactory();
45+
Object newMessage = fact.create("FIX.5.0", "D");
46+
assertNotNull(newMessage);
47+
}
48+
49+
public void testFIX50SP1() {
50+
quickfix.fix50sp1.MessageFactory fact = new quickfix.fix50sp1.MessageFactory();
51+
Object newMessage = fact.create("FIX.5.0.SP1", "D");
52+
assertNotNull(newMessage);
53+
}
54+
55+
public void testFIX50SP2() {
56+
quickfix.fix50sp2.MessageFactory fact = new quickfix.fix50sp2.MessageFactory();
57+
Object newMessage = fact.create("FIX.5.0.SP2", "D");
58+
assertNotNull(newMessage);
59+
}
60+
61+
}

0 commit comments

Comments
 (0)