Fix a few JTA issues

- Search for ConnectionFactories in java:/JmsXA and
  java:/XAConnectionFactory
- Remove javax.transaction:jta managed dependency
- Removed unused JtaProperties argument

Fixes gh-947

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.jms;
 
+import java.util.Arrays;
+
 import javax.jms.ConnectionFactory;
 import javax.naming.NamingException;
 
@@ -25,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnJndi;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.jndi.JndiLocatorDelegate;
 
 /**
@@ -36,12 +39,26 @@ import org.springframework.jndi.JndiLocatorDelegate;
 @Configuration
 @AutoConfigureBefore(JmsAutoConfiguration.class)
 @ConditionalOnMissingBean(ConnectionFactory.class)
-@ConditionalOnJndi("java:/JmsXA")
+@ConditionalOnJndi({ "java:/JmsXA", "java:/XAConnectionFactory" })
 public class JndiConnectionFactoryAutoConfiguration {
 
 	@Bean
 	public ConnectionFactory connectionFactory() throws NamingException {
-		return new JndiLocatorDelegate().lookup("java:/JmsXA", ConnectionFactory.class);
+		for (String name : getJndiLocations()) {
+			try {
+				return new JndiLocatorDelegate().lookup(name, ConnectionFactory.class);
+			}
+			catch (NamingException ex) {
+				// Swallow and continue
+			}
+		}
+		throw new IllegalStateException(
+				"Unable to find ConnectionFactory in JNDI locations "
+						+ Arrays.asList(getJndiLocations()));
+	}
+
+	private String[] getJndiLocations() {
+		return AnnotationUtils.getAnnotation(getClass(), ConditionalOnJndi.class).value();
 	}
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jta/BitronixJtaConfiguration.java

@@ -57,7 +57,7 @@ class BitronixJtaConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConfigurationProperties(prefix = JtaProperties.PREFIX)
-	public bitronix.tm.Configuration bitronixConfiguration(JtaProperties xxx) {
+	public bitronix.tm.Configuration bitronixConfiguration() {
 		bitronix.tm.Configuration config = TransactionManagerServices.getConfiguration();
 		config.setServerId("spring-boot-jta-bitronix");
 		File logBaseDir = getLogBaseDir();

spring-boot-dependencies/pom.xml

@@ -88,7 +88,6 @@
 		<jolokia.version>1.2.2</jolokia.version>
 		<json-path.version>0.9.1</json-path.version>
 		<jstl.version>1.2</jstl.version>
-		<jta.version>1.1</jta.version>
 		<junit.version>4.11</junit.version>
 		<liquibase.version>3.0.8</liquibase.version>
 		<log4j.version>1.2.17</log4j.version>
@@ -521,11 +520,6 @@
 				<artifactId>jstl</artifactId>
 				<version>${jstl.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>jta</artifactId>
-				<version>${jta.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>jaxen</groupId>
 				<artifactId>jaxen</artifactId>

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -1929,8 +1929,9 @@ looking at common JNDI locations (`java:comp/UserTransaction`,
 `java:comp/TransactionManager` etc). If you are using a transaction service provided by
 your application server, you will generally also want to ensure that all resources are
 managed by the server and exposed over JNDI.  Spring Boot will attempt to auto-configure
-JMS by looking for a `ConnectionFactory` at the JNDI path `java:/JmsXA` and you can use
-the <<boot-features-connecting-to-a-jndi-datasource, `spring.datasource.jndi-name` property>>
+JMS by looking for a `ConnectionFactory` at the JNDI path `java:/JmsXA` or
+`java:/XAConnectionFactory` and you can use the
+<<boot-features-connecting-to-a-jndi-datasource, `spring.datasource.jndi-name` property>>
 to configure your `DataSource`.
 
 

spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml

@@ -23,10 +23,6 @@
 			<groupId>javax.jms</groupId>
 			<artifactId>jms-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.codehaus.btm</groupId>
 			<artifactId>btm</artifactId>