GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-03 03:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2017-07-24 11:08:32 +01:00
parent ad694fdb3a 8f877dcee2
commit 11fc7c1393
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-autoconfigure/pom.xml
+5
View File
@@ -666,6 +666,11 @@
<artifactId>jooq</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jms</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
+2 -1
View File
@@ -23,6 +23,7 @@ import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
import org.jboss.narayana.jta.jms.TransactionHelper;
import org.jboss.tm.XAResourceRecoveryRegistry;
import org.springframework.beans.factory.ObjectProvider;
@@ -150,7 +151,7 @@ public class NarayanaJtaConfiguration {
}
@Configuration
@ConditionalOnClass(Message.class)
@ConditionalOnClass({ Message.class, TransactionHelper.class })
static class NarayanaJtaJmsConfiguration {
@Bean
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java
+17
View File
@@ -31,6 +31,7 @@ import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import javax.transaction.xa.XAResource;
import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
import com.atomikos.icatch.config.UserTransactionService;
import com.atomikos.icatch.jta.UserTransactionManager;
import com.atomikos.jms.AtomikosConnectionFactoryBean;
@@ -51,6 +52,8 @@ import org.springframework.boot.jta.atomikos.AtomikosProperties;
import org.springframework.boot.jta.bitronix.BitronixDependentBeanFactoryPostProcessor;
import org.springframework.boot.jta.bitronix.PoolingConnectionFactoryBean;
import org.springframework.boot.jta.bitronix.PoolingDataSourceBean;
import org.springframework.boot.jta.narayana.NarayanaBeanFactoryPostProcessor;
import org.springframework.boot.jta.narayana.NarayanaConfigurationBean;
import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -136,6 +139,20 @@ public class JtaAutoConfigurationTests {
this.context.getBean(JtaTransactionManager.class);
}
@Test
public void narayanaSanityCheck() throws Exception {
this.context = new AnnotationConfigApplicationContext(JtaProperties.class,
NarayanaJtaConfiguration.class);
this.context.getBean(NarayanaConfigurationBean.class);
this.context.getBean(UserTransaction.class);
this.context.getBean(TransactionManager.class);
this.context.getBean(XADataSourceWrapper.class);
this.context.getBean(XAConnectionFactoryWrapper.class);
this.context.getBean(NarayanaBeanFactoryPostProcessor.class);
this.context.getBean(JtaTransactionManager.class);
this.context.getBean(RecoveryManagerService.class);
}
@Test
public void defaultBitronixServerId() throws UnknownHostException {
this.context = new AnnotationConfigApplicationContext(