- 01 Jul, 2015 7 commits
-
-
Andy Wilkinson authored
Closes gh-3382
-
Andy Wilkinson authored
Closes gh-3381 Closes gh-3383
-
Andy Wilkinson authored
Closes gh-3380
-
Andy Wilkinson authored
Closes gh-3379
-
Andy Wilkinson authored
Previously, JacksonHttpMessageConvertersConfiguration would configure a general-purpose MappingJackson2HttpMessageConverter only if there was no existing MappingJackson2HttpMessageConverter in the application context. This was problematic when a TypeConstrainedMappingJackson2HttpMessageConverter bean was present. Such a bean is only capable of performing conversion for a specific type, and therefore is no substitute for a general purpose converter, yet its presence was causing the auto-configuration of a general purpose converters to be turned off. This would leave Spring MVC’s default converter being used for application/json requests which would not honour the user’s Jackson configuration. This commit enhances @ConditionalOnMissingBean so that the annotation can be used to specify one or more types that should be ignored when searching for beans. This allows the TypeConstrainedMappingJackson2HttpMessageConverter beans that are published by Spring Data REST to be ignored such that the general-purpose MappingJackson2HttpMessageConverter is still auto-configured. Fixes gh-2914
-
Andy Wilkinson authored
Closes gh-3369
-
sopov.ivan authored
Closes gh-3375
-
- 30 Jun, 2015 6 commits
-
-
Phillip Webb authored
Update MustacheViewResolver so that buildView() is called to create the MustacheView. This sets fields such as `contentType` and allows us to remove explicit setApplicationContext() and setServletContext() calls. Fixes gh-3265
-
Phillip Webb authored
Fixes gh-3276
-
Phillip Webb authored
Fixes gh-3356
-
Andy Wilkinson authored
GzipFilterProperties uses HttpMethod so GzipFilterAutoConfiguration, which uses GzipFilterProperties, needs to be conditional on HttpMethod being on the classpath. Closes gh-3362
-
Phillip Webb authored
* pr/3324: Fixup sample Ant build
-
Matt Benson authored
Fixes gh-3324
-
- 24 Jun, 2015 2 commits
-
-
Andy Wilkinson authored
If java.io.tmpdir is configured to a directory that does not exist, calls to File.createTempFile will fail with an IOException with the message "The system cannot find the path specified". Unfortunately, the path the was specified is not included in the message. Rather than trying to automatically create the directory in what may be a misconfigured location, we now include the value of java.io.tmpdir in our own exception's message. Hopefully this will help users to figure out what they've done wrong. Closes gh-3307
-
Stephane Nicoll authored
The maximum and minimum number of connections are no metrics so these are not exposed. Fix the doc that stated the contrary. Fixes gh-3319
-
- 23 Jun, 2015 3 commits
-
-
Phillip Webb authored
-
Onur Kağan Özcan authored
Closes gh-3308
-
Matt Benson authored
Closes gh-3299
-
- 22 Jun, 2015 6 commits
-
-
Andy Wilkinson authored
Previously, when an exception was thrown by a Controller in an application deployed to a servlet container the exception that was handled would be Spring Framework’s NestedServletException rather than the exception thrown by the application. Furthermore, when an exception was thrown or the response was used to send an error, the javax.servlet.error.request_uri request attribute would not be set. This differed from the behaviour in an executable jar/war where the exception would be the one thrown by the application, and the request_uri attribute would be set. This commit updates ErrorPageFilter, which is only involved in a servlet container, to unwrap a NestedServletException so that it’s the application’s exception that’s handled, and to set the request_uri attribute in the event of an exception being thrown or an error being sent. Closes gh-3249
-
olivier bourgain authored
Closes gh-3027
-
Andy Wilkinson authored
Previously, an address that ended in a "/" would result in the virtual host being an empty string. This was inconsistent with setVirtualHost which would map an empty string to "/". This commit updates the address parsing logic to call setVirtualHost rather than assigning the value directly to this.virtualHost. This ensures that the special handling for an empty string is applied consistently. Closes gh-3304
-
Andy Wilkinson authored
By default, SpringApplication attempts to deduce the application class by looking for a main method in the stack. This does not work when the application is launched by a servlet container via SpringBootServletInitializer as there's either no main method in the stack, or the main method is that of the servlet container, rather than the application. This commit updates SpringBootServletInitializer to configure the main class of the SpringApplication that it creates to be the application's SpringBootServletInitializer subclass. This is done prior to calling configure, so the main class can still be specified by the application if required. Closes gh-3061
-
Andy Wilkinson authored
Closes gh-3289
-
Stephane Nicoll authored
Closes gh-3302
-
- 21 Jun, 2015 1 commit
-
-
Josh Thornhill authored
Closes gh-3298
-
- 19 Jun, 2015 2 commits
-
-
Phillip Webb authored
* gh-3255: Ignore failures when closing war files in tests
-
Matt Benson authored
Update WarPackagingTests to ignore any IOExceptions when closing created war files. Exceptions were sometimes thrown when running on a Linux NTFS mount. Fixes gh-3255
-
- 18 Jun, 2015 6 commits
-
-
Phillip Webb authored
-
Andy Wilkinson authored
See gh-3274
-
Andy Wilkinson authored
See gh-3276
-
Andy Wilkinson authored
See gh-3274
-
Andy Wilkinson authored
Previously, DefaultRepositorySystemSessionAutoConfiguration would read the local repository configuration from settings.xml, but did not perform any property interpolation. This would leave placeholders such as ${user.home} as-is and result in the use of the wrong location. To address this, the code that reads settings.xml has been updated to provide the current System properties as a property interpolation source. RepositoryConfigurationFactory configures the local repository as a "remote" repository when the local repository location has been overridden. This allows spring grab to copy dependencies from the local repository into the grab output location (configured via the grape.root system property) rather than having to download them again. This logic did not consider the customization of the local repository location via settings.xml so the dependencies would be downloaded again. To address this, RepositoryConfigurationFactory has been updated to attempt to use the location configured in settings.xml, before falling back to the default location. The logic that reads settings.xml has deliberately been duplicated. It could have been extracted into a separate class, but this is only a temporary measure until gh-3275 is tackled. Duplication was deemed preferable to adding a new public class in 1.2.x that we’d then want to remove in 1.3. Closes gh-3274
-
Stephane Nicoll authored
Closes gh-3273
-
- 16 Jun, 2015 1 commit
-
-
Phillip Webb authored
Create an EmbeddedVelocityToolboxView which supports loading toolbox.xml files from the application classpath as well as the ServletContext. The VelocityAutoConfiguration class has been updated to use the new view. This change allows the `spring.velocity.toolbox-config-location` property to work with embedded servlet containers. Fixes gh-2912
-
- 15 Jun, 2015 6 commits
-
-
Oliver Gierke authored
Update EntityScanRegistrar so that multiple @EntityScan annotations can be used with a single application. Previously, when an application used multiple annotations only the first one found would get applied. This changes alters that to augment the packages that will be scanned. Fixes gh-2757
-
Artur Mkrtchyan authored
Update appendix example to use the more common `/var/log` folder rather than `/var/logs`. Fixes gh-3225
-
Phillip Webb authored
-
Ben Hale authored
Previously, the VcapApplicationListener would discard any service credential value that wasn't a String, Number, Map, Collection, or null. This was particularly a problem for services that exposed a value as a JSON boolean. This change takes booleans in the credential payload into account, converting them to Strings so that they will pass through the properties system properly. There's no real downside to this as Spring will coerce them back into Booleans if needed, by the application. Fixes gh-3237
-
Phillip Webb authored
-
Phillip Webb authored
Fixes gh-3209
-