camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r1197628 - in /camel/branches/camel-2.8.x: ./ components/camel-quickfix/ components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/ components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/ components/...
Date Fri, 04 Nov 2011 16:24:08 GMT
Author: janstey
Date: Fri Nov  4 16:24:08 2011
New Revision: 1197628

URL: http://svn.apache.org/viewvc?rev=1197628&view=rev
Log:
Merged revisions 1189139 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1189139 | jbonofre | 2011-10-26 09:10:49 -0230 (Wed, 26 Oct 2011) | 1 line
  
  [CAMEL-4585] Upgrade to Quickfix/J 1.5.1
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-quickfix/pom.xml
    camel/branches/camel-2.8.x/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
    camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
    camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
    camel/branches/camel-2.8.x/parent/pom.xml
    camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  4 16:24:08 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1197450
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1197450

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-quickfix/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-quickfix/pom.xml?rev=1197628&r1=1197627&r2=1197628&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-quickfix/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-quickfix/pom.xml Fri Nov  4 16:24:08 2011
@@ -38,9 +38,9 @@
 
     <repositories>
         <repository>
-            <id>fusesource.m2</id>
-            <name>Fusesource Dependency Repository</name>
-            <url>http://repo.fusesource.com/maven2-all</url>
+            <id>smx.m2</id>
+            <name>ServiceMix M2 Repository</name>
+            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
         </repository>
     </repositories>
 

Modified: camel/branches/camel-2.8.x/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java?rev=1197628&r1=1197627&r2=1197628&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
Fri Nov  4 16:24:08 2011
@@ -195,13 +195,13 @@ public class QuickfixjEngine {
         if (acceptor != null) {
             acceptor.start();
             if (jmxExporter != null) {
-                jmxExporter.export(acceptor);
+                jmxExporter.register(acceptor);
             }
         }
         if (initiator != null) {
             initiator.start();
             if (jmxExporter != null) {
-                jmxExporter.export(initiator);
+                jmxExporter.register(initiator);
             }
         }
         started = true;

Modified: camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java?rev=1197628&r1=1197627&r2=1197628&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
Fri Nov  4 16:24:08 2011
@@ -363,6 +363,7 @@ public class QuickfixjEngineTest {
     }
 
     @Test
+    @Ignore("The unit test works but we have a collision with the enableJmxForInitiator one")
     public void enableJmxForAcceptor() throws Exception {
         settings.setBool(QuickfixjEngine.SETTING_USE_JMX, true);
         settings.setString(sessionID, SessionFactory.SETTING_CONNECTION_TYPE, SessionFactory.ACCEPTOR_CONNECTION_TYPE);
@@ -372,6 +373,7 @@ public class QuickfixjEngineTest {
 
         quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
         quickfixjEngine.start();
+
         MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
         Set<ObjectName> n = mbeanServer.queryNames(new ObjectName("org.quickfixj:type=Connector,role=Acceptor,*"),
null);
         assertFalse("QFJ mbean not registered", n.isEmpty());

Modified: camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java?rev=1197628&r1=1197627&r2=1197628&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
Fri Nov  4 16:24:08 2011
@@ -199,7 +199,7 @@ public class TradeExecutor {
             if (provider != null) {
                 try {
                     ApplVerID applVerID = getApplVerID(session, message);
-                    DataDictionary appDataDictionary = provider.getApplicationDataDictionary(applVerID,
null);
+                    DataDictionary appDataDictionary = provider.getApplicationDataDictionary(applVerID);
                     appDataDictionary.validate(message, true);
                 } catch (Exception e) {
                     LogUtil.logThrowable(sessionID, "Outgoing message failed validation:
"

Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1197628&r1=1197627&r2=1197628&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Fri Nov  4 16:24:08 2011
@@ -129,7 +129,7 @@
     <protobuf-version>2.3.0</protobuf-version>
     <qpid-version>0.10</qpid-version>
     <quartz-version>1.8.4</quartz-version>
-    <quickfix-version>1.5.0</quickfix-version>
+    <quickfix-version>1.5.1</quickfix-version>
     <restlet-version>2.0.9</restlet-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.1.0.8</saxon-version>

Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1197628&r1=1197627&r2=1197628&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Fri Nov  4 16:24:08 2011
@@ -116,7 +116,7 @@
       <pax.web.version>0.7.2</pax.web.version>
       <quartz-bundle-version>1.8.3_2</quartz-bundle-version>
       <qpid-bundle-version>0.5.0_2</qpid-bundle-version>
-      <quickfix-bundle-version>1.5.0_1</quickfix-bundle-version>
+      <quickfix-bundle-version>1.5.1_1-SNAPSHOT</quickfix-bundle-version>
       <regexp-bundle-version>1.3_1</regexp-bundle-version>      
       <rome-bundle-version>1.0_1</rome-bundle-version>
       <saxon-bundle-version>9.1.0.8_1</saxon-bundle-version>



Mime
View raw message