Merge branch '1.1.x'

Redundant @ConditionalOnMissingBean annotation has been removed.
ActiveMQConnectionFactoryConfiguration is not auto-configuration and
is imported by ActiveMQAutoConfiguration which is protected by
@ConditionalOnMissingBean(ConnectionFactory.class)

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

@@ -20,7 +20,6 @@ import javax.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.pool.PooledConnectionFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
  * @since 1.1.0
  */
 @Configuration
-@ConditionalOnMissingBean(ConnectionFactory.class)
 class ActiveMQConnectionFactoryConfiguration {
 
 	@Bean

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.jms.activemq;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockingDetails;
+
+/**
+ * Tests for {@link ActiveMQAutoConfiguration}
+ *
+ * @author Andy Wilkinson
+ */
+public class ActiveMQAutoConfigurationTests {
+
+	private AnnotationConfigApplicationContext context;
+
+	@Test
+	public void brokerIsEmbeddedByDefault() {
+		load(EmptyConfiguration.class);
+		ConnectionFactory connectionFactory = this.context
+				.getBean(ConnectionFactory.class);
+		assertThat(connectionFactory, instanceOf(ActiveMQConnectionFactory.class));
+		String brokerUrl = ((ActiveMQConnectionFactory) connectionFactory).getBrokerURL();
+		assertEquals("vm://localhost?broker.persistent=false", brokerUrl);
+	}
+
+	@Test
+	public void configurationBacksOffWhenCustomConnectionFactoryExists() {
+		load(CustomConnectionFactoryConfiguration.class);
+		assertTrue(mockingDetails(this.context.getBean(ConnectionFactory.class)).isMock());
+	}
+
+	private void load(Class<?> config) {
+		this.context = doLoad(config);
+	}
+
+	private AnnotationConfigApplicationContext doLoad(Class<?> config) {
+		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+		applicationContext.register(config);
+		applicationContext.register(ActiveMQAutoConfiguration.class,
+				JmsAutoConfiguration.class);
+		applicationContext.refresh();
+		return applicationContext;
+	}
+
+	@Configuration
+	static class EmptyConfiguration {
+
+	}
+
+	@Configuration
+	static class CustomConnectionFactoryConfiguration {
+
+		@Bean
+		public ConnectionFactory connectionFactory() {
+			return mock(ConnectionFactory.class);
+		}
+	}
+}