- 23 Jun, 2015 2 commits
-
-
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 9 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
-
Phillip Webb authored
-
Andy Wilkinson authored
Closes gh-3207
-
Stephane Nicoll authored
This is related to 38cca9c1 but for the Rabbit support. Update RabbitAnnotationDrivenConfiguration to only associate a JTA transaction manager, if any. Closes gh-3222
-
- 14 Jun, 2015 2 commits
-
-
Stephane Nicoll authored
AmqpAdmin does not require a CachingConnectionFactory. Using the more general CachingConnectionFactory provides more flexibility. Closes gh-3220
-
Stephane Nicoll authored
Closes gh-3218
-
- 10 Jun, 2015 5 commits
-
-
Andy Wilkinson authored
Previously, spring.groovy.template.configuration.* was mapped onto both GroovyTemplateProperties.configuration and GroovyMarkupConfigurer. The former being a Map and the latter being specific type with getters and setters. This clash caused problems with the IDE support. GroovyTemplateProperties.configuration appeared to be dead code so it was removed in 326bdf29. Unfortunately this broke the use of spring.groovy.template.configuration.* properties as GroovyTemplateProperties uses a prefix of spring.groovy.template and it no longer had a configuration property. This commit addresses the problem by updating GroovyTemplateProperties to ignore unknown fields. This allows spring.groovy.template.configuration.* properties to be used and bound to GroovyMarkupConfigurer without reintroducing the clash which prompted the initial change. Closes gh-3198
-
Andy Wilkinson authored
Closes gh-3176
-
Andy Wilkinson authored
Closes gh-3191
-
Andy Wilkinson authored
Closes gh-3190
-
Lugi Cardito authored
If the `repackage` goal defines an output directory that does not exist, the maven plugin now creates it. Closes gh-3136
-
- 09 Jun, 2015 3 commits
-
-
Andy Wilkinson authored
The build currently fails intermittently when an external container, usually TomEE or Wildfly, fails to start within the default timeout period of two minutes. This commit updates the timeout to 5 minutes for all containers (Tomcat, TomEE and Wildfly) in the hope that it will help to stabilise the CI build.
-
Andy Wilkinson authored
-
Eddú Meléndez authored
Closes gh-3122
-
- 08 Jun, 2015 3 commits
-
-
Stephane Nicoll authored
Closes gh-3060
-
Stephane Nicoll authored
-
Stephane Nicoll authored
Closes gh-3121
-