Commit Graph

408 Commits

Author SHA1 Message Date
Phillip Webb
9942c52117 Remove exclude filtering from test-jars
Remove the filtering from test jars so Maven works in the same way
as eclipse. Test jar filtering has now been setup on the CI server
to prevent them from being published.

Fixes gh-754
2014-05-02 21:56:24 +01:00
Dave Syer
3a6d4efe28 Reverse order of active profiles before processing
This change harmonizes the profile ordering between spring.profiles.active
(where last one already wins) and SpringApplication.setAdditionalProfiles()
(where the first one has been winning in 1.0.x). Last one wins is the
correct strategy since it mimics a map merge, and also matches the behaviour
of file ordering already defined in spring.config.location and
spring.config.name.

Fixes gh-645
2014-05-01 11:14:42 +01:00
Phillip Webb
6025f45aa0 Polish 2014-04-30 21:53:24 +01:00
Phillip Webb
fb13bf9016 Move TemplateAvailabilityProvider
Move TemplateAvailabilityProvider from the spring-boot project to
spring-boot-autoconfigure
2014-04-30 21:38:17 +01:00
Phillip Webb
decee8d871 Polish templates code 2014-04-30 21:36:09 +01:00
Dave Syer
7a33afa722 Add support for custom banner
SpringApplication now picks up a classpath:banner.txt
by default, and user can choose a different one with
banner.location. The encoding is banner.encoding.

Fixes gh-458
2014-04-30 16:30:54 +01:00
Stephane Nicoll
e26e06d5dd Fix build
Two modules are still relying on the spring-boot test-jar but it was
not generated anymore. Adding the generation of test-jar again as
a workaround until we completely removes the use of it.
2014-04-30 16:39:54 +02:00
Andy Wilkinson
7c91176186 Add FreeMarker support
This commit adds auto-configuration and a starter,
spring-boot-starter-freemarker, for using FreeMarker view templates in
a web application.

A new abstraction, TemplateAvailabilityProvider, has been introduced.
This decouples ErrorMvcAutoConfiguration from the various view
technologies that Spring Boot now supports, allowing it to determine
when a custom error template is provided without knowing the details of
each view technology.

Closes #679
2014-04-29 19:46:09 +01:00
Ivan Sopov
e77b5e8b94 remove obsolete EmbeddedServletContainer.NONE 2014-04-28 08:42:18 +01:00
sopov.ivan
174b654faf minor test fixes
Reverting arguments in assertEquals where constant was placed on
the "actual" place. Replacing assertEquals with assertFalse, assertTrue
and assertNull where applicable.

Fixes gh-735
2014-04-26 14:14:05 +01:00
sopov.ivan
72ff1dd175 fix for gh-732 - removing test-jar from build and publishing to repositories 2014-04-26 13:44:31 +01:00
Dave Syer
6ac85c1759 Add username/password and MongoClientOptions to Mongo config
The username/password option stil lonly works for a single host (to
connect to a cluster I suspect you need to set the URI). Also added
a MongoClientOptions (if a bean of that type exists it will be
used to populate the options that aren't in the URI).

Fixed gh-536
2014-04-26 12:09:23 +01:00
sopov.ivan
10d82e28ff minor - correcting modifiers order 2014-04-25 18:20:09 +04:00
Josh Long
e8e59ea657 MultipartConfigElement autoconfig support.
Fixes gh-708
2014-04-25 09:33:43 +01:00
Phillip Webb
64a835e91a Move master to 1.1.0.BUILD-SNAPSHOT 2014-04-24 12:45:20 +01:00
Spring Buildmaster
d3954a1703 Next development version 2014-04-24 02:24:28 -07:00
Stephane Nicoll
af33cc2b97 Use random port in spring-boot tests
Update several tests to use random ports instead of hard coding '8080'
or '8081'.

fixes gh-607
2014-04-23 19:10:42 +01:00
Phillip Webb
f847ed2b1f Remove getEmbeddedServletContainers()
Remove the mutable getEmbeddedServletContainers() Map from
EmbeddedWebApplicationContext and instead use the `namespace` to
distinguish the management container.

The ServerPortInfoApplicationContextInitializer class replaces the
previous TestExecutionListener to exposes port properties (by
listening for EmbeddedServletContainerInitializedEvents).
2014-04-23 15:41:56 +01:00
Phillip Webb
fad5ce45db Polish 2014-04-23 12:35:33 +01:00
Phillip Webb
316cb87583 Create ApplicationPid and remove SystemUtils
Create a new ApplicationPid class to remove the need for SystemUtils
and refactor existing calls.
2014-04-23 12:00:36 +01:00
Patrick Radtke
80652007b5 RelaxedDataBinder handling for untyped map
Fixes gh-709
2014-04-22 08:48:42 +01:00
Hugo Flambo
a77fee9f18 Fix typo and use *PropertySource* instead *ProperySource*
Fixes gh-705
2014-04-22 08:46:24 +01:00
Dave Syer
e72f8fa646 Add test for TestRestTemplate 2014-04-18 13:10:14 -07:00
Dave Syer
4ec059eaa5 Ensure authentication is added to customized request factory
Fixes gh-692
2014-04-18 10:47:39 -07:00
Dave Syer
7b07fe8ce0 Convert remaining samples to use random port
Partial fix for gh-337. See also gh-607 which complements this, but might
conflict on a merge.
2014-04-17 20:29:04 -07:00
Dave Syer
f134e96053 Convert Actuator sample to dynamic ports 2014-04-17 17:36:09 -07:00
Dave Syer
559009b8cf Support for random ports in @IntegrationTest
User can now set up default properties in the Environment using
@IntegrationTest("foo:bar", "x:y") etc. Using "server.port:0" you
can get Tomcat or Jetty to spin up on a random port. We also add
a test listener that populates "local.server.port" with the actual
port the server started on so you can @Value("${local.server.port}")
inject it into the test case.

See gh-607 (this should make the extension of that PR to samples
much easier)
2014-04-17 13:09:25 -07:00
Dave Syer
0d44e6e0d2 Ensure response is committed after ErrorPageFilter
Otherwise Tomcat will go ahead and uncommit it and handle it again
in the ErrorReportValve (duh!)

Fixes gh-684
2014-04-16 16:29:08 -07:00
Dave Syer
1e0c1d1564 Add support for .yaml file extensions
Apparently yaml.org prefers .yaml, but the internet seems
to be more aligned with .yml, so I guess we should support both
out of the box.

Fixes gh-675
2014-04-15 07:04:05 -07:00
Dave Syer
78f8575850 Special case for deferred start based on Handler type
Fixes gh-673
2014-04-15 06:21:12 -07:00
Jakub Kubrynski
f6488c7f66 Now after starting application PID file will be created
Fixes gh-550
2014-04-10 16:30:36 +01:00
Dave Syer
533e920fe5 Add enabled flag to RegistrationBean
Default to true but allow user to switch off a @Bean of type
Filter (for example) by wrapping it in a disabled registration.

Fixes gh-655
2014-04-10 10:31:15 +01:00
Dave Syer
a615693f39 Add test for gh-645 2014-04-09 06:59:05 +01:00
Spring Buildmaster
a5864ebcd0 Next development version 2014-04-06 22:43:18 -07:00
Phillip Webb
2bb0f744e0 Polish 2014-04-06 21:49:12 -07:00
Dave Syer
8295e82ea0 Extend use of reflection for port in Jetty 9
There was already a reflection hack in place for logging the local
port in Jetty 8/9. It wasn't being used for the getPort() method
for some reason, so that needed to be fixed.

Fixes gh-635
2014-04-06 14:30:05 +01:00
Dave Syer
bd1691f410 Missing groovy source for test 2014-04-05 08:13:41 +01:00
Dave Syer
435729812d Add test for groovy-xml parsing 2014-04-04 18:28:49 +01:00
Abhijit Sarkar
430fb51ca4 Ensure Groovy bean builder does not enforec XML validation
Since it is not parsing XML it makes no sense to be validating
and it would cause exceptions when importing "namespace"
features. This brings the Boot usage of the bean builder inline
with that in Spring Core.

Fixes gh-630
2014-04-04 18:04:20 +01:00
Spring Buildmaster
15e9dbe98b Next development version 2014-04-01 03:05:51 -07:00
Phillip Webb
1e68b7e0a9 Remove superfluous <packaging> tags from POMs 2014-04-01 02:07:43 -07:00
Phillip Webb
0af7f7e347 Add missing POM info 2014-04-01 02:07:42 -07:00
Phillip Webb
488b03387f Polish POM formatting 2014-04-01 02:07:36 -07:00
Phillip Webb
6f9bb233ad Revert "Next development version"
This reverts commit b67bb70ee3.
2014-04-01 00:38:48 -07:00
Spring Buildmaster
b67bb70ee3 Next development version 2014-03-31 22:38:42 -07:00
Dave Syer
2b185fc9c2 Add tests for groovy config in @SpringApplicationConfiguration 2014-03-31 17:32:51 -07:00
Phillip Webb
ac4cdd33c3 Revert "Next development version"
This reverts commit 1d0eea12eb.
Returning to 1.0.0.BUILD-SNAPSHOT for an updated release.
2014-03-31 17:14:30 -07:00
Spring Buildmaster
1d0eea12eb Next development version 2014-03-28 11:47:09 -07:00
Phillip Webb
aca67066bf Rename RestTemplates to TestRestTemplate
Rename the RestTemplates to TestRestTemplate to help indicate that it's
primarily intended for testing. Also now extend RestTemplate to allow
direct use, rather than via factory methods.

Fixes gh-599
2014-03-27 11:22:03 -07:00
Phillip Webb
d117a6b22b Polish 2014-03-27 11:21:51 -07:00