Commit Graph

50613 Commits

Author SHA1 Message Date
Stephane Nicoll
8c977567d9 Merge pull request #3344 from izeye/docs-20150628
* pr/3344:
  Polish doc
2015-06-28 06:34:14 -07:00
izeye
4bc7919e04 Polish doc
Closes gh-3344
2015-06-28 06:33:52 -07:00
Stephane Nicoll
a990cc1878 Merge pull request #3123 from bclozel/gh-1604
* pr/3123:
  Polish
  Improve Spring Resource Handling support
2015-06-28 06:32:16 -07:00
Stephane Nicoll
a6ccb4a6e0 Polish
Polish resource handling chain support. Make sure that the chain is
enabled automatically if at least one strategy is enabled.

See gh-1604
2015-06-28 06:32:07 -07:00
Brian Clozel
dd561d15cf Improve Spring Resource Handling support
This commit improves support of the Resource Handling features
introduced in Spring Framework 4.1. Those features add new ways to
resolve and transform static resources in applications.
See [this blog
post](https://spring.io/blog/2014/07/24/spring-framework-4-1-handling-static-web-resources)
for more details.

The `ResourceUrlEncodinFilter` is added for compatible template engines:
Velocity and Thymeleaf. It assists them with rewriting the URLs of
static resources when rendering templates.

New keys are added in the `ResourceProperties` in order to configure
the Resource Handling chain. `ResourceResolvers` and
`ResourceTransformers` are registered accordingly in
`WebMvcAutoConfiguration`.

Here is an example of enabling a `ContentVersionStrategy` on all
static resources, meaning their names will be changed for cache
busting purposes by adding a content hash at the end of the file name.
Like "/js/jquery.js -> /js/jquery-872ca6a9fdda9e2c1516a84cff5c3bc6.js".

```
spring.resources.chain.enabled:true
spring.resources.chain.strategy.content.enabled:true
spring.resources.chain.strategy.content.paths:/**
```

Closes gh-1604
Closes gh-3123
2015-06-28 06:32:07 -07:00
Phillip Webb
e34bdcdd9a Merge pull request #2713 from rob-baily/master
* pr/2713:
  Fix logout in sample secure web applications
2015-06-26 16:47:05 -07:00
Rob Baily
3c50386970 Fix logout in sample secure web applications
Fixes gh-1536
2015-06-26 16:44:04 -07:00
Phillip Webb
a36d1e2eed Attempt to fix failing log tests 2015-06-26 16:31:04 -07:00
Phillip Webb
b68382f3ba Polish 2015-06-26 16:06:11 -07:00
Phillip Webb
4f072f4046 Update logging documentation
Update logging documentation to show the new `-spring` convention and
the Logback extensions.

See gh-1788
See gh-2558
See gh-3338
2015-06-26 15:59:08 -07:00
Phillip Webb
055ace37f0 Support <springProperty> in logback configurations
Include support for a new <springProperty> element which can be used in
`logback-spring.xml` files to add properties from the Spring
Environment. For example:

	<configuration>
		...
		<springProperty name="destination" source="my.loggger.extradest"/>
		<appender name="FILE" class="ch.qos.logback.core.FileAppender">
			<file>${destination}</file>
				...
			</file>
		</appender>
		...
	</configuration>

Fixes gh-1788
2015-06-26 15:59:07 -07:00
Phillip Webb
f3f562f386 Support <springProfile> in logback configurations
Include support for a new <springProfile> element which can be used in
`logback-spring.xml` files to selectively enable or disable parts of the
configuration. For example:

	<configuration>
		...
		<springProfile name="staging">
			<logger name="sample.logback" level="TRACE" />
		</springProfile>
		...
	</configuration>

Fixes gh-3338
2015-06-26 15:59:07 -07:00
Phillip Webb
5bc8f0f708 Add logback sample application
Add a logback sample application to demonstrate how `logback-spring.xml`
can be used for customization.

See gh-2558
2015-06-26 15:59:07 -07:00
Phillip Webb
09eed727fe Add Spring specific logging configuration support
Update AbstractLoggingSystem to support convention based logging
configuration specifically for Spring applications. Configurations with
the `-spring` suffix will now be loaded automatically (for example
`logback-spring.xml`).

This change allows for custom log configurations without needing to
reinitialize the logging system. When standard configurations are used
there is no way to prevent early initialization.

Fixes gh-2558
2015-06-26 15:59:07 -07:00
Dave Syer
1f6ac52b96 Change default behaviour of /health when not secured
The default is now to reveal all details unless sensitive=true
(instead of only revealing then if sensitive was explicitly false).
The definition of "secure" also changes to something more sensible
where it is only true if security is enabled.

Fixes gh-2816
2015-06-26 13:44:52 +01:00
Dave Syer
c3c1d91f74 Fix Redis metrics default settings
The default should be to generate a key from the prefix. Otherwise
if user sets the prefix and not the key it can pick up metrics from
another repository (which is what happens in the tests).
2015-06-26 12:37:09 +01:00
Stephane Nicoll
e02082da99 Merge pull request #3335 from izeye/patch-27
* pr/3335:
  Remove unnecessary import
  Remove unnecessary `@After` callback
2015-06-26 08:26:40 +02:00
Stephane Nicoll
12767a43e2 Remove unnecessary import
See gh-3335
2015-06-26 08:26:16 +02:00
izeye
761c985337 Remove unnecessary @After callback
`@After` callback was trying to remove the wrong file anyway. This is
now taken care of by the `TemporaryFolder` rule.

Closes gh-3335
2015-06-26 08:25:18 +02:00
Stephane Nicoll
8b5d44a56d Merge pull request #3333 from izeye/patch-26
* pr/3333:
  Fix typo
2015-06-26 08:21:32 +02:00
izeye
0dc096f905 Fix typo
Closes gh-3333
2015-06-26 08:21:04 +02:00
Phillip Webb
5eb9cd012c Report logback errors in the exception
Update LogbackLoggingSystem to include status errors in the exception
rather than using `System.err`. Also perform additional cleanup in an
attempt to fix CI build failures.

Fixes gh-3309
2015-06-25 12:37:56 -07:00
Phillip Webb
7879743b9f Polish 2015-06-25 12:00:48 -07:00
Andy Wilkinson
bedca634c9 Add hamcrest-library to spring-boot's compile classpath
Fixes build break introduced in 31336c2.
2015-06-25 17:14:13 +01:00
Andy Wilkinson
c3d93f70b8 Fail fast when a Logback configuration file is missing or malformed
Closes gh-3309
2015-06-25 16:58:58 +01:00
Andy Wilkinson
31336c2dce Allow matchers to be used to verify output captured by OutputCapture
Closes gh-3330
2015-06-25 16:58:58 +01:00
Stephane Nicoll
0ec9de9137 Add support for value provider
Improve the "hints" section of the metadata so that each hint can provide
the reference to a value provider.

A value provider defines how a tool can discover the potential values of
a property based on the context. The provider is identifed by a name and
may have an arbitrary number of parameters.

Closes gh-3303
2015-06-25 14:58:10 +02:00
Stephane Nicoll
43b9ea53d6 Polish (avoid dot at the end of the line) 2015-06-25 11:58:21 +02:00
Stephane Nicoll
56b13800ae Fix json structure 2015-06-25 10:25:21 +02:00
Stephane Nicoll
443fe3b9e6 Merge pull request #3326 from izeye/patch-25
* patch-25:
  Fix typos
2015-06-25 09:21:56 +02:00
izeye
e6a3099003 Fix typos
Closes gh-3326
2015-06-25 09:15:28 +02:00
Phillip Webb
689fb0c877 Merge pull request #3314 from izeye/patch-24
* pr/3314:
  Use `bytes.length` in Base64Encoder loop
2015-06-24 21:08:24 -07:00
izeye
286c98d716 Use bytes.length in Base64Encoder loop
Update Base64Encoder to use `bytes.length` instead of `encoded.length`
when lopping over the bytes.

Fixes gh-3314
2015-06-24 21:08:10 -07:00
Phillip Webb
855e5a8e5f Minor doc polish 2015-06-24 20:42:16 -07:00
Phillip Webb
f8e5bfde2b Merge pull request #3320 from ralscha/patch-1
* pr/3320:
  Fix type in deployment documentation
2015-06-24 20:40:52 -07:00
Ralph Schaer
f5830bf46e Fix type in deployment documentation
Replace use of `link -s` with `ln -s`.

Fixes gh-3320
2015-06-24 20:39:43 -07:00
Phillip Webb
9e5239a819 Merge pull request #3321 from mbenson/uberjar
* pr/3321:
  Update documentation to remove 'shaded jar' term
2015-06-24 20:39:15 -07:00
Matt Benson
f2dfb040ab Update documentation to remove 'shaded jar' term
Update documentation section that discusses uber jars since it conflates
the concepts of the uber jar and the shading of dependencies into jars
(which may or may not be true uber jars).

Fixes gh-3321
2015-06-24 20:37:27 -07:00
izeye
98ce54c4c3 Fix typo in test methods' names 2015-06-24 20:36:01 -07:00
Phillip Webb
4236a9336d Make FlywayMigrationStrategy an interface
Change FlywayMigrationStrategy from a class to an interface.

Fixes gh-3217
2015-06-24 20:34:06 -07:00
Phillip Webb
134bc02404 Extract common metric Buffer code
Extract common features from CounterBuffers and GuageBuffers into
a shared superclass. The new extracted types allows the service
implementations to be simplified.

Fixes gh-3257
2015-06-24 20:05:37 -07:00
Phillip Webb
291388affe Make EventPublishingRunListener Ordered 0
Update EventPublishingRunListener to implement Ordered and use a default
order of 0. This allows for other run listeners to be added either
before or after it.

Fixes gh-3305
2015-06-24 16:24:44 -07:00
Phillip Webb
778e3eb091 Polish 2015-06-24 16:15:12 -07:00
Stephane Nicoll
bc9321734f Add support for property hint
Create a new section in the meta-data called "hints" where users can
provide hints about a given property. The most basic use case for now
is to provide a list of values that a property can have. Each value may
have a description.

This sample JSON provides a basic example for a property called `foo.mode`
that exposes 3 values: "auto", "basic" and "advanced".

```
 "hints": [
    {
      "id": "foo.mode",
      "values": [
        {
          "value": "auto",
          "description": "Some smart description."
        },
        {
          "name": "basic"
        },
        {
          "name": "advanced"
        }
      ]
    }
]
```

This information can be read by tools (such as IDE) and offer an
auto-completion with the list of values.

Closes gh-2054
2015-06-24 18:53:11 +02:00
Andy Wilkinson
9aa445bf46 Merge branch '1.2.x' 2015-06-24 17:13:39 +01:00
Andy Wilkinson
f8fdcc1312 Include value of java.io.tmpdir in message when createTempFile fails
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
2015-06-24 17:13:18 +01:00
Stephane Nicoll
af1afeaf48 Merge branch '1.2.x' 2015-06-24 17:20:49 +02:00
Stephane Nicoll
982b81c675 Fix datasource metrics doc
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
2015-06-24 17:20:31 +02:00
Stephane Nicoll
41b4d41f11 Remove dead code 2015-06-24 15:57:43 +02:00
Stephane Nicoll
e9baa779cc Remove dead code 2015-06-24 15:52:27 +02:00