Commit Graph

3536 Commits

Author SHA1 Message Date
Michael Freedman d4bf221fd4 fix copy in README 2014-11-20 10:16:34 -05:00
Andy Wilkinson 0e2300cf85 Disable check of Groovy template location by default for CLI apps
In 1.1, the Groovy template support did not check that its configured
template location exists. A check was added in 1.2, however this
breaks CLI web applications that don't have the expected templates
location.

Rather than reintroducing 1.1's behaviour by removing the check, this
commit updates the CLI to set
spring.groovy.template.check-template-location to false by default.
This allows flow-blown applications to benefit from the check, while
allowing CLI apps to behave as they did in 1.1.

Closes gh-1959
2014-11-20 14:09:51 +00:00
Stephane Nicoll 11894a5412 Fix manual metadata format inconsistency
Fixes gh-1961
2014-11-20 13:58:39 +01:00
Dave Syer 689d49021b Merge branch '1.1.x' 2014-11-20 12:39:17 +00:00
Dave Syer 12a7df6c40 Be defensive about classloader in MessageSourceAutoConfiguration
Fixes gh-1960
2014-11-20 12:29:16 +00:00
Brian Clozel 404153a758 Minor fixes in howto documentation re:SSL config
Fixes a couple of typos in the documentation:
* `x-forwarded-protocol` is not the standard name for this header
* `require_https` is not an existing property, but rather `require_ssl`
2014-11-20 13:27:27 +01:00
Dave Syer 23e7028abb Ensure java.io.tmpdir is available before using it
Some environments do not have a tmpdir so it can be null.
2014-11-20 12:01:24 +00:00
Andy Wilkinson d0f43d2e2b Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
	spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
2014-11-20 10:50:34 +00:00
Andy Wilkinson 59ebc3b320 When Logback is the logging system, ensure that JBoss logging uses it
Previously, if Logback was being used as Boot's logging system, but
Log4J was also on the classpath before SLF4J and Logback, JBoss
Logging would use Log4J for its logging. This lead to warning messages
being produced as Log4J was not configured:

log4j:WARN No appenders could be found for logger (org.jboss.logging).
log4j:WARN Please initialize the log4j system properly.

This commit updates LogbackLoggingSystem to set the
org.jboss.logging.provider to "slf4j". This ensure that JBoss Logging
will use SLF4J and Logback as intended even when Log4J is also on the
classpath.

Closes gh-1928
2014-11-20 10:41:43 +00:00
Phillip Webb f75b266d64 Add 'deprecated' field to configuration meta-data
Update the ConfigurationMetadataAnnotationProcessor to detect the
@Deprecated annotation on getters or setters.

Fixes gh-1846
2014-11-19 14:15:35 -08:00
Phillip Webb 31253d0d76 Merge pull request #1931 from juzer/master
* pull1931:
  Fixed potential ClassCastException getting error
2014-11-19 13:37:09 -08:00
juzer 428d2caac1 Fixed potential ClassCastException getting error
Update DefaultErrorAttributes to expect a `Throwable` ERROR_ATTRIBUTE
rather than an `Exception`.

Fixes gh-1931
2014-11-19 13:36:57 -08:00
Phillip Webb c34cfb27a3 Polish 2014-11-19 10:52:26 -08:00
Phillip Webb b53d72e930 Restore Java 1.6 version 2014-11-19 10:04:59 -08:00
Phillip Webb 3a4d62fb3a Gracefully ignore placeholder exceptions
Update BeanTypeRegistry to gracefully ignore LoadBeanClassException and
BeanDefinitionStoreException exceptions in the same way as
DefaultListableBeanFactory.doGetBeanNamesForType() does.

Fixes gh-1955
2014-11-19 09:59:14 -08:00
Dave Syer 7fa0ea7c3b Add support for spring.jersey.type=filter
Fixes gh-1756
2014-11-19 16:51:55 +00:00
Dave Syer 3a4f1f6f39 Attempt to get Jersey working as filter 2014-11-19 15:57:31 +00:00
Stephane Nicoll 8f488bd019 Update init to new metadata format
Spring initializr now declares an improved metadata format (v2).

InitializrServiceMetadata has been updated to parse this format. Note
that the client could be further improved by using HAL generated links.

Closes gh-1953
2014-11-19 16:38:53 +01:00
Dave Syer ae23ba13b5 Fix for Java < 1.8
Uses raw class instead of Java Type API (which has a
default method in 1.8, unavailble in 1.7).
2014-11-19 15:36:28 +00:00
Dave Syer 5d2d39e87d Add EndpointHandlerMappingCustomizer callback
Users can add @Beans of this type to customize the
EndpointHandlerMapping (e.g. add interceptors) even if
it is in a child context.

Fixes gh-1933
2014-11-19 15:21:55 +00:00
Dave Syer 1254508357 Fix tests some more
Eclipse (by default) does not create the JSON metadata when
it compiles the @ConfigurationProperties beans. So running on
the command lilne gets scarily different than in an IDE. Fixed
by externalizing the metadata location and setting it to something
empty in the tests.
2014-11-19 15:08:48 +00:00
Andy Wilkinson 90af8bf54a Add auto-configuration for Jetty 9's WebSocket support
Closes gh-1269
2014-11-19 14:44:54 +00:00
Dave Syer 0757d24d91 Fix /configprops tests 2014-11-19 14:33:49 +00:00
Dave Syer 6ad626de49 Allows /configprops endpoint to show nested properties
Including maps and lists. Beans with no metadata (in
/META-INF/*spring-configuration-metadata.json) are just serialized
as they come (so might have problems like cycles). Serialization
errors are caught and rendered as an "error" for that bean. Any
problems can be fixed by preparing metadata and specifying which
properties are to be rendered that way.

Fixes gh-1746, fixes gh-1921
2014-11-19 14:10:01 +00:00
Phillip Webb fa64f432b7 Drop unused MANIFEST 2014-11-18 16:45:54 -08:00
Phillip Webb 0bff6c4bfc Merge branch '1.1.x' 2014-11-18 16:29:18 -08:00
Phillip Webb 9059c7574b Update license details
Add LICENSE.txt file and make it clear in the README file that we
are Apache 2.0

Fixes gh-1952
2014-11-18 16:28:39 -08:00
Phillip Webb a641f0c72a Polish 2014-11-18 15:45:14 -08:00
Phillip Webb a6e4744c60 Fixup line endings 2014-11-18 15:43:39 -08:00
Phillip Webb b583262211 Use SmartInitializingSingleton when possible
Switch implementations of ApplicationListener<ContextRefreshEvent> for
SmartInitializingSingleton when possible.

Fixes gh-1939
2014-11-18 13:50:49 -08:00
Andy Wilkinson 7a783f5a18 Merge branch '1.1.x' 2014-11-18 21:31:19 +00:00
Andy Wilkinson 863c099161 Add missing copyright headers 2014-11-18 21:29:54 +00:00
Andy Wilkinson 7392e2b4d2 Merge branch 'undertow' 2014-11-18 21:24:09 +00:00
Andy Wilkinson 1864d79077 Polish Undertow contribution
Closes gh-1779
2014-11-18 21:20:34 +00:00
sopov.ivan c501b889af Add support for using Undertow as an embedded container
See gh-1779
2014-11-18 21:20:34 +00:00
Phillip Webb 21115f29cf Remove accidental SampleControllerAdvice test
Accidentally committed in 4668f59723

See gh-1950
2014-11-18 12:45:53 -08:00
Phillip Webb 7e81f164f2 Merge pull request #1943 from isopov/ssl-keystore-classpath-test
* ssl-keystore-classpath-test:
  Add Jetty SSL keystore in classpath test
2014-11-18 12:21:36 -08:00
sopov.ivan 72dd75b66e Add Jetty SSL keystore in classpath test
Update JettyEmbeddedServletContainerFactoryTests to test loading an
SSL keystore from the classpath. Currently this is a Jetty only feature,
although if https://issues.apache.org/bugzilla/show_bug.cgi?id=56777 is
fixed we could do the same thing with Tomcat.

Closes gh-1943
2014-11-18 12:21:17 -08:00
Phillip Webb 6efa2d5315 Merge branch '1.1.x' 2014-11-18 12:05:44 -08:00
Phillip Webb 0408eb413f Add profile to ConfigFileApplicationListener log
Fixes gh-1948
2014-11-18 12:04:46 -08:00
Phillip Webb 4668f59723 Improve relaxed enum binding
Update RelaxedConversionService to support more relaxed enum binding.

Fixes gh-1950
2014-11-18 11:24:32 -08:00
Andy Wilkinson f43d6925c5 Apply spring.jackson.* config to HypermediaAutoConfiguration’s ObjectMapper
Previously, HypermediaAutoConfiguration would trigger the creation of
an ObjectMapper bean named _halObjectMapper. This bean did not have the
spring.jackson.* configuration applied to it, however its presence
would revent JacksonAutoConfiguration from creating its
ObjectMapper. This left the user with an ObjectMapper that did not
honour the spring.jackson.* configuration.

This commit updates HypermediaAutoConfiguration to use the
Jackson2ObjectMapperBuilder that may have been created by
JacksonAutoConfiguration. If the builder exists it is used to configure
the _halObjectMapper bean.

Fixes gh-1949
2014-11-18 15:51:30 +00:00
Andy Wilkinson 35b7ba5cda Deprecate http.mappers.* properties
The http.mappers.* configuration properties assumed that the mapping
was JSON (on of the property names was jsonPrettyPrint) and also only
exposed a small subset of the configuration options supported by
Jackson (and GSON). The property names implied that it would configure
all HTTP mapping, however it was ignored by GsonAutoConfiguration.

This commit deprecates the support for http.mappers.* in favour of
configuring Jackson or Gson instead. Jackson can be configured
declaratively using the spring.jackson.* properties or programtically.
Gson can be configured programatically by using a GsonBuilder to
create a Gson instance with the desired configuration.
gh-1946 has been opened to add support for declarative configuration
of Gson.

Closes gh-1945
2014-11-18 13:51:48 +00:00
Andy Wilkinson 6cfd6cad64 Merge branch '1.1.x' 2014-11-18 13:16:45 +00:00
Andy Wilkinson 25c561313e Merge branch 'gh-1919' into 1.1.x 2014-11-18 11:48:57 +00:00
Andy Wilkinson 9eae29938c Test that http.mappers props are applied by JacksonAutoConfiguration
Closes gh-1919
2014-11-18 11:47:29 +00:00
Nicolás J. García f51b304c2a Update JackonAutoConfiguration to apply all http.mappers properties
Previously, only the http.mappers.json-sort-keys property was applied
by JacksonAutoConfiguration. This commit updates it to also apply the
http.mappers.json-pretty-print property as well.

See #1919
2014-11-18 11:40:29 +00:00
Andy Wilkinson 1c4f1f0ecb Merge branch 'jackson-mapper' 2014-11-18 11:17:45 +00:00
Andy Wilkinson b8d6b34038 Test that HttpMapper properties are only used when they’re defined
Closes gh-1923
2014-11-18 11:17:07 +00:00
Sebastien Deleuze c053540b03 Use HttpMapper properties only if defined
See gh-1923
2014-11-18 11:16:04 +00:00