Commit Graph

436 Commits

Author SHA1 Message Date
Phillip Webb
bdcb9407eb Restore commons-logging dependency for spring-boot
Restore the dependency on commons-logging (transitively via spring-core)
for spring-boot. This means that we are not tied directly to SLF4J, but
it is still an option that can be used via `jcl-over-slf4j`.

The `spring-boot-starter-parent` continues to replace `commons-logging`
with `jcl-over-slf4j`.

Fixes gh-981
2014-05-28 23:03:26 +01:00
Andy Wilkinson
7a8be3d600 Use Spring Framework bom and fully exclude commons-logging
Closes #955
Closes #978
2014-05-28 20:12:29 +01:00
Phillip Webb
5df52d3e94 Polish 2014-05-28 17:36:07 +01:00
Phillip Webb
99af5dbe23 Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-05-28 14:57:13 +01:00
Phillip Webb
30b181573e Fix Jasper on Tomcat 8
Refactor Jasper initialization code to call JasperInitializer during
server start.

Fixes gh-962
See gh-919
2014-05-28 14:52:21 +01:00
Phillip Webb
3d76d9d73b Merge branch '1.0.x' 2014-05-28 10:23:33 +01:00
Phillip Webb
819b3b9761 Fix JasperInitializerLifecycleListener
Update JasperInitializerLifecycleListener to call JasperInitializer as
a ServletContainerInitializer (not a ServletContextInitializer).

Fixes gh-962
See gh-919
2014-05-28 10:21:10 +01:00
Graeme Rocher
514dad6d22 allow subclassing of SpringApplicationBuilder 2014-05-28 09:09:03 +01:00
Dave Syer
55f3ca0172 Remove misplaced re-ordering of default property source
The early re-ordering (and in particular the temporary remove of the
default properties) seemed to be a relic of an older approach that is
no longer there since we refactored to support more sane profile ordering.
Removing it doesn't seem to break anything and it allows you to specify
the config file locations in SpringApplicationBuilder.properties().

Fixes gh-953, fixes gh-920
2014-05-27 12:11:25 +01:00
Phillip Webb
6381fdcb49 Polish 2014-05-26 21:48:19 +01:00
Dave Syer
b3022fd24a Use PropertiesConfigurationFactory to bind to SpringApplication
Then non-enumerable property sources will be accessible (like
SystemProperties in principle). This is the same way that other
beans are bound to the environment, but this one never got the
same treatment.

Fixes gh-951, gh-934
2014-05-26 10:40:24 +01:00
Dave Syer
0938a874ad Ensure startup error is logged (and rethrown)
Fixes gh-948
2014-05-26 09:21:27 +01:00
Dave Syer
3d99a5dd98 Add test for inaccessible configuration class
See gh-948
2014-05-26 06:40:50 +01:00
Dave Syer
edb493044a Fix ordering problem in PropertySourcesPropertyValues
This affected @ConfigurationProperties binding whenever there
were multiple PropertySources (from any source) in the
Environment and mor ethan one carried a value for a particular
key. The rules for override are clear in Environment.getProperty()
but they were being violated by the PropertySourcesPropertyValues.

Fixes gh-916
2014-05-24 08:33:14 +01:00
Phillip Webb
dbf75749a9 Merge branch '1.0.x' 2014-05-23 21:27:22 +01:00
Phillip Webb
6e82e8ede8 Fix Tomcat 8 warnings and Jasper initialization
Fix MalformedURLException warnings caused by Tomcat 8 adding additional
URLs to the TomcatEmbeddedWebappClassLoader.

Add JasperInitializerLifecycleListener to call Tomcat 8's
JasperInitializer which is now required for JSP rendering.

Fixes gh-919
2014-05-23 21:25:17 +01:00
Phillip Webb
8acd6fc799 Merge branch '1.0.x' 2014-05-23 10:09:42 +01:00
Henryk Konsek
42be7abacc Fix typo in Javadoc
Fixes gh-938
2014-05-23 10:08:24 +01:00
Phillip Webb
1a475102de Polish 2014-05-22 20:33:08 +01:00
Dave Syer
94e891e924 Rename method count() -> countGroups()
Fixes gh-923
2014-05-22 09:10:49 +01:00
Dave Syer
7279e97e5a Add @IntegrationTest properties to Environment after system props
Fixes gh-910
2014-05-21 08:29:35 +01:00
Phillip Webb
8bcda1bcbe Polish 2014-05-20 18:26:56 +01:00
Dave Syer
7e9a4035db Re-order condition that checks for anonymous class
Workaround for ASM 5.0.2 bug that fixes gh-904
2014-05-20 12:35:44 +01:00
Phillip Webb
b5e7c89ec3 Merge branch '1.0.x' 2014-05-15 09:51:29 +01:00
Phillip Webb
01fcf61140 Polish 2014-05-15 09:51:16 +01:00
Phillip Webb
e018f2af25 Add FilterRegistrationBean.setDispatcherTypes(...)
Add setDispatcherTypes method to FilterRegistrationBean.

Fixes gh-871
2014-05-15 09:30:22 +01:00
Dave Syer
85719f75e4 Add @Bean-level config properties to /configprops 2014-05-13 16:45:48 +01:00
Dave Syer
0d27ce4850 Enable @ConfigurationProperties on a @Bean definition
This allows multiple beans of the same type to be bound with
different prefixes. As a side effect you get default binding
if the bean class is itself @ConfigurationProperties.
2014-05-13 16:45:48 +01:00
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