diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/ActiveMQAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/ActiveMQAutoConfiguration.java index 67fa2bc224..14ce44f6f8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/ActiveMQAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/ActiveMQAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * @since 1.1.0 */ @Configuration -@AutoConfigureBefore(JmsTemplateAutoConfiguration.class) +@AutoConfigureBefore(JmsAutoConfiguration.class) @ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class }) @ConditionalOnMissingBean(ConnectionFactory.class) public class ActiveMQAutoConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java similarity index 86% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java index b3436eef7e..568335badd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java @@ -29,24 +29,24 @@ import org.springframework.context.annotation.Configuration; import org.springframework.jms.core.JmsTemplate; /** - * {@link EnableAutoConfiguration Auto-configuration} for {@link JmsTemplate}. + * {@link EnableAutoConfiguration Auto-configuration} for Spring JMS. * * @author Greg Turnquist */ @Configuration @ConditionalOnClass(JmsTemplate.class) @ConditionalOnBean(ConnectionFactory.class) -@EnableConfigurationProperties(JmsTemplateProperties.class) -public class JmsTemplateAutoConfiguration { +@EnableConfigurationProperties(JmsProperties.class) +public class JmsAutoConfiguration { @Autowired - private JmsTemplateProperties properties; + private JmsProperties properties; @Autowired private ConnectionFactory connectionFactory; @Bean - @ConditionalOnMissingBean(JmsTemplate.class) + @ConditionalOnMissingBean public JmsTemplate jmsTemplate() { JmsTemplate jmsTemplate = new JmsTemplate(this.connectionFactory); jmsTemplate.setPubSubDomain(this.properties.isPubSubDomain()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java similarity index 88% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index 82869e1546..9f0a5d89b0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -18,8 +18,14 @@ package org.springframework.boot.autoconfigure.jms; import org.springframework.boot.context.properties.ConfigurationProperties; +/** + * Configuration properties for JMS. + * + * @author Greg Turnquist + * @author Phillip Webb + */ @ConfigurationProperties(prefix = "spring.jms") -public class JmsTemplateProperties { +public class JmsProperties { private boolean pubSubDomain = false; diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index c467070026..8fd434cc77 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -19,7 +19,7 @@ org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration, org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\ org.springframework.boot.autoconfigure.jms.ActiveMQAutoConfiguration,\ -org.springframework.boot.autoconfigure.jms.JmsTemplateAutoConfiguration,\ +org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration,\ org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration,\ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\ org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration,\ diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java similarity index 98% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index 85487b90b9..4c1e575537 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -35,11 +35,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** - * Tests for {@link JmsTemplateAutoConfiguration}. + * Tests for {@link JmsAutoConfiguration}. * * @author Greg Turnquist */ -public class JmsTemplateAutoConfigurationTests { +public class JmsAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -206,7 +206,7 @@ public class JmsTemplateAutoConfigurationTests { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(additionalClasses); context.register(ActiveMQAutoConfiguration.class, - JmsTemplateAutoConfiguration.class); + JmsAutoConfiguration.class); return context; } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.java index 8e213f1639..7690cb8bb4 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/GroovyTemplatesCompilerAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * 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. @@ -28,8 +28,7 @@ import org.springframework.boot.groovy.GroovyTemplate; * {@link CompilerAutoConfiguration} for Groovy Templates (outside MVC). * * @author Dave Syer - * - * @since 1.1 + * @since 1.1.0 */ public class GroovyTemplatesCompilerAutoConfiguration extends CompilerAutoConfiguration { @@ -40,9 +39,8 @@ public class GroovyTemplatesCompilerAutoConfiguration extends CompilerAutoConfig @Override public void applyDependencies(DependencyCustomizer dependencies) { - dependencies - .ifAnyMissingClasses("groovy.text.TemplateEngine") - .add("groovy-templates"); + dependencies.ifAnyMissingClasses("groovy.text.TemplateEngine").add( + "groovy-templates"); } @Override diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableGroovyTemplates.java b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableGroovyTemplates.java index 047029f826..ae74014e07 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableGroovyTemplates.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableGroovyTemplates.java @@ -22,8 +22,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.boot.cli.compiler.autoconfigure.GroovyTemplatesCompilerAutoConfiguration; + /** - * Pseudo annotation used to trigger {@link GroovyTemplatesAutoConfiguration}. + * Pseudo annotation used to trigger {@link GroovyTemplatesCompilerAutoConfiguration}. + * + * @author Dave Syer + * @since 1.1.0 */ @Target(ElementType.TYPE) @Documented diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index b81b633f59..2d67717bb1 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -203,9 +203,9 @@ content into your application; rather pick only the properties that you need. flyway.prefix=V flyway.suffix=.sql flyway.enabled=true - flyway.url= # JDBC url if you want Flyway to create its own DataSource - flyway.user= # JDBC username if you want Flyway to create its own DataSource - flyway.password= # JDBC password if you want Flyway to create its own DataSource + flyway.url= # JDBC url if you want Flyway to create its own DataSource + flyway.user= # JDBC username if you want Flyway to create its own DataSource + flyway.password= # JDBC password if you want Flyway to create its own DataSource # LIQUIBASE ({sc-spring-boot-autoconfigure}/liquibase/LiquibaseProperties.{sc-ext}[LiquibaseProperties]) liquibase.change-log=classpath:/db/changelog/db.changelog-master.yaml @@ -237,8 +237,8 @@ content into your application; rather pick only the properties that you need. # ACTIVEMQ ({sc-spring-boot-autoconfigure}/jms/ActiveMQProperties.{sc-ext}[ActiveMQProperties]) spring.activemq.broker-url=tcp://localhost:61616 # connection URL - spring.activemq.user= - spring.activemq.password= + spring.activemq.user= + spring.activemq.password= spring.activemq.in-memory=true # broker kind to create if no broker-url is specified spring.activemq.pooled=false