Commit Graph

3713 Commits

Author SHA1 Message Date
Dave Syer
de3ce18ad6 Defensive check for cglib proxy in RequestMappingEndpoint
Since AbstractHandlerMethodMapping.getHandlerMap() is final it can't
be cglibbed and a proxy will barf if you try and call that method.
The RequestMappingEndpoint can be protected simply by defensively
checking if the mapping is a proxy before trying to inspect it.
2014-12-10 10:49:01 +00:00
Phillip Webb
e772174019 Update reference documentation for Spring Boot 1.2
Various updates and polish to prepare the reference documentation for
Spring Boot 1.2.

Fixes gh-1903
2014-12-10 00:56:41 -08:00
Phillip Webb
a0ce04ac4b Drop Cloudbees PaaS documentation
Remove the Cloudbees section since they are shutting down their PaaS.

Fixes gh-2105
2014-12-10 00:56:37 -08:00
Phillip Webb
e5295c0142 Update HealthInformation reference documentation
Clean and align with changes in Spring Boot 1.2

Fixes gh-2104
2014-12-10 00:51:30 -08:00
Phillip Webb
71fd3b36b4 Update "logging" reference documentation
Update the logging section to reflect changes in Spring Boot 1.2

Fixes gh-1790
2014-12-10 00:50:37 -08:00
Phillip Webb
119a5656e2 Update SpringBootServletInitializer ref docs
Add a hint to show that the `configure` method is now optional.

Fixes gh-2074
2014-12-10 00:49:31 -08:00
Phillip Webb
400b664098 Update "banner" reference documentation
Fixes gh-2103
2014-12-10 00:48:29 -08:00
Phillip Webb
b63922d59d Polish 2014-12-10 00:34:54 -08:00
Phillip Webb
a8ae4d1a3f Only include zip files when using spring jar
Update JarCommand to only include nested libraries that are actually
zip files. Similar to commit 38585bf3 which introduced the same
functionality to the Repackager.

Fixes gh-2094
2014-12-09 14:16:35 -08:00
Phillip Webb
3523bca79b Polish 2014-12-09 14:16:14 -08:00
Phillip Webb
f49d3518a8 Javadoc SpringBootServletInitializer with @Ordered
Fixes gh-2098
2014-12-09 13:39:02 -08:00
Phillip Webb
47469ab103 Support configurable Undertow listen addresses
Fixes gh-2097
2014-12-09 10:49:29 -08:00
Phillip Webb
78241ff0e2 Fix (again) ResourceBannerTests failures on Windows
Fixes gh-2096
2014-12-09 10:17:57 -08:00
Phillip Webb
f1cf66163e Fix ResourceBannerTests failures on Windows
Fixes gh-2096
2014-12-09 10:02:40 -08:00
Phillip Webb
a69afa0dca Support ServletContextListener with Jetty 9
Call `context.getServletContext().setExtendedListenerTypes(true)` to
ensure that ServletContextListeners can be registered with Jetty 9.

Fixes gh-2058
2014-12-09 09:20:55 -08:00
Stephane Nicoll
16164b30a9 Do not exclude Flyway's MigrationVersion
flyway.init and flyway.target are two options that are missing from the
meta-data following the change in f0bc3c0. It turns out that both these
properties have an additional setter taking a String so they shouldn't be
excluded after all

Closes gh-2088
2014-12-09 18:17:09 +01:00
Stephane Nicoll
1da0deeef6 Add missing keys in appendix 2014-12-09 18:04:47 +01:00
Stephane Nicoll
4164cad077 Add meta-data for banner keys
Fixes gh-2093
2014-12-09 14:51:44 +01:00
Stephane Nicoll
d59718447b Upgrade to Spring Framework 4.1.3
Closes gh-2038
2014-12-09 12:29:11 +01:00
Phillip Webb
9c66624deb Polish 2014-12-08 23:12:45 -08:00
Phillip Webb
7dbe0474b9 Merge branch '1.1.x' 2014-12-08 21:54:01 -08:00
Phillip Webb
1c031abdd2 Fix session timeout default value
Update DEFAULT_SESSION_TIMEOUT to use TimeUnit.MINUTES.toSeconds(30)
rather than TimeUnit.SECONDS.toMinutes(30) which would always return
0.

See gh-2084
(cherry picked from commit b33bbd56)
2014-12-08 21:53:34 -08:00
Phillip Webb
2f03351cf6 Fix auto-configuration order for Spring Data Rest
Update Rest, Hypermedia and HttpMessageConverter auto-configuration to
ensure beans are created in the correct order.

Prior to this commit the MappingJackson2HttpMessageConverter bean would
not be created because Spring Data Rest's TypeConstrained versions had
already been registered.

Fixes gh-1729
2014-12-08 21:45:35 -08:00
Phillip Webb
b33bbd56e7 Fix session timeout default value
Update DEFAULT_SESSION_TIMEOUT to use TimeUnit.MINUTES.toSeconds(30)
rather than TimeUnit.SECONDS.toMinutes(30) which would always return
0.

See gh-2084
2014-12-08 21:36:39 -08:00
Phillip Webb
4fc8a183f2 Add Jersey Jackson support
Fixes gh-2091
2014-12-08 19:13:57 -08:00
Phillip Webb
e6d46f5711 Revert "Defer WebApplicationContext initialization"
This reverts commit 17631486f2.
2014-12-08 18:58:35 -08:00
Phillip Webb
17631486f2 Defer WebApplicationContext initialization
Update SpringBootServletInitializer so that the WebApplicationContext is
not initialized until ServletContextListener.contextInitialized() is
called. This makes it easier to subclass SpringBootServletInitializer
to add additional listeners to be called in a specific order.

Fixes gh-2070
2014-12-08 18:21:24 -08:00
Stephane Nicoll
d33c0ebf8f Fix data type of telnet and ssh ports
Define shell.ssh.port and shell.telnet.port as integer properties
so that the generated meta-data exposes the proper type.

Fixes gh-2076
2014-12-08 17:25:50 -08:00
Sebastien Deleuze
27d9d7fd55 Add support for autowired Jackson handlers
Inject the ApplicationContext into Jackson2ObjectMapperBuilder to allow
Jackson handlers to be autowired. See SPR-10768.

Fixes gh-2081
2014-12-08 14:25:25 -08:00
Phillip Webb
4b7c6f61b4 Polish 2014-12-08 13:37:39 -08:00
Phillip Webb
f0bc3c08e1 Add additional ElementExcludeFilter items
Fixes gh-2088
2014-12-08 13:35:13 -08:00
Phillip Webb
2b91471286 Add formatted version numbers for banner expansion
Add `application.formatted-version` and `spring-boot.formatted-version`
properties for use in banner.txt files. The `application.version` and
`spring-boot.version` properties now return a simple version number
without any formatting.

Fixes gh-2090
2014-12-08 11:52:15 -08:00
Phillip Webb
4bfabfcf29 Ensure Undertow session timeout is set correctly
Assume that Undertow uses -1 for "no expiry".

See gh-2084
2014-12-08 11:20:44 -08:00
Phillip Webb
083f9757cd Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
2014-12-08 11:16:09 -08:00
Phillip Webb
c23a764a1c Set the default session timeout to 30 mins
Update AbstractConfigurableEmbeddedServletContainer to set the default
session timeout to 30 minutes. Also correct Javadoc to specify that
the default is '30 minutes'.

Fixes gh-2084
2014-12-08 11:12:40 -08:00
Phillip Webb
22e8478aa3 Cross-reference "Create a deployable war" how-to
Add a tip for both the Maven and Gradle "Packaging executable jar and
war files" section referring to the how-to.

Fixes gh-2086
2014-12-08 10:52:54 -08:00
Phillip Webb
7ae75c2707 Merge branch '1.1.x' 2014-12-08 09:26:49 -08:00
Phillip Webb
fcad7c4fde Guard for null BeanFactory in @ConditionalOnBean
See gh-2080
2014-12-08 09:25:12 -08:00
Phillip Webb
43e0cae0fa Merge branch '1.1.x' 2014-12-08 08:51:10 -08:00
Phillip Webb
d3ccdc6319 Polish 2014-12-08 08:51:01 -08:00
Phillip Webb
fc746b802a Polish 2014-12-08 08:48:55 -08:00
Phillip Webb
191204fadb Don't resolve ConfigurationProperties placeholders
Revert commit 3ad43e0d44 to give us
a little more time to consider how this will impact tooling.
2014-12-08 08:46:33 -08:00
Phillip Webb
6e0f1f3d98 Use wesocket dependency from Undertow starter 2014-12-08 08:45:41 -08:00
Stephane Nicoll
f40f17a758 Add missing description 2014-12-08 14:44:48 +01:00
Dave Syer
3ad43e0d44 Resolve placeholders in @ConfigurationProperties prefix 2014-12-08 09:23:36 +00:00
Dave Syer
79aa6e7713 Add undertow websockets dependency 2014-12-08 09:20:24 +00:00
Stephane Nicoll
826150ac41 Merge branch '1.1.x' 2014-12-08 08:41:12 +01:00
Stephane Nicoll
9b598b49c2 Fix JMS support in the CLI
Partly back port changes from affb202e and 85c95744f to fix the usage
of JMS in the CLI. Restore the integration test using HornetQ and fix the
coordinates of the JMS API.

Fixes gh-2075
2014-12-08 08:39:47 +01:00
Phillip Webb
b651090fcd Document how-to for Weblogic deployment
Fixes gh-2078
2014-12-07 20:11:48 -08:00
Phillip Webb
1ca73a9f46 Improve exception message for Weblogic
Ensure that a sensible exception message is thrown if the user happens
to include the logback jar in their deployment.

Fixes gh-2077
2014-12-07 20:11:40 -08:00