Author: hadrian
Date: Tue Sep 28 21:33:56 2010
New Revision: 1002364
URL: http://svn.apache.org/viewvc?rev=1002364&view=rev
Log:
CAMEL-1350. Changing scheme to the original quickfix. Many thanks to Steve Bate
for rewriting this component
Added:
camel/trunk/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/component/quickfix
- copied unchanged from r1002361,
camel/trunk/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/component/quickfixj
Removed:
camel/trunk/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/component/quickfixj
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java?rev=1002364&r1=1002363&r2=1002364&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
Tue Sep 28 21:33:56 2010
@@ -77,7 +77,7 @@ public class QuickfixjComponentTest {
}
private String getEndpointUri(final String configFilename, SessionID sid) {
- String uri = "quickfixj:" + configFilename;
+ String uri = "quickfix:" + configFilename;
if (sid != null) {
uri += "?sessionID=" + sid;
}
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java?rev=1002364&r1=1002363&r2=1002364&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
Tue Sep 28 21:33:56 2010
@@ -57,24 +57,24 @@ public class DynamicRoutingExample {
public void configure() throws Exception {
// Release latch when session logon events are received
// We expect four logon events (four sessions)
- from("quickfixj:examples/gateway.cfg").
+ from("quickfix:examples/gateway.cfg").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon)).
bean(new CountDownLatchDecrementer("logon", logonLatch));
// Dynamic router -- Uses FIX DeliverTo tags
- from("quickfixj:examples/gateway.cfg").
+ from("quickfix:examples/gateway.cfg").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived)).
- recipientList(bean(new
FixMessageRouter("quickfixj:examples/gateway.cfg")));
+ recipientList(bean(new
FixMessageRouter("quickfix:examples/gateway.cfg")));
// Log app messages as JSON
- from("quickfixj:examples/gateway.cfg").
+ from("quickfix:examples/gateway.cfg").
filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageSent))).
bean(new QuickfixjMessageJsonPrinter());
// If the tra...@2 session receives an email then release the
latch
-
from("quickfixj:examples/gateway.cfg?sessionID=FIX.4.2:tra...@2->GATEWAY").
+
from("quickfix:examples/gateway.cfg?sessionID=FIX.4.2:tra...@2->GATEWAY").
filter(PredicateBuilder.and(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EMAIL))).
@@ -93,7 +93,7 @@ public class DynamicRoutingExample {
throw new IllegalStateException("Logon did not complete");
}
- String gatewayUri =
"quickfixj:examples/gateway.cfg?sessionID=FIX.4.2:tra...@1->GATEWAY";
+ String gatewayUri =
"quickfix:examples/gateway.cfg?sessionID=FIX.4.2:tra...@1->GATEWAY";
Endpoint gatewayEndpoint = context.getEndpoint(gatewayUri);
Producer producer = gatewayEndpoint.createProducer();
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java?rev=1002364&r1=1002363&r2=1002364&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
Tue Sep 28 21:33:56 2010
@@ -59,19 +59,19 @@ public class SimpleMessagingExample {
public void configure() throws Exception {
// Release latch when session logon events are received
// We expect two events, one for the trader session and one
for the market session
- from("quickfixj:examples/inprocess.cfg").
+ from("quickfix:examples/inprocess.cfg").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon)).
bean(new CountDownLatchDecrementer("logon", logonLatch));
// For all received messages, print the JSON-formatted message
to stdout
- from("quickfixj:examples/inprocess.cfg").
+ from("quickfix:examples/inprocess.cfg").
filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AdminMessageReceived),
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived))).
bean(new QuickfixjMessageJsonPrinter());
// If the market session receives an email then release the
latch
-
from("quickfixj:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").
+
from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").
filter(header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EMAIL)).
bean(new CountDownLatchDecrementer("message",
receivedMessageLatch));
}
@@ -86,7 +86,7 @@ public class SimpleMessagingExample {
throw new IllegalStateException("Logon did not succeed");
}
- String marketUri =
"quickfixj:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
+ String marketUri =
"quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
Producer producer = context.getEndpoint(marketUri).createProducer();
Email email = TestSupport.createEmailMessage("Example");
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java?rev=1002364&r1=1002363&r2=1002364&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
Tue Sep 28 21:33:56 2010
@@ -64,25 +64,25 @@ public class TradeExecutorExample {
public void configure() throws Exception {
// Release latch when session logon events are received
// We expect four logon events (four sessions)
- from("quickfixj:examples/inprocess.cfg").
+ from("quickfix:examples/inprocess.cfg").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon)).
bean(new CountDownLatchDecrementer("logon", logonLatch));
-
from("quickfixj:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").
+
from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived)).
to("trade-executor:market");
-
from("trade-executor:market").to("quickfixj:examples/inprocess.cfg");
+
from("trade-executor:market").to("quickfix:examples/inprocess.cfg");
// Log app messages as JSON
- from("quickfixj:examples/inprocess.cfg").
+ from("quickfix:examples/inprocess.cfg").
filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageSent))).
bean(new QuickfixjMessageJsonPrinter());
// Release latch when trader receives execution report
-
from("quickfixj:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET").
+
from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET").
filter(PredicateBuilder.and(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EXECUTION_REPORT))).
@@ -101,7 +101,7 @@ public class TradeExecutorExample {
throw new IllegalStateException("Logon did not complete");
}
- String gatewayUri =
"quickfixj:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
+ String gatewayUri =
"quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
Endpoint gatewayEndpoint = context.getEndpoint(gatewayUri);
Producer producer = gatewayEndpoint.createProducer();
