You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/08/18 12:03:06 UTC
svn commit: r1374540 - in /camel/branches/camel-2.10.x: ./
tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
Author: bvahdat
Date: Sat Aug 18 10:03:05 2012
New Revision: 1374540
URL: http://svn.apache.org/viewvc?rev=1374540&view=rev
Log:
Merged revisions 1374539 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1374539 | bvahdat | 2012-08-18 11:59:14 +0200 (Sa, 18 Aug 2012) | 1 line
CAMEL-5508: Fixed the broken itest.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1374539
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java?rev=1374540&r1=1374539&r2=1374540&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java (original)
+++ camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java Sat Aug 18 10:03:05 2012
@@ -16,10 +16,12 @@
*/
package org.apache.camel.itest.jms;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
@@ -49,6 +51,15 @@ public class JMSTransactionIsTransactedR
return true;
}
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ // as we make use of placeholders for the Jetty port we should add PropertiesComponent beforehand
+ // so that the port can properly be resolved
+ CamelContext context = super.createCamelContext();
+ context.addComponent("properties", new PropertiesComponent());
+ return context;
+ }
+
@Test
public void testTransactionSuccess() throws Exception {
context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {