Commit Graph

7761 Commits

Author SHA1 Message Date
Phillip Webb e992d389e7 Merge pull request #5644 from venilnoronha/issue-5631-fix
* issue-5631-fix:
  Polish contribution
  Support ActiveMQ trusted packages
2016-04-10 07:48:41 -07:00
Phillip Webb 0c0be1e626 Polish contribution 2016-04-10 07:48:31 -07:00
Venil Noronha d0ccea1b26 Support ActiveMQ trusted packages
Ass support for white-listing specific packages or trusting all packages
when using ActiveMQ.

Fixes gh-5631
Closes gh-5644
2016-04-10 07:34:09 -07:00
Phillip Webb bdd9d510eb Upgrade TomEE Tests to 1.7.4 2016-04-10 00:15:22 -07:00
Phillip Webb 84e091676b Fixup merge problem 2016-04-10 00:05:28 -07:00
Phillip Webb ae249f7568 Merge branch '1.3.x' 2016-04-09 23:53:26 -07:00
Phillip Webb a1284bce61 Configure ChildManagementContext container type
Ensure any ChildManagementContext created to start a management server
on a different port uses the same EmbeddedServletContainerFactory type.

Fixes gh-5474
2016-04-09 23:32:39 -07:00
Phillip Webb d7e56abdf3 Don't apply `null` ServerProperties from customize
Update ServerProperties so that `null` values are not applied when
customizing the EmbeddedServletContainerFactory. Primarily changed to
stop `server.undertow.accesslog.enabled` from being blindly applied.

Fixes gh-5515
2016-04-09 23:32:39 -07:00
Phillip Webb 3ca365cff0 Export MessageChannel metric writer
Update the auto-configured MessageChannelMetricWriter with
@ExportMetricWriter so that metrics are actually exported.

Fixes gh-5517
2016-04-09 23:32:38 -07:00
Phillip Webb 02764b8ff3 Support Jetty error page handling of PUT requests
Update JettyEmbeddedServletContainerFactory so that requests other than
just GET, POST and HEAD are handled by the ErrorHandler.

Fixes gh-5367
2016-04-09 23:32:38 -07:00
Phillip Webb 084b288947 Polish 2016-04-09 21:43:15 -07:00
Stephane Nicoll 725ae2c834 Fix typo 2016-04-09 19:59:15 +02:00
Phillip Webb 2364bcc117 Polish 2016-04-08 20:34:28 -07:00
Stephane Nicoll fbe53be6c1 Polish Hibernate 5 support
Closes gh-2763
2016-04-08 14:13:23 +02:00
Stephane Nicoll 99dae09f84 Improve caching documentation
Add a note regarding the use of `@EnableCaching(proxyTargetClass=true)`
for beans that are not interface based.

Closes gh-5527
2016-04-08 13:01:50 +02:00
Stephane Nicoll 4e4ea4b51f Polish 2016-04-08 09:23:30 +02:00
Phillip Webb d3f1d126f3 Merge pull request #4647 from craigburke/image-banner
* image-banner:
  Add image banner documentation
  Rework ImageBanner Support
  Add ImageBanner color distance calculation
  Support image based banners
2016-04-07 23:52:19 -07:00
Phillip Webb d058ddbe3b Add image banner documentation
Closes gh-4647
2016-04-07 23:21:18 -07:00
Phillip Webb 43d1d92611 Rework ImageBanner Support
Refactor several aspects of the ImageBanner:

- Extract a few new classes and methods from the previous code
- Directly encode ANSI rather than using `${}` properties
- Rework the scaling algorithm to prefer a fixed width
- Allow ImageBanner and TextBanner to be used together
- Rename several of the `banner.image` properties
- Add support for a left hand margin
- Add property meta-data

See gh-4647
2016-04-07 23:21:17 -07:00
Ruben Dijkstra 60500aef9b Add ImageBanner color distance calculation
Support CIE94 color distance calculations for improved ImageBanner
rendering. Based on code originally developed by Michael Simons and
added with his permission.

See gh-4647
2016-04-07 22:27:23 -07:00
Craig Burke 58d77ec961 Support image based banners
Add ImageBanner class that generates color ASCII art based on an image
file (banner.gif, banner.jpg or banner.png).

See gh-4647
2016-04-07 22:25:50 -07:00
Phillip Webb 6550bb4cf1 Polish 2016-04-07 12:20:10 -07:00
Phillip Webb 6ff09bc876 Clarify LoggingApplicationListener Javadoc 2016-04-07 11:38:26 -07:00
Andy Wilkinson 140e86bb97 Merge branch '1.3.x' 2016-04-07 17:51:17 +01:00
Andy Wilkinson 5e0ba6ea2e Consider jar's Class-Path attribute when getting changeable URLs
To overcome command length limits on Windows, IntelliJ IDEA may launch
an application with a single jar on the classpath that contains that
application's actual classpath in the Class-Path attribute of its
manifest. This would prevent DevTools restarts from working as it
only considered the single jar's URL when identifying changeable URLs
and ignored the URLs added to the classpath via the jar's manifest.

This commit updates ChangeableUrls when it is created from a
URLClassLoader to consider the Class-Path manifest attribute of any
jars in the class loader's URLs. This allows the full classpath to
be considered when identifying URLs that are changeable and that
need to be monitored for restart triggering.

Closes gh-5127
2016-04-07 17:44:38 +01:00
Andy Wilkinson 0b5d39c0b8 Merge pull request #5617 from Yogesh Lonkar
* gh-5617:
  Polish contribution
  Allow embedded Mongo's storage to be configured via the environment
2016-04-07 15:27:11 +01:00
Andy Wilkinson 436da1d5fd Polish contribution 2016-04-07 15:27:07 +01:00
Yogesh Lonkar dc8685a927 Allow embedded Mongo's storage to be configured via the environment
Closes gh-5617
2016-04-07 14:50:51 +01:00
Andy Wilkinson f9a86363b5 Merge pull request #5627 from Johnny Lim
* gh-5627:
  Polish
2016-04-07 14:48:44 +01:00
Johnny Lim 3b5ecbd066 Polish
Closes gh-5627
2016-04-07 14:47:18 +01:00
Andy Wilkinson f9b51cc870 Upgrade to Spring Session 1.2.0.RC2
Closes gh-5629
2016-04-07 14:36:57 +01:00
Andy Wilkinson 66830ea1e5 Try to make SampleCassandraApplicationTests' port config more robust 2016-04-07 14:34:37 +01:00
Andy Wilkinson 55ad905d98 Merge pull request #5623 from Eddú Meléndez
* gh-5623:
  Upgrade to Spring Data Hopper SR1
2016-04-07 13:08:44 +01:00
Eddú Meléndez cc7fe7b85a Upgrade to Spring Data Hopper SR1
Closes gh-5623
2016-04-07 13:08:21 +01:00
Andy Wilkinson e5a253e689 Improve diagnostics when OnBeanCondition type deduction fails
When @ConditionalOnBean or @ConditionalOnMissingBean are used on a
@Bean method, they will, in the absence of any other configuration,
attempt to deduce the bean's type by examining the method's return
type. This deduction can fail. See gh-4841, gh-4934, and gh-5624
for some examples of possible failure causes. Previously, this
failure was only logged as a debug message leaving the user with a
misleading message suggesting that the @ConditionalOnBean or
@ConditionalOnMissingBean annotation was not configured correctly.

This commit improves the diagnostics by mention the possibility of
type deduction in the exception message and including the exception
that caused deduction to fail as the cause.

Closes gh-4934
2016-04-07 12:26:07 +01:00
Andy Wilkinson a37ae5d556 Polish test property source changes made in 69b08291
TestPropertySourcesInitializer needs to be ordered with a high
precedence, specifically higher than
ContextIdApplicationContextInitializer, to ensure that any properties
used in setting the context’s id are available in the environment.

Closes gh-4828
2016-04-07 11:34:36 +01:00
Dave Syer 9b121dcbaa Make MustacheViewResolver extend AbstractTemplateViewResolver
The Mustache support should still be usable outside a web application
because the properties only use web stuff in that context and don't
have any field or method signatures that depend on web.

Fixes gh-5626
2016-04-07 10:58:15 +01:00
Andy Wilkinson 69b0829199 Align precedence of @SpringBootTest properties with @TestPropertySource
This commit updates the precedence of properties configured using
@SpringBootTest to align with @TestPropertySource. Properties configured
using properties on @SpringBootTest are now added to the same property
source as those configured using properties on @TestPropertySource so
the precedence described in the javadoc of @TestPropertySource now
applies in full. Additionally, if both @TestPropertySource properties
and @SpringBootTest properties configure the same property, the value
from @TestPropertySource will win.

Closes gh-4828
2016-04-07 10:41:07 +01:00
Stephane Nicoll 5f5db1703c Merge pull request #5622 from eddumelendez/gh-5621
* pr/5622:
  Add dependency jackson-module-kotlin
2016-04-07 07:14:37 +02:00
Eddú Meléndez e50aac73ed Add dependency jackson-module-kotlin
Auto-detection for Kotlin Jackson Module was added in Spring 4.3.0.RC1.
This commit provides the dependency management to handle the right
version.

Closes gh-5622
2016-04-07 07:14:03 +02:00
Phillip Webb 75c76838b5 Add Narayana reference documentation
Closes gh-5552
2016-04-06 19:16:34 -07:00
Phillip Webb 9f1466c9a3 Refine Narayana log directory logic
Refine the log directory logic used by Narayana so that it is consistent
with Atomikos and Bitronix.

See gh-5552
2016-04-06 19:13:38 -07:00
Phillip Webb ec33c59f6b Polish 2016-04-06 18:15:12 -07:00
Phillip Webb 1abfed2f23 Add Javadoc dependencies 2016-04-06 18:10:11 -07:00
Phillip Webb 69a80596ba Merge pull request #5552 from gytis/spring-boot-starter-jta-narayana
* spring-boot-starter-jta-narayana:
  Polish contribution
  Add Narayana JTA support
2016-04-06 17:05:23 -07:00
Phillip Webb 48800f1818 Polish contribution 2016-04-06 17:05:01 -07:00
Gytis Trikleris a2adc5a130 Add Narayana JTA support
Add support for JBoss Narayana.

Fixes gh-5552
2016-04-06 17:02:53 -07:00
Phillip Webb 1b146f89f0 Fix failing test 2016-04-06 16:59:34 -07:00
Phillip Webb 01c9d72644 Polish 2016-04-06 15:19:58 -07:00
Andy Wilkinson d1a487333d Merge branch '1.3.x' 2016-04-06 17:17:18 +01:00