Commit Graph

1328 Commits (9758ca55359465673e7b6676bbb71bf10b760851)
 

Author SHA1 Message Date
Dave Syer c78973e375 MessageConverters -> HttpMessageConverters 11 years ago
Dave Syer 370501f4a9 Add test and fix bug in MessageConverters 11 years ago
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.
11 years ago
Christian Dupuis 2b16a4af39 Fix failing test due to change in JMX export default setting 11 years ago
Dave Syer beef5cfd31 Prevent type not present exception when no security on classpath 11 years ago
Dave Syer c40d0aba0d Document switching off DispatcherServlet 11 years ago
Dave Syer 492bab8c81 Upgrade Spring 11 years ago
Christian Dupuis 5c6a0fd472 Enabled JMX export auto configuration by default 11 years ago
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".
11 years ago
Dave Syer b05ffd1164 Add extra condition to security properties config 11 years ago
Dave Syer faf8742f07 Upgrade Jackson 11 years ago
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.
11 years ago
Christian Dupuis b931cce386 Auto configuration support for JMX export 11 years ago
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.
11 years ago
Dave Syer a8c69220c7 Only log startup info (PID etc) for root context
Fixes gh-153
11 years ago
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
11 years ago
VasylTretiakov 3a37ddb237 Fixed several typos in CONTRIBUTING.md
Fixes gh-158
11 years ago
VasylTretiakov 408e26482f Fixed two typos in README.md
Fixes gh-157
11 years ago
Dave Syer 76ea99ad0b Add instance id suffix to Tomcat Engine name
Fixes gh-160
11 years ago
Dave Syer cf53b76430 Remove another annotation= attribute
Hopefully really fixes gh-151
11 years ago
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.
11 years ago
Dave Syer e55e8f9863 Add build.gradle samples and rename runJar->bootRun 11 years ago
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)
11 years ago
Dave Syer ed8d161d33 Remove debug logging on stderr 11 years ago
Dave Syer 491071d6c0 Upgrade Thymeleaf to 2.1.2
Fixed gh-155
11 years ago
Dave Syer 4f085ace3a Upgrade Batch to 2.2.3 11 years ago
Dave Syer 2543ef7072 Change @Conditional for existing security configuration
Fixed by using `WebSecurityConfiguration` to detect existing
security configuration (not the annotation).

Fixes gh-151
11 years ago
Dave Syer 023faf092f Fix broken test 11 years ago
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).
11 years ago
Dave Syer 25d9ac6535 Remove FIXME from JPA sample 11 years ago
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
11 years ago
Dave Syer f57c8f52bf Check for null before trying to use ApplicationContext
Fixes gh-145
11 years ago
Dave Syer 33c38b3a51 Remove inaccurate TODO 11 years ago
Dave Syer 884fd0125a Add some handler adapter tests 11 years ago
Dave Syer e1a09e0900 Fix formatting of header 11 years ago
Andy Wilkinson b0c5d3254a Make "." be the CLI's default classpath
Previously, the default classpath was empty. Now, in the absence of the
user providing a classpath via the -cp option, the default classpath
will be ".". If the user does specify a classpath, the classpath that's
used will be exactly what they have specified, i.e. "." will no longer
be on the classpath unless specified by the user.

The app sample integration test has been updated to verify that "." is
only the classpath by default.

Fixes #115
11 years ago
Phillip Webb f7f53e4e64 Fix for upstream Spring 4.0 changes 11 years ago
Dave Syer 322b03779d Upgrade Thymeleaf and Spring 11 years ago
Dave Syer f39b044cf7 Fix packaging for Layout.NONE
Fixes gh-139
11 years ago
Ivan Sopov 40bfd295eb minor fix for javadoc 11 years ago
Dave Syer e18a0ea6e4 Include a link to howto.md 11 years ago
Dave Syer 2104d9a1e2 Prevent failure of web app with parent context
ServerProperties formerly had an @OnMissingBeanCondition
that didn't restrict the hierarchy. It also asserts that
the current context (not including parents) contains such
a bean. This led to an inevitable failure when there was
an existing instance in the parent context.

Fixed by a) searching only the current context, b) not
adding a ServerProperties bean if the context is not a
web app.
11 years ago
Dave Syer c03a06b52d Add test for customize container factory 11 years ago
Dave Syer 4a60e3ccf6 Unignore condition tests 11 years ago
Dave Syer a4cb09c4eb Unignore some tests 11 years ago
Dave Syer c16b5d277e Add test for Valve added 11 years ago
Dave Syer 6cfbcafc10 Switch to httpcomponents for better error handling in tests 11 years ago
Christian Dupuis 5661f8fc28 Test key/value sanitization 11 years ago
Christian Dupuis 078933c8fd Add actuator endpoint to expose ConfigurationProperties
This information should probably be also available from the console and log similar to AutoConfigurationReport.
11 years ago
Christian Dupuis 00c8633597 Add missing new exception class 11 years ago