Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support mixed XA/non-XA ConnectionFactory beans

Browse Source 
Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.

Fixes gh-1461
This commit is contained in:
Phillip Webb
2014-09-02 11:44:16 -07:00
parent 57a154520e
commit 236026a43a
4 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-samples/spring-boot-sample-jta-bitronix/src/test/java/sample/bitronix/SampleBitronixApplicationTests.java
View File

@@ -20,8 +20,15 @@ import org.hamcrest.Matcher;
import org.hamcrest.core.SubstringMatcher;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.test.OutputCapture;
import org.springframework.context.ApplicationContext;
import bitronix.tm.resource.jms.PoolingConnectionFactory;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertThat;
/**
@@ -44,6 +51,19 @@ public class SampleBitronixApplicationTests {
assertThat(output, containsString(1, "Simulated error"));
}
@Test
public void testExposesXaAndNonXa() throws Exception {
ApplicationContext context = SpringApplication
.run(SampleBitronixApplication.class);
Object jmsConnectionFactory = context.getBean("jmsConnectionFactory");
Object xaJmsConnectionFactory = context.getBean("xaJmsConnectionFactory");
Object nonXaJmsConnectionFactory = context.getBean("nonXaJmsConnectionFactory");
assertThat(jmsConnectionFactory, sameInstance(xaJmsConnectionFactory));
assertThat(jmsConnectionFactory, instanceOf(PoolingConnectionFactory.class));
assertThat(nonXaJmsConnectionFactory,
not(instanceOf(PoolingConnectionFactory.class)));
}
private Matcher<? super String> containsString(final int times, String s) {
return new SubstringMatcher(s) {