Commit Graph

195 Commits

Author SHA1 Message Date
Dave Syer 97dcd24668 Merge branch '1.1.x' 2014-09-22 12:16:21 +01:00
Dave Syer a63d0b4e16 Update docs with DispatcherType.ERROR for filters
Some frameworks handle all requests in a Filter, so you have to
explicitly register it as an ERROR dispatcher.

See gh-1272
2014-09-22 12:15:02 +01:00
Phillip Webb 62a5ce52d0 Backport Jetty/Tomcat SSL support
Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1
2014-09-17 10:08:05 -07:00
Andy Wilkinson 284e7b2091 Merge branch '1.1.x' 2014-09-16 15:40:23 +01:00
Andy Wilkinson 468b6cb1f7 Add support for configuring RemoteIpValve’s internalProxies
Closes gh-1522
2014-09-16 15:40:18 +01:00
Andy Wilkinson 4b25b0e7a2 Allow Jackson features to be configured via the environment
Enhance JacksonAutoConfiguration to configure features on the
ObjectMapper it creates based on the following configuration
properties:

spring.jackson.deserialization.* = true|false
spring.jackson.generator.* = true|false
spring.jackson.mapper.* = true|false
spring.jackson.parser.* = true|false
spring.jackson.serialization.* = true|false

The final part of each property name maps onto an enum. The enums are:

deserialization: com.fasterxml.jackson.databind.DeserializationFeature
generator: com.fasterxml.jackson.core.JsonGenerator.Feature
mapper: com.fasterxml.jackson.databind.MapperFeature
parser: com.fasterxml.jackson.core.JsonParser.Feature
serialization: com.fasterxml.jackson.databind.SerializationFeature

Closes gh-1227
2014-09-16 09:59:59 +01:00
Phillip Webb 565e449d89 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/howto.adoc
2014-09-15 11:37:50 -07:00
Phillip Webb 5ba86a103d Polish 2014-09-15 11:35:16 -07:00
Christoph Frick 3b07e4e633 Fix typos in the documentation: though -> through
Closes gh-1510
2014-09-07 11:03:49 -05:00
Christoph Frick 5455b42d32 Fix typos in the documentation: though -> through
Closes gh-1510
2014-09-07 11:00:09 -05:00
Dave Syer 9a2f9825d1 Fix asciidoc syntax 2014-09-05 16:33:32 +01:00
Dave Syer 993c7691ec Fix recommended authentication configuration to match samples 2014-09-05 16:30:54 +01:00
Phillip Webb 35a840a396 Replace mavenCentral() with jcenter() in docs
Fixes gh-1373
2014-09-03 18:46:56 -07:00
Phillip Webb da5c36c3a9 Polish 2014-07-29 13:06:47 -07:00
Andy Wilkinson 0960908bd7 Add support for configuring SSL declaratively
Both Tomcat and Jetty can now be configured to use SSL via the
environment (typically application.properties or application.yml)

Closes #1084
2014-07-24 15:10:09 +01:00
Dave Syer a9b8563bb6 Fix typo (fixes gh-1273) 2014-07-21 14:07:29 +01:00
Andy Wilkinson 0a70bd44ed Correct the default Logback config location in the documentation
Fixes #1247
2014-07-21 11:39:43 +01:00
Phillip Webb 31014d86a4 Clarify resource filtering documentation
Fixes gh-1208
2014-07-08 00:17:00 -07: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
Phillip Webb f30b962ff9 Add support for unpacking nested JARs
Update the executable JAR code to automatically unpack any entries
which include an entry comment starting `UNPACK:` to the temp folder.
The existing Maven and Gradle plugins have been updated with new
configuration options and the `spring-boot-tools` project has been
updated to write the appropriate entry comment based on a flag passed
in via the `Library` class.

This support has been added to allow libraries such a JRuby (which
assumes that `jruby-complete.jar` is always accessible as file) to work
with Spring Boot executable jars.

Fixes gh-1070
2014-06-24 00:46:56 -07:00
Phillip Webb c713c8091d Polish 2014-06-23 19:41:22 -07:00
Dave Syer 0e5201abe2 Fix typos (see gh-1135) 2014-06-23 16:51:25 +01:00
Dave Syer 542896b28f Support for non-executable JAR in addition to the repackaged one
Stretches the Gradle boot plugin a bit, so there's a sample build
in the "profile" sample. Howto docs give examples.

Fixes gh-1135
2014-06-23 11:08:58 +01:00
Tadaya Tsuyukubo 5fbe5d4120 Add how-to remote debug from Gradle
Add a section to the reference documentation "how-to" about remote
debugging a Gradle started app.

Fixes gh-1129
2014-06-20 11:58:08 -07:00
Dave Syer f83395b40c Correct docs on BeanNameViewResolver (Fixes gh-1078) 2014-06-17 10:39:27 +01:00
Dave Syer c0efd3a22e Add clarification of ddl-auto and schema.sql 2014-06-12 06:48:44 +01:00
Phillip Webb 75a202e389 Add Spring Loaded, Gradle, IntelliJ "How-To"
Fixes gh-823
2014-06-09 17:27:33 -07:00
Phillip Webb 9a5d828f52 Polish docbook formatting 2014-06-09 16:34:54 -07:00
Phillip Webb 21029d2323 Polish disable repository documentation 2014-06-09 11:31:38 -07:00
Andy Wilkinson f47b40f683 Use spring-boot-version for dependency versions in Gradle Jetty example 2014-06-09 16:45:40 +01:00
Dave Syer 39a94428d3 Add @Conditionals to permit JPA/Mongo mixed usage
I decided to go with both approaches (make the autoconfig for
repositories @ConditionalOnMissingBean(RepositoryFactoryBeanSupport),
so the first one wins; and also make them conditional on
spring.data.*.repositories.enabled=true. The ordering problem
is still there really (it's not defined which repositories will
be created by the autoconfig), so if a user is going to have
2 repository implementations on the classpath, he is going to
have to either choose one to disable, or manualy @Enable* the
other one.

Fixes gh-1042
2014-06-09 09:48:40 +01:00
Phillip Webb e032b673a2 Polish DataSourceInitialization code
Rename a few classes and methods relating to DataSourceInitialization
and update the DataSourceInitializedPublisher to check for Hibernate
settings.
2014-06-06 22:56:44 -07:00
Stephane Nicoll 593d180cf3 Add a note regarding dependency overriding
Fixes gh-958
2014-06-05 16:37:35 +02:00
Stephane Nicoll a6702f5b87 Remove reference of mvnDebug
The maven plugin now forks a process to start the application so
mvnDebug cannot be used anymore. This commit replaces the reference
of mvnDebug to a link to an example of the maven plugin.

Fixes gh-992
2014-06-03 13:52:49 +02:00
Dave Syer 49a09c807c Defer SQL initialization to fit with JPA better
Added 2 new spring.datasource.* properties ("data" like
"schema", and "deferDdl" like the "spring.jpa.hibernate.*"
flag). The SQL scripts are then run separately and the "data"
ones are triggered by a new DataSourceInitializedEvent,
which is also published by the Hibernate DDL schema export.

Fixes gh-1006
2014-06-02 13:10:50 +01:00
Phillip Webb 3d76d9d73b Merge branch '1.0.x' 2014-05-28 10:23:33 +01:00
Phillip Webb 819b3b9761 Fix JasperInitializerLifecycleListener
Update JasperInitializerLifecycleListener to call JasperInitializer as
a ServletContainerInitializer (not a ServletContextInitializer).

Fixes gh-962
See gh-919
2014-05-28 10:21:10 +01:00
Phillip Webb 0ed4afd647 Fix a couple of velocity documentation issues
Fixes gh-961
2014-05-27 16:36:05 +01:00
Phillip Webb 6381fdcb49 Polish 2014-05-26 21:48:19 +01:00
Dave Syer 32295b9bdc Add options for Flyway to have its own DataSource
Either set flyway.[url,user,password] or create a DataSource
@Bean and mark it @FlywayDataSource.

Fixes gh-807
2014-05-26 08:55:28 +01:00
Eric Dahl 3457cc4f39 Fix multiple typos in documentation, as well as "thread.deamon" typo in actuator 2014-05-22 21:18:08 -05:00
Phillip Webb 8bcda1bcbe Polish 2014-05-20 18:26:56 +01:00
Dave Syer e118515d7a Use Flyway to bind flyway.*
Since Flyway has bean properties (with getters and setters)
it can be used to bin directly to the Environment (instead of
copying all the properties into FlywayProperties).

Fixes gh-806
2014-05-20 11:28:56 +01:00
Andy Wilkinson 2378fe0900 Add support for using Velocity templates 2014-05-19 12:01:20 +01:00
Dave Syer bfbb720d0a Add docs for Groovy Templates 2014-05-16 15:28:35 +01:00
Phillip Webb 01fcf61140 Polish 2014-05-15 09:51:16 +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 b5e608f102 Remove mention of missing starters 2014-05-14 13:42:04 +01:00
Lukasz Kryger 254b175c0a Read data-{platform}.sql in addition to data.sql
Update DataSourceAutoConfiguration to read platform specific `data.sql`
files in the same way as `schema.sql` files.

Fixes gh-837
2014-05-10 22:49:49 +01:00
Phillip Webb d9bf538e95 Document repackage in maven without parent POM
Fixes gh-811
2014-05-08 16:17:37 +01:00
Phillip Webb b5451d54ee Polish 2014-05-02 13:07:52 +01:00
Dave Syer 2cd7b13096 Drop 'spring' from 'spring.[liquibase,flyway]' 2014-05-02 11:15:37 +01:00
Dave Syer 5548b24c4c Add autoconfig support for Flyway migrations
Flyway starts up with its default settings if it is on the classpath.
You can also ask Boot to barf if the migration scripts are missing.

Fixes gh-730
2014-05-02 11:15:33 +01:00
Marcel Overdijk 68e33b25c1 Added liquibase autoconfiguration for database migrations
If Liquibase is on the classpath it will fire up on startup. Various
config options are available (as well as the option to disable it).
Liquibase uses a YAML format for changes (in classpath:db/changelog).
2014-05-02 11:12:12 +01:00
Dave Syer f81c01d490 @WebApplication->@WebAppConfiguration
Fixed gh-746
2014-04-30 22:02:21 +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
Phillip Webb 1ae91a135c Polish MultipartConfigElement support
Polish MultipartConfigElement changes introduced in commit e8e59ea6
as follows:

- Fix javadoc formatting
- Fix tab/spaces formatting
- Fix asciidoc formatting
- Move creation of MultipartConfigElement into MultipartProperties
- Add @Since tags
- Restore random port in tests
2014-04-25 15:57:43 +01:00
Josh Long e8e59ea657 MultipartConfigElement autoconfig support.
Fixes gh-708
2014-04-25 09:33:43 +01:00
Dave Syer 8f640c549f Correct copy-paste error in log4j config snippet 2014-04-24 11:28:48 +01:00
Phillip Webb 6268322c76 Tighten up documentation on SSL and HTTPS
Fixes gh-640
2014-04-23 23:24:59 +01:00
Phillip Webb 59496abf85 Add mvnDebug how-to
Fixes gh-713
2014-04-23 23:09:53 +01:00
Phillip Webb 51c403b636 Document how to customize dependency versions
Add a section to the "how-to" on customizing third-party dependency
versions when using Maven.

Fixes gh-434
2014-04-23 23:01:21 +01:00
Phillip Webb fad5ce45db Polish 2014-04-23 12:35:33 +01:00
Dave Syer 7401f7c643 Correct impression that DataSource platform is discovered automatically
... it isn't: you have to set spring.datasource.platform
2014-04-18 10:46:16 -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
Andy Wilkinson 24597ae423 Rename identifier in the howto so that it's unique 2014-04-11 10:13:56 +01:00
Dave Syer 59784cc37e Add JAXB mini-example to howto
Fixes gh-646
2014-04-11 07:07:34 +01: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
Phillip Webb 44d708ef7a Polish 2014-03-25 14:33:27 -07:00
Tomas Lin dae38224b7 Bad Tomcat 8 section reference to websockets pom
Removed this link "The websocket sample shows you how to do that in Maven." since the example no longer has properties that show how this is done. Dave Syer edited the section in a previous issue by adding the example to the POM ( https://github.com/spring-projects/spring-boot/issues/430 ) but it appears that the bad link was not removed.
2014-03-25 17:06:55 +00:00
Sebastien Deleuze 60ad7cd787 Fix quotes in a Gradle example 2014-03-25 16:36:46 +00:00
Rob Winch f852096c87 Security Documentation Cleanup
- Add link to Spring Security's Global Method Security Java Configuration
- Fix link to SecurityProperties
- Add link to SECURITY Common application properties
- Remove unnecessary @Order from SecurityConfiguration
- Change method signature for @Autowired AuthenticationManagerBuilder to
  compile / match Spring docs
2014-03-24 15:44:05 -07:00
hoserdude 5ef7bda47a minor doc changes based on RC5 migration experience 2014-03-22 14:47:19 +00:00
Dave Syer 373e2c5156 Allow user to opt out of ContentNegotiatingViewResolver
The bean ID for the ContentNegotiatingViewResolver is now
"viewResolver" (it is the *one*). The conditions have been changed
so that a user only has to define a bean of the same name to switch
it off.

Fixes gh-546
2014-03-22 14:44:30 +00:00
brockwmills 8b77a0298f Allow multiple connectors with Tomcat
Update TomcatEmbeddedServletContainerFactory to allow for additional
containers (e.g. SSL or AJP in addition to HTTP).

Fixes gh-528
2014-03-21 11:10:11 -07:00
Stephane Nicoll d6be3dfbb0 Add a note on maven filtering
This commit adds a documentation note explaining how to change
the delimiters used to filter maven tokens as these conflict with the
delimiters used by Spring (i.e. ${foo:default}).
2014-03-19 08:40:28 +00:00
Phillip Webb 913b6020d6 Minor doc polish 2014-03-18 11:26:15 -07: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
Stephane Nicoll 5ce1bdfb7f Review of the How-to part
This commit reviews the How-to part of the Spring boot doc,
fixing mostly typos.

See gh-521
2014-03-18 17:16:52 +00:00
Dave Syer d0cd1df978 Documentation for @IntegrationTest
Fixes gh-499
2014-03-18 08:37:04 +00: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
Dave Syer b8d85decad Fix typo 2014-03-17 08:19:21 +00:00
Phillip Webb 947b4f9d8f Add properties syntax highlighting for docs
Fixes gh-495
2014-03-17 00:04:57 -07:00
Phillip Webb d0275b4734 Fix some broken documentation links 2014-03-15 16:02:20 -07:00
Phillip Webb 630d2ddefe Port Add Maven example for Tomcat 8
Port Add Maven example for Tomcat 8 from markdown to asciidoc.
(originally from commit 15372cb737)
2014-03-15 13:02:02 -07:00
Phillip Webb 9f112ff8e0 Port ViewResolver docs
Port documentation originally added in commit b56bd0a10c
2014-03-15 13:02:02 -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