Commit Graph

3197 Commits

Author SHA1 Message Date
Andy Wilkinson
7211571969 Fix some grammar issues in docs
Closes gh-1695
2014-10-13 13:18:24 +01:00
Andy Wilkinson
4308d1112c Merge branch '1.1.x' 2014-10-13 13:11:38 +01:00
Eric Dahl
16937746a0 Fix some grammar issues in docs 2014-10-13 12:22:14 +01:00
Andy Wilkinson
2b7bf3e733 Fix ArrayStoreException caused by JerseyAutoConfiguration
JerseyAutoConfiguration is annotated with @ConditionalOnClass. It
references both SpringComponentProvider.class and
ServletRegistration.class. Normally, this wouldn't be a problem as, in
the absence of either of those classes, the configuration class bean
will not be present in the bean factory and, therefore, its
annotations will never be introspected using reflection.

However, JerseyAutoConfiguration is a WebApplicationInitializer. This
means that when it's deployed to a standalone container,
JerseyAutoConfiguration is found by the container and its class is
passed to SpringServletContainerInitializer.
SpringServletContainerInitializer introspects every
WebApplicationInitializer class so that it can order them. This blows
up if Jersey's SpringComponentProvider class isn't on the classpath as
the annotation is referencing SpringComponentProvider as a Class and
the attempt to load it fails. The problem can be avoided by
referencing SpringComponentProvider using a String.

Fixes gh-1696
2014-10-13 11:21:55 +01:00
Phillip Webb
c90633aab6 Polish 2014-10-10 17:27:26 -07:00
Phillip Webb
3228cfa9bd Fixup version numbers following release 2014-10-10 15:53:54 -07:00
Spring Buildmaster
3e71a21b30 Next development version 2014-10-10 15:19:47 -07:00
Phillip Webb
c40aab657f Don't import JmsBootstrapConfiguration directly
Remove the direct unconditional JmsBootstrapConfiguration @Import from
JmsAnnotationDrivenConfiguration in favor of the nested
EnableJmsConfiguration class.

Fixes gh-1513
2014-10-10 14:08:24 -07:00
Phillip Webb
517b40d9b9 Don't call close() on JNDI DataSource
Update the JNDI auto-configured DataSource so that the close method
isn't called when the ApplicationContext is closed.

Fixes gh-1520
2014-10-10 13:49:15 -07:00
Phillip Webb
a3527521a2 Also resolve favicon.ico from resource folders
Update FaviconConfiguration to allow favicon.ico files to be resolved
from static resource folders (/META-INF/resources, /resources, /static,
/public) in addition to the root classpath.

Fixes gh-1656
2014-10-10 13:09:30 -07:00
Phillip Webb
a1bcd70377 Merge pull request #1688 from mvitz/master
* pull1688:
  Remove superfluous maven-antrun-plugin
2014-10-10 12:11:30 -07:00
Michael Vitz
81cba1f2ff Remove superfluous maven-antrun-plugin
Remove the maven-antrun-plugin from the pluginManagement section of
spring-boot-starter-parent since it is already declared in the
spring-boot-dependencies POM.

Closes gh-1688
2014-10-10 12:09:38 -07:00
Phillip Webb
001f2d6c69 Improve performance of MessageSource condition
Update the MessageSourceAutoConfiguration condition to skip scanning for
well known JARs. Results are now also cached.

Fixes gh-1689
2014-10-10 11:48:12 -07:00
Phillip Webb
828efb2589 Add more skip patterns to SkipPatternJarScanner
Improve startup performance by skipping more JARs that we know don't
contain servlet files.

Fixes gh-1687
2014-10-10 11:48:12 -07:00
Phillip Webb
9a88b626f9 Use StandardJarScanFilter.setTldSkip on Tomcat 8
Update SkipPatternJarScanner to apply skipped JARs to Tomcat 8's
StandardJarScanFilter.

Fixes gh-1686
2014-10-10 11:48:12 -07:00
Phillip Webb
dca637f51f Replace @ConditionalOnExpression with OnProperty
Replace where possible all @ConditionalOnExpression annotations with
@ConditionalOnProperty which is both faster to run and more descriptive.

Fixes gh-1685
2014-10-10 11:48:05 -07:00
Phillip Webb
7b33f286f5 Remove unnecessary compiler configuration
The new `maven.compiler.source` and `maven.compiler.target` properties
have removed the need for explicit configuration.

Closes gh-1684
2014-10-10 11:10:18 -07:00
Phillip Webb
7956ab58a5 Add maven.compiler.source and target properties
Add `maven.compiler.source` and `maven.compiler.target` properties to
the spring-boot-starter-parent to allow easier customization of the
maven compiler. Both properties default to `${java.version}`.

Fixes gh-1684
2014-10-10 11:01:30 -07:00
Phillip Webb
b87a591d27 Revert "Add ActiveMQ MQTT connection URL auto-detection"
This reverts commit 0d8bde58c9.

Fixes gh-1679
2014-10-09 19:24:47 -07:00
Phillip Webb
509c3aef4e Merge branch '1.1.x' 2014-10-09 19:23:57 -07:00
Phillip Webb
6028d92a4e Support Windows UNC paths with fat jars
Update `Launcher` and `JarFile` to correctly deal with Windows UNC
paths.

Fixes gh-1641
2014-10-09 19:06:28 -07:00
Phillip Webb
30f8954b4a Add @since tag 2014-10-09 13:04:44 -07:00
Phillip Webb
187b4e706c Escape ...*... outputs using +...*...+ 2014-10-09 13:04:35 -07:00
Phillip Webb
6281070d0a Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2014-10-09 13:00:27 -07:00
Phillip Webb
6009f41782 Polish 2014-10-09 12:58:55 -07:00
Phillip Webb
7e842aee77 Escape ...*... outputs using +...*...+ 2014-10-09 12:41:39 -07:00
Phillip Webb
4ecf50a1a9 Add hide-uri-scheme attribute to docs 2014-10-09 12:41:39 -07:00
Phillip Webb
2303c3aea9 Fix asciidoctor 'spaces' conversion issues 2014-10-09 12:41:39 -07:00
Dave Syer
9ba7a1860f Merge branch '1.1.x' 2014-10-09 19:14:51 +01:00
Dave Syer
3b2fb305c8 Add placeholder support to LoggingApplicationListener
When logging.level.* is set in external configuration they can now
contain placeholders.

Fixes gh-1680
2014-10-09 19:13:41 +01:00
Andy Wilkinson
4cf9e0457f Provide auto-configuration of persistence exception translation
Closes gh-1435
2014-10-09 16:19:33 +01:00
Dave Syer
fa95a6f6bd Merge branch '1.1.x' 2014-10-09 16:11:52 +01:00
Dave Syer
3135c7f8ae Escape strings in whitelabel error page (HTML) 2014-10-09 16:10:57 +01:00
Andy Wilkinson
07cb8f2836 Ensure that spring.data.rest.* configuration takes effect
Previously, RepositoryRestMvcBootConfiguration was not annotated with
@Configuration. This meant that it was processed in lite mode.
Crucially, in lite mode, there’s no proxying so each call to the
config() @Bean method from within other @Bean methods resulted in the
creation of a new RepositoryRestConfiguration instance. Furthermore, as
each of these instances wasn’t a Spring bean the configuration
properties were not applied.

This commit updates RepositoryRestMvcBootConfiguration to annotate it
with @Configuration so that it’s no longer processed in lite mode. It
also updates the unit tests and the Spring Data REST sample to verify
that the baseUri can be configured using application.properties.

Fixes gh-1675
2014-10-09 14:29:38 +01:00
Andy Wilkinson
6ec0b4ca81 Only consider letters when checking if a name is upper-case
Previously, for a string to be considered upper-case,
EmbeddedServerPortFileWriter required every character in the
string to be upper-case. This meant that strings containing numbers were
considered lower-case even if every letter in the string was upper-case.
OS X’s case-preserving, case-insensitive file system masked this problem
as the tests were still able to find the created file, even though the
case of its name was not as expected.

This commit updates EmbeddedServerPortFileWriter to only require
characters that are letters (as defined by Character.isLetter()) to be
upper-case. It also updates the tests to verify that the case of the
created file’s name is correct in such a way that it will fail, even
on OS X, when it is not.

Fixes gh-1676
2014-10-09 14:17:18 +01:00
Dave Syer
8ffe7ec4b8 Fix asciidoctor syntax problems and updgrade to asciidoctor 1.5
Points to note for authors:

* Nesting "*" in `literals` does not behave like Markdown - you have to
escape the asterisk (e.g. `foo/\*`)

* Quote ligatures (why we had to use those I don't really know) are
different in asciidoctor 1.5 ('`foo`' instead of ``foo'')

Merge branch '1.1.x'

Conflicts:
	spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2014-10-09 10:58:06 +01:00
Dave Syer
6a503d5ca9 Fix loads of asciidoc errors 2014-10-09 10:51:25 +01:00
Phillip Webb
6a423d7ad1 Add EmbeddedServerPortFileWriter
Add a EmbeddedServerPortFileWriter which can be used to write server
port information to a file.

Fixes gh-1275
Closes gh-1491
2014-10-08 23:03:35 -07:00
Phillip Webb
77ccd9a80b Rename ApplicationPidListener
Rename ApplicationPidListener to ApplicationPidFileWriter (keeping the
old class in a deprecated form)

Fixes gh-1673
2014-10-08 21:30:35 -07:00
Phillip Webb
c7455040df Merge pull request #1499 from liujiong1982/spring-boot-1499
* spring-boot-1499:
  Add CAMELCASE_TO_HYPHEN in RelaxedNames
2014-10-08 20:56:15 -07:00
David Liu
b948e61465 Add CAMELCASE_TO_HYPHEN in RelaxedNames
Fixes gh-1499
2014-10-08 20:55:13 -07:00
Phillip Webb
c906524df6 Merge pull request #1597 from liujiong1982/spring-boot-545
* spring-boot-545:
  Support Jetty HandlerCollection types
2014-10-08 20:09:48 -07:00
David Liu
64447d3f5f Support Jetty HandlerCollection types
Update JettyEmbeddedServletContainer to support HandlerCollection types
in addition to HandlerWrappers.

Fixes gh-545
Closes gh-1597
2014-10-08 20:07:35 -07:00
Phillip Webb
a401454a2a Merge pull request #1638 from hekonsek/spring-boot-amq-mqtt
* spring-boot-amq-mqtt:
  Add ActiveMQ MQTT connection URL auto-detection
2014-10-08 11:54:10 -07:00
Henryk Konsek
0d8bde58c9 Add ActiveMQ MQTT connection URL auto-detection
Fixes gh-1638
2014-10-08 11:53:06 -07:00
Phillip Webb
4c51aa8e28 Polish 2014-10-08 11:34:11 -07:00
Andy Wilkinson
7287c66d88 Fix Actuator sample's health test 2014-10-08 18:58:34 +01:00
Andy Wilkinson
b8eb13d827 Fix tests after addition of disk space health indicator 2014-10-08 18:00:56 +01:00
Andy Wilkinson
20c4795a1e Merge branch 'disk-space-health-indicator' 2014-10-08 17:26:06 +01:00
Andy Wilkinson
97178915a4 Polish disk space health indicator
- Supply auto-configuration for the new indicator
 - As suggested in the pull request, include the free disk space and
   configured threshold in the health details
 - Update the documentation to describe the indicator and its
   two configuration settings
 - Use @ConfigurationProperties to bind the indicator's configuration.
   This should make the changes sympathetic to the work being done
   to automate the configuration properties documentation

Closes gh-1297
2014-10-08 17:24:38 +01:00