Browse Source

Don't import JmsBootstrapConfiguration directly

Remove the direct unconditional JmsBootstrapConfiguration @Import from
JmsAnnotationDrivenConfiguration in favor of the nested
EnableJmsConfiguration class.

Fixes gh-1513
pull/1694/head
Phillip Webb 11 years ago
parent
commit
c40aab657f
  1. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java

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

@ -24,9 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnJndi; @@ -24,9 +24,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.context.annotation.Import;
import org.springframework.jms.annotation.EnableJms;
import org.springframework.jms.annotation.JmsBootstrapConfiguration;
import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
import org.springframework.jms.config.JmsListenerConfigUtils;
import org.springframework.jms.support.destination.DestinationResolver;
@ -42,7 +40,6 @@ import org.springframework.transaction.PlatformTransactionManager; @@ -42,7 +40,6 @@ import org.springframework.transaction.PlatformTransactionManager;
*/
@Configuration
@ConditionalOnClass(EnableJms.class)
@Import(JmsBootstrapConfiguration.class)
class JmsAnnotationDrivenConfiguration {
@Autowired(required = false)

Loading…
Cancel
Save