Commit Graph

234 Commits

Author SHA1 Message Date
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
Dave Syer bfbb720d0a Add docs for Groovy Templates 2014-05-16 15:28:35 +01:00
Dave Syer 7454c4866b Support for @ConfigurationProperties in JPA
Adds JpaProperties to bind to spring.jpa.* (making those
properties easier to reason about and visible in the
/configprops endpoint).

Also allows easy configuration of multiple EntityManagerFactories via new
EntityManagerFactoryBuilder. JpaBaseConfiguration has a @Bean of that type
so users can inject it to create new or additional EntityManagerFactories.
This also simplifies the Hibernate autoconfiguration.

Also renames the DataSourceFactory to DataSourceBuilder (since that's what it
is).
2014-05-15 09:18:38 +01:00
Dave Syer 14d3b46809 Add constants to SecurityProperties and ManagementServerProperties
For the convenience of users who want to selectively override the
access rules in an application without taking complete control of the
security configuration we now have some constants:

* SecurityProperties.ACCESS_OVERRIDE_ORDER for overriding just the
application endpoint access rules

* ManagementServerProperties.ACCESS_OVERRIDE_ORDER for overriding the
application endpoint and management endpoint access rules

Fixes gh-803
2014-05-08 05:32:43 -07:00
Ger-Jan te Dorsthorst 904804d717 Minor documentation fixes
Fixes gh-781
2014-05-05 10:46:29 +01:00
Stephane Nicoll a330cb9b8a Improve remote shell security documentation
Previous to this commit, the remote shell security configuration
described that a default password will be generated with no extra
configuration. Actually, when Spring Security is configured for the
application, the remote shell reuses that configuration by default.

It turns out that the default log message is confusing as it was
referring to "application endpoints". Updated that log to a more
generic log message and updated doc accordingly.

Fixes gh-779
2014-05-05 11:12:27 +02:00
Dave Syer b7e583a39b Document message codes and custom banner
Fixed gh-756, Fixes gh-757
2014-05-01 10:28:06 +01:00
Andy Wilkinson 7c91176186 Add FreeMarker support
This commit adds auto-configuration and a starter,
spring-boot-starter-freemarker, for using FreeMarker view templates in
a web application.

A new abstraction, TemplateAvailabilityProvider, has been introduced.
This decouples ErrorMvcAutoConfiguration from the various view
technologies that Spring Boot now supports, allowing it to determine
when a custom error template is provided without knowing the details of
each view technology.

Closes #679
2014-04-29 19:46:09 +01:00
Dave Syer 1143f6dbb1 @WebApplication->@WebAppConfiguration
Fixed gh-746
2014-04-29 15:26:37 +01:00
Dave Syer ef4e83a879 Move ErrorController to autoconfig 2014-04-29 15:23:29 +01:00
Dave Syer 42ca765e1a Remove test dependencies from spring-boot-starter-parent
Fixes gh-617

Conflicts:

	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2014-04-26 13:42:16 +01:00
Stephane Nicoll 6cf946ea3f Fix typo 2014-04-26 11:40:44 +03:00
Phillip Webb fad5ce45db Polish 2014-04-23 12:35:33 +01:00
Hugo Flambo a77fee9f18 Fix typo and use *PropertySource* instead *ProperySource*
Fixes gh-705
2014-04-22 08:46:24 +01:00
Dave Syer 359315568a Clarify handling and binding or YAML lists
The docs related to YAML lists were out of date and
lacked an example making it clear how to bind to them.

See gh-501
2014-04-20 08:30:39 -07:00
Dave Syer 7b07fe8ce0 Convert remaining samples to use random port
Partial fix for gh-337. See also gh-607 which complements this, but might
conflict on a merge.
2014-04-17 20:29:04 -07:00
Lukasz Kryger 9907e70609 Minor documentation fixes 2014-04-16 10:48:36 +01:00
Lukasz Kryger 0f88f7435f Minor fixes in the docs 2014-04-11 06:34:07 +01:00
Phillip Webb 13517598a4 Revert "Remove test dependencies from spring-boot-starter-parent"
This reverts commit 5ded496dc3.

Fixes gh-628
2014-04-06 21:50:22 -07:00
Phillip Webb 2bb0f744e0 Polish 2014-04-06 21:49:12 -07:00
Dave Syer 4366d7880e Fix docos references to @ConfigurationProperties(prefix="...")
Fixes gh-629
2014-04-04 08:54:20 +01:00
Dave Syer cc4ee653e3 Add separate section in "features" docs on Security
Lists all the basic autoconfig defaults and quick pointers on
how to change or disable.

Fixes gh-514
2014-04-03 17:47:40 +01:00
Dave Syer 97adb5c1b3 Ensure ddl-auto=none for non-embedded database
A more thorough check is needed to avoid the false assumption
that the DataSource is embedded just because an embedded database
is on the classpath. You really have to try and look in the connection
metadata, so that's what we now do.

Fixes gh-621, fixes gh-373
2014-04-02 17:21:14 +01:00
Dave Syer 5ded496dc3 Remove test dependencies from spring-boot-starter-parent
Fixes gh-617
2014-04-01 17:36:43 +01:00
Alexander Grüneberg b95266a2bc Fix type in reference docs
The `spring.data.mongodb.uri` property should be
`spring.data.mongodb.url`.

Fixes gh-613
2014-03-31 17:44:25 -07:00
Phillip Webb aca67066bf Rename RestTemplates to TestRestTemplate
Rename the RestTemplates to TestRestTemplate to help indicate that it's
primarily intended for testing. Also now extend RestTemplate to allow
direct use, rather than via factory methods.

Fixes gh-599
2014-03-27 11:22:03 -07:00
Phillip Webb aa3f0556dc Fixup asciidoc formatting and links 2014-03-26 13:25:02 -07:00
Dave Syer 01775ba53d Clarify role of MVC autoconfiguration
Users only have to add a normal `WebMvcConfigurer` to configure
their own features. Sometimes that's not clear enough (and it's
good to stress that `@EnableWebMvc` is the thing that switches
off the Boot configurtation.

Fixes gh-583
2014-03-26 08:45:32 +00:00
Phillip Webb 9d0ac86887 Polish 2014-03-21 11:38:46 -07:00
Dave Syer 48636e3d6e Add additional grouping of property sources by profile
Before this change the PropertySources loaded from external config
files were just added to the list for resolution in the order that
they were loaded. That worked for simple cases, but when there are
profiles active, and files themselves can activate profiles, it led
to users not being able to change default settings easily (either
on command line or in files, mostly in files).

The solution proposed here is to group PropertySources by profile
and resolve them in order of profile first, and then in order of
the files being loaded.

There are additional shenanigans because the order of the files
being loaded also has to be carefully defined. The rule for users
is that in a list of files to load (e.g. if set via
spring.config.location), the last one wins (natural if you think of
it as a merge of multiple maps). In addition, anything specified
by a user takes precedence over the defaults (which was broken in
some scenarios before).

Additionally, fixes profile ordering in @ConfigurationProperties(path=...)

Fixes gh-483
2014-03-21 17:01:43 +00:00
Phillip Webb a79ff19b00 Replace confusing '+' profile syntax.
Replace the confusing `spring.profiles.active` `+` syntax with a new
`spring.profiles.include` property.

Fixes gh-483, Fixes gh-534
2014-03-20 08:27:18 +00:00
Phillip Webb 5cb8e4100c Polish docs
Minoir polish for wrapping at 90 and tabs instead of spaces.
2014-03-18 10:23:54 -07:00
Dave Syer 9f532b653f Add docs for RestTemplates test utils
Fixes gh-500
2014-03-18 08:46:36 +00:00
Dave Syer d0cd1df978 Documentation for @IntegrationTest
Fixes gh-499
2014-03-18 08:37:04 +00:00
Phillip Webb d9de3f57bd Update test dependencies documentation
Change working since test dependencies cannot easily be replaced.
2014-03-17 14:30:16 -07:00
Phillip Webb 5ed6d456d2 Clarify log PID in documentation 2014-03-17 14:28:30 -07:00
Phillip Webb 156a2f5c63 Clarify YAML profile sample in documentation 2014-03-17 14:25:39 -07:00
Phillip Webb 345fa7a102 Simplify fluent builder documentation note. 2014-03-17 14:16:37 -07:00
Phillip Webb f0b6f6a516 Remove quotes from internal documentation links
Remove quote-marks from internal documentation links and instead favor
italics.
2014-03-17 14:14:45 -07:00
Stephane Nicoll 78f9afba90 Review first 8 parts of the doc
This commit mostly fixes typos but also improves slightly specific
areas, adding links when it make sense.
2014-03-17 12:39:30 -07:00
Phillip Webb 947b4f9d8f Add properties syntax highlighting for docs
Fixes gh-495
2014-03-17 00:04:57 -07:00
Phillip Webb 7a46ed0866 Port "how-to" section to the reference manual
Copy the existing markdown How-to readme content to the user manual,
converting to asciidoc.

See gh-295
2014-03-13 13:47:22 -07:00
Phillip Webb 163509b5e5 Add initial reference manual documentation
See gh-295
2014-03-13 13:47:22 -07:00