8 Commits

Include renames

Author	SHA1	Message	Date
Andy Wilkinson	1d312171c1	Merge branch '1.1.x'	2015-01-20 09:50:47 +00:00
Andy Wilkinson	f10c9b5312	Avoid race between file creation and its contents being written ... Previously, SampleIntegrationParentApplicationTests assumed that when an output file existed on disk its contents would have been written in their entirety. This assumption does not hold true and causes the test to fail intermittently as it incorrectly determines that the test has produced no output. This commit updates the test to wait for up to 30 seconds for the output files to appear on disk and for the expected content to be found in one of those files. If the files exist but do not contain the expected content the test will keep trying until it does or until too much time as elapsed. Fixes gh-2380	2015-01-20 09:50:35 +00:00
Phillip Webb	d039f43107	Update samples to use @SpringBootApplication ... Update the relevant samples to use the new @SpringBootApplication annotation. Closes gh-1842	2014-11-06 22:51:09 -08:00
Phillip Webb	b616e9fdc4	Rename SampleIntegrationApplicationTests	2014-10-06 10:47:40 -07:00
Phillip Webb	8054426803	Format source code	2014-07-02 15:17:25 -07:00
Phillip Webb	fa88c481a5	Remote trailing whitespace	2014-07-02 15:17:14 -07:00
Dave Syer	fd757cb371	Add logging.level to application.properties ... E.g. logging.level.org.springframework: DEBUG logging.level.org.hibernate: WARN Fixed gh-788	2014-06-27 15:49:17 +01:00
Dave Syer	36130b27e1	Support for Jmx (and Integration) autoconfig in parent contexts ... When there are parent contexts we already had a strategy for registering the actuator endpoints, but not the regular JMX or Integration MBeans. This chnage makes the autoconfigs for JMX aware of the parent context. Also adds a sample with a parent context. See gh-847	2014-06-10 15:12:30 +01:00