Andy Wilkinson
dde7ebf30f
Merge branch '1.1.x'
2014-09-07 15:45:53 -05:00
John Tims
a4e08beebc
Add missing variable to the example in the Loading YAML section
...
Closes gh-1524
2014-09-07 15:43:22 -05:00
David Liu
8e9e502b6a
Add support for auto-configuration of Commons DBCP2
...
Closes gh-1292
Closes gh-1477
2014-09-07 10:43:48 -05:00
Andy Wilkinson
ad8be26efd
Merge branch '1.1.x'
2014-09-04 17:04:43 +01:00
Andy Wilkinson
990213b8b8
Correct reference to ConfigurableEmbeddedServletContainerFactory
...
Closes gh-1500
2014-09-04 17:04:38 +01:00
Phillip Webb
f7cffce695
Allow custom JNDI ConnectionFactory lookup
...
Add a `spring.jms.jndi-name` property to allow a JMS ConnectionFactory
to be obtained from a custom JNDI location.
Fixes gh-1471
2014-09-03 18:35:45 -07:00
Phillip Webb
6f62fc854b
Merge branch '1.1.x'
2014-09-03 11:45:54 -07:00
Phillip Webb
449752c9e2
Minor asciidoctor formatting
2014-09-03 08:38:31 -07:00
Stephane Nicoll
383288f1c2
Merge branch '1.1.x'
2014-09-03 16:32:24 +02:00
Stephane Nicoll
811f5ab80c
Clarify the use of spring.profiles
...
Fixes gh-1470
2014-09-03 16:30:55 +02:00
Phillip Webb
236026a43a
Support mixed XA/non-XA ConnectionFactory beans
...
Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.
Fixes gh-1461
2014-09-02 13:00:59 -07:00
Phillip Webb
f8a4df0838
Polish
2014-08-28 12:07:44 -07:00
Stephane Nicoll
aa0f90ec2e
Document JMS auto configuration
...
Fixes gh-1445
2014-08-28 09:52:46 +02:00
Phillip Webb
ff870de0f0
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
2014-08-27 10:09:34 -07:00
Phillip Webb
40d8dde202
Document distributed transaction support
...
See gh-947
2014-08-26 22:34:16 -07:00
Phillip Webb
a4925dabf7
Add property for JNDI DataSource lookup
...
Add `spring.datasource.jndi-name` property to allow a DataSource to be
looked up from JNDI as an alternative to defining a URL connection.
Fixes gh-989
2014-08-26 11:44:38 -07:00
Phillip Webb
8656402ca6
Polish database docs section
2014-08-26 11:44:37 -07:00
Dave Syer
9da556d5e9
Merge branch '1.1.x'
2014-08-25 16:59:46 +01:00
Dave Syer
00ef26599e
Add clarification of logging.file (fixes gh-1416)
2014-08-25 16:59:12 +01:00
Raphael von der Grün
a35a79e1a3
Allow ANSI output to be configured by properties
...
Add AnsiOutputApplicationListener which configures AnsiOutput.enabled
based on a `spring.output.ansi.enabled` property.
Fixes gh-1243
2014-08-14 23:01:38 -07:00
Phillip Webb
f8bf0e2031
Polish
2014-07-28 15:40:40 -07:00
Andy Wilkinson
672d713f99
Add dependency management for spock-spring and document its use
...
Closes #1234
2014-07-15 14:36:56 +01:00
Phillip Webb
fd3e5eceeb
Polish
2014-07-08 01:05:56 -07:00
Andy Wilkinson
148e32d09a
Document need to use @ContextConfiguration with Spock
...
Closes #1167
2014-07-07 13:41:13 +01:00
Phillip Webb
60e60227ad
Polish doc formatting
2014-07-02 15:52:46 -07:00
Dave Syer
fd757cb371
Add logging.level to application.properties
...
E.g.
logging.level.org.springframework: DEBUG
logging.level.org.hibernate: WARN
Fixed gh-788
2014-06-27 15:49:17 +01:00
Iván López
009ae8822b
Fix typo in documentation
2014-06-27 12:57:39 +02:00
Phillip Webb
378d38e2e5
Polish doc formatting
2014-06-20 10:29:04 -07:00
Dave Syer
c04deec6ee
Move JMS docs under 'Messaging'
2014-06-19 17:42:04 +01:00
Phillip Webb
9a5d828f52
Polish docbook formatting
2014-06-09 16:34:54 -07:00
Phillip Webb
f619102cd9
Fix broken links in reference docs
2014-06-09 16:20:12 -07:00
Phillip Webb
30f57bab23
Fix broken links in reference docs
2014-06-09 15:35:53 -07:00
Dave Syer
b75578d99c
Adjust order of property sources
...
@PropertySources *can* and should be added in the slot
after the application.properties (code that is part of the
application should have lower precedence than external
configuration).
Fixes gh-1044
2014-06-07 11:10:51 +01:00
Phillip Webb
62d2b4136a
Polish documentation
...
Apply consistent styling and edit a few section for clarity.
2014-06-06 22:56:44 -07:00
Andy Wilkinson
f1b7544672
Fix duplicate id in the docs
2014-06-06 19:55:39 +01:00
Dave Syer
09200361de
Align expectations of various JMX configurations
...
They all want to create an MBeanServer and when that happens
user sees no MBeans, or sometimes just one set (Spring Core,
Spring Integration or Spring Boot). To harmonise them we
create a @Bean of type MBeanServer and link to it in the
other autoconfigs
Fixes gh-1046
2014-06-06 17:52:14 +01:00
Andy Wilkinson
fbc1d3eec0
Fix section title depth in JMS docs
2014-06-05 16:10:35 +01:00
Stephane Nicoll
726991c144
Use an embed HornetQ broker by default
...
This commit changes the default behavior of the HornetQ auto
configuration. Prior to this commit, an embedded broker was only
started when it was requested explicitly by a configuration option.
This is inconsistent with the ActiveMQ support and boot favors the
easiest route. If the necessary classes are available, HornetQ is
embedded in the application by default.
Fixes gh-1029
2014-06-04 20:15:55 +02:00
Stephane Nicoll
9ad7a22ebe
Add documentation for JMS support
...
This commit documents Boot's JMS support, in particular how Boot
can auto-configure the ConnectionFactory for ActiveMQ and
HornetQ.
Fixes gh-1026
2014-06-04 16:26:35 +02:00
Dave Syer
acf1ccaf44
Add notes for JNDI property values
...
Fixes gh-999
2014-06-03 10:52:23 +01:00
Dave Syer
bd95cc3eab
Add short docs for new Spring Data projects
...
Fixes gh-1011
2014-06-03 10:33:48 +01:00
Phillip Webb
8aaaaa48a6
Fix broken documentation links
2014-06-01 13:02:04 +01:00
Dave Syer
84633dae00
Clarify in docs that @PropertySource is parsed late
...
Fixes gh-970
2014-05-28 12:20:28 +01:00
Phillip Webb
6381fdcb49
Polish
2014-05-26 21:48:19 +01:00
Stephane Nicoll
96adb87bbd
Fix typo
...
Relates to gh-667
2014-05-26 19:00:14 +02:00
Stephane Nicoll
a51739c0e1
Integration tests documentation
...
This commit clarifies how @IntegrationTest can be used as an
alternative of starting the (web) application prior to running the
tests suite.
Fixes gh-667
2014-05-26 15:40:38 +02:00
Phillip Webb
8bcda1bcbe
Polish
2014-05-20 18:26:56 +01:00
Dave Syer
89e0b3d552
Add more detail to error handling docs
2014-05-20 08:52:51 +01:00
Andy Wilkinson
2378fe0900
Add support for using Velocity templates
2014-05-19 12:01:20 +01:00
Dave Syer
a5543f18b9
Add callback for modifying or inspecting LocalContainerEntityManagerFactoryBean
...
A callback is added in autoconfig, so that if users inject the EntityManagerFactoryBuilder
into their app and use it to create multiple EntityManagerFactories, they all get the
same deferred DDL behaviour. The deferred DDL can also be disabled by setting
spring.jpa.hibernate.deferDdl=true.
Fixes gh-894
2014-05-19 11:08:11 +01:00