Dave Syer
72bfd4ce68
Protect HttpMessageConverters if MVC is not available
2013-12-17 17:17:05 +00:00
Dave Syer
5dab07d0b9
Upgrade Spring Security
2013-12-17 15:44:33 +00:00
Dave Syer
3789424f22
Add JodaModule bean if detected on classpath
...
Fixes gh-146
2013-12-17 14:22:18 +00:00
Dave Syer
a79e3613d3
Add header as separator
2013-12-17 11:07:46 +00:00
Dave Syer
1194fc882b
Add feature to SimpleJsonParser
...
Now it can parse nested lists as map values.
Fixes gh-169
2013-12-17 09:53:21 +00:00
Dave Syer
bddf624bcb
Merge EnableConfigurationPropertiesTests
...
Fixes gh-168
2013-12-17 09:40:34 +00:00
Dave Syer
bdcb94a139
Remove initialization concerns fom HttpMessageConverters
2013-12-17 09:02:16 +00:00
Phillip Webb
513c6a1de2
Polish
2013-12-16 14:38:52 -08:00
Phillip Webb
85fb1cba0b
Rework HttpMessageConverters
2013-12-16 14:38:48 -08:00
Phillip Webb
983ef16eae
Remove SystemProperties from tests in strict mode
...
Remove system properties when testing strict property binding. This
prevents test failures that can occur if the local environment happens
to have certain environment variables defined.
2013-12-16 12:59:49 -08:00
Dave Syer
60cb5fd35c
Add log4j starter and some documentation
...
As discussed in gh-162
2013-12-16 17:26:53 +00:00
johnou
e9c649dfb2
Avoid double logging config init + support for slf4j-log4j.
2013-12-16 16:21:08 +00:00
Dave Syer
b72002142d
Split MessageConverters auto config out into separate class
2013-12-16 16:13:39 +00:00
Janne Valkealahti
9ffa6bced5
Readme updates for gradle plugin
2013-12-16 15:10:09 +00:00
Dave Syer
766bb8aa4f
Update Spring Integration to 3.0
2013-12-16 15:09:58 +00:00
Dave Syer
99fd32d408
Attempt to make URL comparison windoze proof
2013-12-16 07:02:45 +00:00
Dave Syer
c78973e375
MessageConverters -> HttpMessageConverters
2013-12-15 13:33:50 +00:00
Dave Syer
370501f4a9
Add test and fix bug in MessageConverters
2013-12-15 10:06:27 +00:00
Dave Syer
c2b499c775
Support for @Beans of type HttpMessageConverter, and Jackson specific details
...
You can contribute additional HttpMessageConverters
by simply adding beans of that type in a Spring Boot
context. If a bean you add is of a type that would have been included
by default anyway (like MappingJackson2HttpMessageConverter for JSON
conversions) then it will replace the default value. A convenience
bean is provided of type MessageConverters (always available if you
use the default MVC configuration) which has some useful methods to
access the default and user-enhanced message converters (useful, for
example if you want to manually inject them into a custom
RestTemplate).
There are also some convenient configuration shortcuts for Jackson2.
The smallest change that might work is to just add beans of type
Module to your context. They will be registered with the default
ObjectMapper and then injected into the default message
converter. In addition, if your context contains any beans of type
ObjectMapper then all of the Module beans will be registered with
all of the mappers.
2013-12-14 22:05:30 +00:00
Christian Dupuis
2b16a4af39
Fix failing test due to change in JMX export default setting
2013-12-13 23:32:53 +01:00
Dave Syer
beef5cfd31
Prevent type not present exception when no security on classpath
2013-12-13 11:10:30 +00:00
Dave Syer
c40d0aba0d
Document switching off DispatcherServlet
2013-12-12 17:32:58 +00:00
Dave Syer
492bab8c81
Upgrade Spring
2013-12-12 17:19:51 +00:00
Christian Dupuis
5c6a0fd472
Enabled JMX export auto configuration by default
2013-12-12 17:52:33 +01:00
Dave Syer
9c2b34f188
Allow default DispatcherServlet to be switched off more easily
...
All a user has to do now is declare a bean with name "dispatcherServlet".
2013-12-12 16:47:09 +00:00
Dave Syer
b05ffd1164
Add extra condition to security properties config
2013-12-12 16:04:20 +00:00
Dave Syer
faf8742f07
Upgrade Jackson
2013-12-12 15:07:34 +00:00
Dave Syer
1db28e5b92
Prevent cryptic exception if SecurityProperties not created
...
Previously if a user happened to provide an @EnableWebSecurity bean
the SecurityProperties would not be created, which is fine until you
add the Actuator (which needs them). Fixed by adding an explicit
SecurityProperties @Bean if not already present.
2013-12-12 15:05:58 +00:00
Christian Dupuis
b931cce386
Auto configuration support for JMX export
2013-12-11 21:31:10 +01:00
Dave Syer
cf05a5d578
Fix @Conditional for Batch command line runner
...
Previously it was @ConditionalOnMissingBean(CommandLineRunner.class)
which caued obvious problems when user wanted to add an unrelated
CLR.
Extended feature set so that a JobRegistry can also be used (with
spring.batch.job.name) and the whole idea can be switched off with
spring.boot.job.enabled.
2013-12-11 14:00:20 +00:00
Dave Syer
a8c69220c7
Only log startup info (PID etc) for root context
...
Fixes gh-153
2013-12-11 10:35:40 +00:00
Glenn Renfro
6cf3b91b2e
Allow use of underscores in @ConfigurationProperties prefix
...
Currently the PropertiesConfigurationFilter filters them out.
Thus when deploying to IAAS these environment variables are ignored.
Fixes gh-154
2013-12-11 10:17:55 +00:00
VasylTretiakov
3a37ddb237
Fixed several typos in CONTRIBUTING.md
...
Fixes gh-158
2013-12-11 09:49:19 +00:00
VasylTretiakov
408e26482f
Fixed two typos in README.md
...
Fixes gh-157
2013-12-11 09:48:02 +00:00
Dave Syer
76ea99ad0b
Add instance id suffix to Tomcat Engine name
...
Fixes gh-160
2013-12-11 09:46:36 +00:00
Dave Syer
cf53b76430
Remove another annotation= attribute
...
Hopefully really fixes gh-151
2013-12-10 17:14:27 +00:00
Dave Syer
f2cdb8c69f
Change interface of CommandFactory slightly
...
It's super useful to get a reference to the current SpringCli
instance in the CommandFactory. Potentially implementations can
react to the properties of the Cli, or wrap it into something
more complex.
...supports the likely implementation of the REPL use
case that @jbrisbin has been working on.
2013-12-10 13:38:52 +00:00
Dave Syer
e55e8f9863
Add build.gradle samples and rename runJar->bootRun
2013-12-10 11:10:04 +00:00
Janne Valkealahti
4c9c2b8dcf
Tweaks for boot gradle plugin
...
Fixes gh-152.
... to ease excluding dependencies
eckage changed to bootRepackage
- Register BootRepackage order to use task foo(type: BootRepackage){}
- Allow user to use customConfiguration
configurations {
hadoopruntime.exclude group: 'log4j'
hadoopruntime.exclude group: 'org.slf4j'
hadoopruntime.exclude group: 'org.apache.hadoop'
hadoopruntime.exclude group: 'org.apache.hive'
hadoopruntime.exclude group: 'commons-logging'
hadoopruntime.exclude group: 'org.codehaus.jettison'
hadoopruntime.exclude group: 'com.thoughtworks.xstream'
}
dependencies {
compile "org.springframework.batch:spring-batch-core:$springBatchVersion"
compile "org.springframework.batch:spring-batch-infrastructure:$springBatchVersion"
compile "org.springframework.data:spring-yarn-batch:$springDataVersion"
compile "org.springframework.data:spring-yarn-boot:$springDataVersion"
runtime "org.springframework.data:spring-data-hadoop:$springDataVersion"
runtime "org.springframework.data:spring-data-hadoop-core:$springDataVersion"
runtime "log4j:log4j:$log4jVersion"
runtime "org.slf4j:slf4j-log4j12:$slf4jVersion"
testCompile "org.springframework.data:spring-yarn-test:$springDataVersion"
testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
hadoopruntime configurations.runtime
}
springBoot {
backupSource = true
customConfiguration = 'hadoopruntime'
}
task appmasterJar(type: Jar) {
appendix = 'appmaster'
from sourceSets.main.output
exclude('**/*Container*')
exclude('**/*Client*')
}
task clientJar(type: Jar) {
appendix = 'client'
from sourceSets.main.output
exclude('**/*Appmaster*')
exclude('**/*Container*')
}
task clientBoot(type: BootRepackage, dependsOn: clientJar) {
withJarTask = clientJar
}
task appmasterBoot(type: BootRepackage, dependsOn: appmasterJar) {
customConfiguration = "hadoopruntime"
withJarTask = appmasterJar
}
//jar.enabled = false
//bootRepackage.enabled = false
task bootJars
bootJars.dependsOn = [clientBoot,containerBoot,appmasterBoot]
build.dependsOn(clientBoot)
build.dependsOn(containerBoot)
build.dependsOn(appmasterBoot)
//build.dependsOn(bootJars)
2013-12-10 11:09:39 +00:00
Dave Syer
ed8d161d33
Remove debug logging on stderr
2013-12-10 09:24:32 +00:00
Dave Syer
491071d6c0
Upgrade Thymeleaf to 2.1.2
...
Fixed gh-155
2013-12-09 17:37:01 +00:00
Dave Syer
4f085ace3a
Upgrade Batch to 2.2.3
2013-12-09 10:24:23 +00:00
Dave Syer
2543ef7072
Change @Conditional for existing security configuration
...
Fixed by using `WebSecurityConfiguration` to detect existing
security configuration (not the annotation).
Fixes gh-151
2013-12-09 09:48:40 +00:00
Dave Syer
023faf092f
Fix broken test
2013-12-06 15:45:07 +00:00
Dave Syer
bcae284dd9
Add a shim Endpoint if management context is child
...
When management endpoints are on a different port the HandlerMappings
are restricted to a single EndpointHandlerMapping, so the error
controller (which is a normal @Controller with @RequestMappings) does
not get mapped.
Fixed by addinga shim Endpoint on "/error" that delegates to the
ErrorController (which interface picks up an extra method).
2013-12-05 09:56:00 +00:00
Dave Syer
25d9ac6535
Remove FIXME from JPA sample
2013-12-05 09:38:10 +00:00
Dave Syer
4ab77ca893
Added exceptionIfInvalid attribute to @ConfigurationProperties
...
Default behaviour unchanged, but if you want to ignore validation errors
you can switch them off for indivdual beans now.
Fixes gh-144
2013-12-05 09:16:23 +00:00
Dave Syer
f57c8f52bf
Check for null before trying to use ApplicationContext
...
Fixes gh-145
2013-12-05 08:54:13 +00:00
Dave Syer
33c38b3a51
Remove inaccurate TODO
2013-12-04 14:57:44 +00:00
Dave Syer
884fd0125a
Add some handler adapter tests
2013-12-04 14:56:53 +00:00