camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1346880 - in /camel/trunk: components/ components/camel-quickfix/ components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/ components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples...
Date Wed, 06 Jun 2012 13:23:04 GMT
Author: bvahdat
Date: Wed Jun  6 13:23:03 2012
New Revision: 1346880

URL: http://svn.apache.org/viewvc?rev=1346880&view=rev
Log:
CAMEL-5334: Upgrade to QuickFIX/J 1.5.2.

Modified:
    camel/trunk/components/camel-quickfix/pom.xml
    camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
    camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
    camel/trunk/components/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml

Modified: camel/trunk/components/camel-quickfix/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/pom.xml?rev=1346880&r1=1346879&r2=1346880&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/pom.xml (original)
+++ camel/trunk/components/camel-quickfix/pom.xml Wed Jun  6 13:23:03 2012
@@ -38,9 +38,9 @@
 
   <repositories>
     <repository>
-      <id>smx.m2</id>
-      <name>ServiceMix M2 Repository</name>
-      <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+      <id>marketcetera.m2</id>
+      <name>Marketcetera M2 Repository</name>
+      <url>http://repo.marketcetera.org/maven</url>
     </repository>
   </repositories>
 
@@ -50,7 +50,7 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.quickfixj</groupId>
+      <groupId>quickfixj</groupId>
       <artifactId>quickfixj-all</artifactId>
       <version>${quickfix-version}</version>
     </dependency>

Modified: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java?rev=1346880&r1=1346879&r2=1346880&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
(original)
+++ camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
Wed Jun  6 13:23:03 2012
@@ -100,15 +100,17 @@ public final class QuickfixjConverters {
     private static DataDictionary getDataDictionary(Exchange exchange) throws ConfigError
{
         Object dictionaryValue = exchange.getProperties().get(QuickfixjEndpoint.DATA_DICTIONARY_KEY);
 
-        DataDictionary dataDictionary;
+        DataDictionary dataDictionary = null;
         if (dictionaryValue instanceof DataDictionary) {
             dataDictionary = (DataDictionary) dictionaryValue;
         } else if (dictionaryValue instanceof String) {
             dataDictionary = new DataDictionary((String) dictionaryValue);
         } else {
-            SessionID sessionID = (SessionID) exchange.getIn().getHeader(QuickfixjEndpoint.SESSION_ID_KEY);
-            Session session = Session.lookupSession(sessionID);
-            dataDictionary = session != null ? session.getDataDictionary() : null;
+            SessionID sessionID = exchange.getIn().getHeader(QuickfixjEndpoint.SESSION_ID_KEY,
SessionID.class);
+            if (sessionID != null) {
+                Session session = Session.lookupSession(sessionID);
+                dataDictionary = session != null ? session.getDataDictionary() : null;
+            }
         }
 
         return dataDictionary;

Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java?rev=1346880&r1=1346879&r2=1346880&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
(original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
Wed Jun  6 13:23:03 2012
@@ -160,7 +160,7 @@ public class TradeExecutor {
         if (order.getChar(OrdType.FIELD) == OrdType.LIMIT) {
             BigDecimal limitPrice = new BigDecimal(order.getString(Price.FIELD));
             char side = order.getChar(Side.FIELD);
-            BigDecimal thePrice = new BigDecimal(Double.toString(price.getValue()));
+            BigDecimal thePrice = price.getValue();
 
             return (side == Side.BUY && thePrice.compareTo(limitPrice) <= 0) 
                 || ((side == Side.SELL || side == Side.SELL_SHORT) && thePrice.compareTo(limitPrice)
>= 0);

Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1346880&r1=1346879&r2=1346880&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Wed Jun  6 13:23:03 2012
@@ -161,16 +161,4 @@
     <module>camel-zookeeper</module>
   </modules>
 
-  <profiles>
-        <profile>
-            <id>jdk16</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <modules>
-                <module>camel-quickfix</module>
-            </modules>
-        </profile>
-  </profiles>
-
 </project>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1346880&r1=1346879&r2=1346880&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jun  6 13:23:03 2012
@@ -151,7 +151,7 @@
     <protobuf-version>2.3.0</protobuf-version>
     <qpid-version>0.16</qpid-version>
     <quartz-version>1.8.5</quartz-version>
-    <quickfix-version>1.5.1</quickfix-version>
+    <quickfix-version>1.5.2-bd</quickfix-version>
     <restlet-version>2.0.14</restlet-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.3.0.11</saxon-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1346880&r1=1346879&r2=1346880&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Jun  6 13:23:03 2012
@@ -104,7 +104,7 @@
       <protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version>
       <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
       <qpid-bundle-version>0.14_1</qpid-bundle-version>
-      <quickfix-bundle-version>1.5.1_2</quickfix-bundle-version>
+      <quickfix-bundle-version>1.5.2_1</quickfix-bundle-version>
       <regexp-bundle-version>1.3_3</regexp-bundle-version>
       <rhino-bundle-version>1.7R2_3</rhino-bundle-version>
       <rome-bundle-version>1.0_3</rome-bundle-version>



Mime
View raw message