Commit Graph

3089 Commits (316e5f78f9620dae9ad52667831c3f3fca81c166)
 

Author SHA1 Message Date
Andy Wilkinson 316e5f78f9 Merge branch '1.1.x' 10 years ago
Andy Wilkinson f7d1f968b9 Improve error message when JarFile encounters a compressed nested jar
Closes gh-1643
10 years ago
Dave Syer dd8db93781 Merge branch '1.1.x' 10 years ago
Dave Syer 79deed7ec5 Remove extra trailing '-' in metric name 10 years ago
Dave Syer bfb387bc02 Default prefix for redis keys doesn't need period 10 years ago
Dave Syer 8d5f26f6bd Fix missing resource exception if spring-cloud not on classpath 10 years ago
Marcel Overdijk e070d55491 Make Jackson date format and property naming strategy configurable
Allow the environment to be used to configure Jackson's date format
and property naming strategy

Closes gh-1628
10 years ago
Andy Wilkinson fcd855cd5e Merge branch '1.1.x' 10 years ago
Andy Wilkinson 8fcf355d71 Merge branch 'gh-1627' into 1.1.x 10 years ago
Andy Wilkinson 61e90f5b6e Add tests to Data REST sample for search operations
Closes gh-1627
10 years ago
bangsen.yin b798d001d7 Add missing @Param annotations to CityRepository in Data REST sample
Without the @Param annotations, using either of the search URIs would
resulted in a 400 response and an error describing the lack of @Param
annotation.

See gh-1627
10 years ago
Stephane Nicoll 8b0d64522c Merge pull request #1633 from johnktims/master
* pull1633:
  Fix typo in javadoc
10 years ago
John Tims bebbe92fef Fix typo in javadoc 10 years ago
Phillip Webb d1c5c90ca9 Merge pull request #1609 from hekonsek/spring-boot-amq-version-upgrade
* spring-boot-amq-version-upgrade:
  Upgraded ActiveMQ version to 5.10.0
10 years ago
Henryk Konsek 7f20f5d4f8 Upgraded ActiveMQ version to 5.10.0
Fixes gh-1609
10 years ago
Phillip Webb 32641abae4 Merge pull request #1618 from mkanev/master
* pull1618:
  Add UTF-8 charset element to logback base.xml
10 years ago
Maksim Kanev 6b5de38fef Add UTF-8 charset element to logback base.xml
Update base logback configuration to include a UTF-8 charset element
which helps with multilanguage support.

Fixes gh-1618
10 years ago
Phillip Webb a7a337a14f Merge branch '1.1.x' 10 years ago
Phillip Webb d0990c06a6 Fix typo in HttpMessageConverters auto-conf Tests 10 years ago
Phillip Webb e156e1a7f6 Merge branch '1.1.x'
Conflicts:
	all pom.xml files
10 years ago
Phillip Webb 4f9258a345 Fixup version numbers following release 10 years ago
Spring Buildmaster edb4b7ed7d Next development version 10 years ago
Phillip Webb b9edf3c500 Merge branch '1.1.x' 10 years ago
Phillip Webb fa02c01727 Polish 10 years ago
Phillip Webb 08f2522eba Add missing @since tag 10 years ago
Phillip Webb 1ed90df630 Merge branch '1.1.x' 10 years ago
Phillip Webb bff39e954e Add `server.tomcat.port-header` support
Update Tomcat ServerProperties to support the RemoteIpValve portHeader
property.

Fixes gh-1616
10 years ago
Phillip Webb 0dc46a2fe7 Drop protocolHeader and remoteIpHeader defaults
The `protocolHeader` and `remoteIpHeader` no longer have default values
and must be opt-in.

Fixes gh-1624
10 years ago
Andy Wilkinson 0c63406b49 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 72ef1d6554 Update ErrorPageFilter so it won’t try to forward a committed response
In some scenarios, the ErrorPageFilter will want to forward the request
to an error page but the response has already been committed. One common
cause of this is when the filter’s running on WAS. WAS calls
flushBuffer() (which commits the response), upon a clean exit from a
servlet’s service method.

Previously, the filter would attempt the forward, even if the response
was committed. This would result in an IllegalStateException and a
possibly incomplete response that may also have an incorrect status
code.

This commit updates the ErrorPageFilter to check to see if the response
has already been committed before it attempts to forward the request to
the error page. If the response has already been committed, the filter
logs an error and allows the container’s normal handling to kick in.
This prevents an IllegalStateException from being thrown.

This commit also updates the response wrapper to keep track of when
sendError has been called. Now, when flushBuffer is called, if
sendError has been called, the wrapper calls sendError on the wrapped
response. This prevents the wrapper from suppressing an error when the
response is committed before the request handling returns to the error
page filter.

Closes gh-1575
10 years ago
Phillip Webb abed1f4d4c Restore ThymeleafAutoConfiguration test
Restore the test removed during the merge.
10 years ago
Phillip Webb 38585ec4eb Merge branch '1.1.x' 10 years ago
Phillip Webb 258059ea08 Fix failing ThymeleafAutoConfigurationTests
Remove accidental addition of a 1.2 test.
10 years ago
Dave Syer 9d9819c338 Merge branch '1.1.x' 10 years ago
Dave Syer c1404b1e41 Tidy some Javadocs 10 years ago
Phillip Webb 0d0e5eb590 Merge branch '1.1.x' 10 years ago
Dave Syer 336b96b81c Copy server customization to management context
If the actuator endpoints are configured on a different port then there
are some settings in the main ServerProperties that we would like to
re-use (e.g. the access log). The easiest way to do that is to just
configure the management server using the same ServerProperties instance
and then overwrite the things that are different (and stored in
ManagementServerProperties).

Fixes gh-1581
10 years ago
Dave Syer 304920df07 Make Thymeleaf @ConditionalOnWebApplication
If user creates a Thymeleaf app with a parent-child context then the
child should contain all the web-specific pieces (and they are likely
to fail fast if they need to be ServletContextAware, or slower if they
try to locate a WebApplicationContext at runtime). This can't happen
if the view resolver is being added to the parent.

Freemarker and Velocity already have similar tests because it is assumed
that they should be usable outside a web app, so this change just does the
same for Thymeleaf.

Fixes gh-1611
10 years ago
Stéphane DERACO 68ff7d4592 Fix broken documentation links
Fix links to `actuator-noweb`, `actuator-log4j` and `hornetq` samples.

Fixes gh-1613
10 years ago
Phillip Webb 0b50fe4eff Support String to char[] bindings
Update RelaxedConversionService to also support String to char[]
conversion. Primarily to support the `password` field in
MongoProperties.

Fixes gh-1572
10 years ago
Phillip Webb 55a84c7bd7 Merge branch '1.1.x' 10 years ago
Phillip Webb 23ff7c91d6 Add debug logging to ConfigFileApplicationListener
Update ConfigFileApplicationListener to include more debug level output.
Debug messages are recorded during onApplicationEnvironmentPreparedEvent
but not actually output until onApplicationPreparedEvent. This is
because the logging level might not have been correctly set until the
context is completely prepared.

Fixes gh-1584
10 years ago
Phillip Webb 142216400a Polish formatting 10 years ago
Andy Wilkinson b4c94f427a Merge branch '1.1.x' 10 years ago
Andy Wilkinson c420249f7d Detect startup failures in additional Tomcat connectors
Previously, only the state of the primary connector was checked when
verifying that the embedded Tomcat instance has started successfully.
This commit updates the verification logic to examine all of the
service's connectors, thereby also detecting startup failures of any
additional connectors the have been configured.

A check on the primary connector's state has been removed from
initialize as, at this stage, its state will always be NEW.

Fixes gh-1591
10 years ago
Andy Wilkinson 5d1a114aa6 Merge branch '1.1.x'
Redundant @ConditionalOnMissingBean annotation has been removed.
ActiveMQConnectionFactoryConfiguration is not auto-configuration and
is imported by ActiveMQAutoConfiguration which is protected by
@ConditionalOnMissingBean(ConnectionFactory.class)
10 years ago
Andy Wilkinson cf22e28ddc Add tests to verify that ActiveMQAutoConfiguration backs off
See gh-1599
10 years ago
Andy Wilkinson 42821990f4 Merge branch '1.1.x' 10 years ago
Tomas Lin 38d8a5cda0 Fix typo in comment
Closes gh-1596
10 years ago
Dave Syer 97dcd24668 Merge branch '1.1.x' 10 years ago