You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/07/01 20:35:42 UTC
[2/2] camel git commit: Update QuickFIX J to version 1.6.0
Update QuickFIX J to version 1.6.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c182b471
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c182b471
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c182b471
Branch: refs/heads/master
Commit: c182b4718bd6f266860a3957e7bbe9048839e07a
Parents: 29a7461
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed Jul 1 14:08:51 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 1 20:40:30 2015 +0200
----------------------------------------------------------------------
components/camel-quickfix/pom.xml | 2 +-
.../component/quickfixj/QuickfixjComponentTest.java | 12 ++++++------
.../component/quickfixj/QuickfixjConvertersTest.java | 8 ++++----
.../camel/component/quickfixj/QuickfixjEngineTest.java | 7 +++----
parent/pom.xml | 2 +-
5 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c182b471/components/camel-quickfix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 245fb84..ba41eae 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina-version}</version>
+ <version>${mina2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c182b471/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
index a8a369b..a6d085e 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
@@ -40,7 +40,6 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.converter.StaticMethodTypeConverter;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ServiceHelper;
-import org.apache.mina.common.TransportType;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -63,6 +62,7 @@ import quickfix.field.SenderCompID;
import quickfix.field.Subject;
import quickfix.field.TargetCompID;
import quickfix.fix44.Email;
+import quickfix.mina.ProtocolFactory;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -108,8 +108,8 @@ public class QuickfixjComponentTest {
sessionID = new SessionID(FixVersions.BEGINSTRING_FIX44, "FOO", "BAR");
settings = new SessionSettings();
- settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, TransportType.VM_PIPE.toString());
- settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, TransportType.VM_PIPE.toString());
+ settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
+ settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
settings.setBool(Session.SETTING_USE_DATA_DICTIONARY, false);
setSessionID(settings, sessionID);
@@ -363,9 +363,9 @@ public class QuickfixjComponentTest {
// Create settings file with both acceptor and initiator
- SessionSettings settings = new SessionSettings();
- settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, TransportType.VM_PIPE.toString());
- settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, TransportType.VM_PIPE.toString());
+ SessionSettings settings = new SessionSettings();
+ settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
+ settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
settings.setBool(Session.SETTING_USE_DATA_DICTIONARY, false);
SessionID acceptorSessionID = new SessionID(FixVersions.BEGINSTRING_FIX44, "ACCEPTOR", "INITIATOR");
http://git-wip-us.apache.org/repos/asf/camel/blob/c182b471/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
index 2556260..cf790e6 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.quickfixj.converter.QuickfixjConverters;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.mina.common.TransportType;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -44,6 +43,7 @@ import quickfix.SessionSettings;
import quickfix.field.HopCompID;
import quickfix.field.MsgType;
import quickfix.fix44.Message.Header.NoHops;
+import quickfix.mina.ProtocolFactory;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -71,8 +71,8 @@ public class QuickfixjConvertersTest extends CamelTestSupport {
Thread.currentThread().setContextClassLoader(testClassLoader);
settings = new SessionSettings();
- settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, TransportType.VM_PIPE.toString());
- settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, TransportType.VM_PIPE.toString());
+ settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
+ settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
}
@Override
@@ -221,7 +221,7 @@ public class QuickfixjConvertersTest extends CamelTestSupport {
private void createSession(SessionID sessionID) throws IOException, ConfigError, FieldConvertError, JMException, Exception {
SessionSettings settings = new SessionSettings();
- settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, TransportType.VM_PIPE.toString());
+ settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
settings.setString(sessionID, SessionFactory.SETTING_CONNECTION_TYPE, SessionFactory.ACCEPTOR_CONNECTION_TYPE);
settings.setLong(sessionID, Acceptor.SETTING_SOCKET_ACCEPT_PORT, 1234);
http://git-wip-us.apache.org/repos/asf/camel/blob/c182b471/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
index 028da7e..7aeebba 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
@@ -31,8 +31,6 @@ import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.mina.common.TransportType;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -70,6 +68,7 @@ import quickfix.ThreadedSocketAcceptor;
import quickfix.ThreadedSocketInitiator;
import quickfix.field.MsgType;
import quickfix.fix42.Email;
+import quickfix.mina.ProtocolFactory;
import static org.apache.camel.util.ObjectHelper.equal;
@@ -99,8 +98,8 @@ public class QuickfixjEngineTest extends org.apache.camel.test.junit4.TestSuppor
sessionID = new SessionID(FixVersions.BEGINSTRING_FIX44, "FOO", "BAR");
settings = new SessionSettings();
- settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, TransportType.VM_PIPE.toString());
- settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, TransportType.VM_PIPE.toString());
+ settings.setString(Acceptor.SETTING_SOCKET_ACCEPT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
+ settings.setString(Initiator.SETTING_SOCKET_CONNECT_PROTOCOL, ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
settings.setBool(Session.SETTING_USE_DATA_DICTIONARY, false);
settings.setBool(QuickfixjEngine.SETTING_USE_JMX, false);
TestSupport.setSessionID(settings, sessionID);
http://git-wip-us.apache.org/repos/asf/camel/blob/c182b471/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7d4ef9b..71a5c21 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -401,7 +401,7 @@
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>
<quartz2-version>2.2.1</quartz2-version>
- <quickfix-bundle-version>1.5.3_1</quickfix-bundle-version>
+ <quickfix-bundle-version>1.6.0_1</quickfix-bundle-version>
<rabbitmq-amqp-client-version>3.3.4</rabbitmq-amqp-client-version>
<reflections-bundle-version>0.9.8_1</reflections-bundle-version>
<regexp-bundle-version>1.4_1</regexp-bundle-version>