Commit Graph

3659 Commits

Author SHA1 Message Date
Phillip Webb
44dde9fc12 Add deployment integration tests
Add deployment tests for Tomcat, TomEE and WildFly to ensure that
a basic Spring Boot application can be deployed to a traditional
Application server.

Since the deployment tests can be quite slow, they currently only
run in the "full" build profile.

Fixes gh-1736
2014-12-05 23:04:22 -08:00
Phillip Webb
379857a111 Detect SpringBootServletInitializer @Configuration
Update SpringBootServletInitializer to automatically add itself as a
SpringApplication source if it is annotated with @Configuration.

Also throw a more meaningful exception if no sources have been
configured.

Fixes gh-2073
2014-12-05 22:58:50 -08:00
Phillip Webb
1f66277fd6 Fix JmsProperties bean not found exception
Update JndiConnectionFactoryAutoConfiguration to ensure that the
JmsProperties bean is created. Prior to this commit deployment to
a WildFly would fail with a NoSuchBeanDefinitionException.

Fixes gh-2072
2014-12-05 22:46:35 -08:00
Phillip Webb
c332e5834a Add managed jackson-datatype-jdk8 dependency
Fixes gh-1750
2014-12-05 11:52:42 -08:00
Phillip Webb
f3a0cebaaf Upgrade to JUnit 4.12
Closes gh-2061
2014-12-05 11:28:48 -08:00
Phillip Webb
88f64c7ad3 Upgrade to Jackson 2.4.4
Closes gh-2062
2014-12-05 11:27:59 -08:00
Phillip Webb
b253cbec2d Polish 2014-12-05 10:54:36 -08:00
Phillip Webb
af643e2f54 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
2014-12-05 10:25:30 -08:00
Phillip Webb
c9a3919af9 Add LoggingApplicationListener constants
Extract some of the common property keys as constants.

Fixes gh-2068
2014-12-05 10:23:55 -08:00
kakawait
f65c7dbeb3 Update 'flyway.locations' appendix documentation
Replace `classpath:db/migrations` with `classpath:db/migrations`.

Fixes gh-2063
2014-12-05 10:23:54 -08:00
Phillip Webb
78c22813d3 Ensure undertow session cookie path is correct
Explicitly set a ServletSessionConfig when the context path is "". This
is a workaround for UNDERTOW-350 to ensure that the session cookie path
is correctly set.

Fixes gh-2065
2014-12-05 09:51:28 -08:00
Sebastien Deleuze
e641b47b66 Upgrade to Undertow 1.1.1
Fixes gh-2066
2014-12-05 09:51:28 -08:00
Phillip Webb
064fee38b1 Formatting 2014-12-05 09:48:40 -08:00
Stephane Nicoll
8efdffbc0e Smarter output detection for generated projects
Previously, specifying a simple target name for a regular project would
store the (zip) archive in a file matching the target name. Only adding a
slash at the end of the name allows to extract it as a directory. It
turns out that such convention is not easy to catch and if a simple name
is provided on the command-line, the user probably wants to create a
directory with such a name with the content of the project.

Note that if a build file is required and the name does not have any
extension, we still store a file with the required name as auto-detecting
the extension to use is not that easy.

Fixes gh-2056
2014-12-05 14:43:31 +01:00
Stephane Nicoll
61223e709c Fix error message 2014-12-05 14:42:51 +01:00
Stephane Nicoll
f4fb9ddfe6 Fix wrong file name 2014-12-04 09:35:31 +01:00
Phillip Webb
c22aee9817 Polish WebSocket samples 2014-12-03 16:23:15 -08:00
Phillip Webb
8928012943 Add Undertow WebSocket sample application
See gh-2028
2014-12-03 15:41:36 -08:00
Phillip Webb
778aa39016 Add Undertow WebSocket auto-configuration
Fixes gh-2028
2014-12-03 15:35:19 -08:00
Phillip Webb
5f2b60eff2 Polish POM 2014-12-03 14:19:08 -08:00
Phillip Webb
211f20b9c6 Add setIgnoreDefaultModelOnRedirect support
Add a `spring.mvc.set-ignore-default-model-on-redirect` property to
allow RequestMappingHandlerAdapter.setIgnoreDefaultModelOnRedirect to
be easily customized and change the default value to 'true'.

Fixes gh-2018
2014-12-03 11:31:09 -08:00
Phillip Webb
d7c61ef01c Drop ShellProperties.setAdditionalProperties
Drop the setAdditionalProperties method from ShellProperties to ensure
that it is not included in the meta-data JSON. The additional properties
are usually wired in using @Autowired and it is pretty unlikely that
anyone is using the setter directly.

Fixes gh-2055
2014-12-03 10:23:14 -08:00
Phillip Webb
9e394eac22 Fix YamlPropertySourceLoader flatten logic
Fix YamlPropertySourceLoader to correctly flatten keys merged from
different documents.

Closes gh-2022
2014-12-03 09:40:24 -08:00
Phillip Webb
ba67e16258 Formatting 2014-12-03 09:12:28 -08:00
Stephane Nicoll
509201907c Polish default value for arrays
See gh-1996
2014-12-03 17:32:00 +01:00
Stephane Nicoll
f821fdfffa Fix typo 2014-12-03 17:21:56 +01:00
Stephane Nicoll
7d57cb7081 Add default value for arrays
Previously, a property holding an array did not have a proper default
value in the meta-data even though the related field was initialized
properly.

An explicit support for arrays has been added. The "defaultValue" now
holds the default value for singular properties or an array of values for
array-based properties. If the value is initalized with an empty array,
the default value is an empty array as well.

Closes gh-1996
2014-12-03 16:18:54 +01:00
Dave Syer
0b19884f58 Remove unecessary reflection hacks 2014-12-03 15:11:17 +00:00
Stephane Nicoll
d9ca0869b5 Fix required Spring Framework version 2014-12-03 09:57:22 +01:00
Stephane Nicoll
4e1c259645 Add requirements documentation section
Fixes gh-1439
2014-12-02 19:48:18 -08:00
Stephane Nicoll
3922808de0 Add exclusion for well-known property types
Previously, any valid property was added to the meta-data of the current
group. This can be annoying for types that are not meant to be bound from
a simple string value. ClassLoader is one example.

A list of well-known types has been added: if the property type matches
an element of this list, it is ignored.

Fixes gh-2012
2014-12-02 19:00:25 -08:00
Phillip Webb
4c7cc58a19 Correct ApplicationPidFileWriter property javadoc
Fixes gh-2041
2014-12-02 17:40:41 -08:00
Phillip Webb
39ee583977 Retain YAML property ordering
Update YamlPropertySourceLoader to use a MapPropertySource rather than
a PropertiesPropertySource to ensure that the underlying order is
retained.

Fixes gh-2022
2014-12-02 17:31:50 -08:00
Phillip Webb
6c96608b11 Upgrade to Spring Framework 4.1.3.BUILD-SNAPSHOT
Upgrade to the SNAPSHOT so that CI will catch any problems early.

See gh-2038
2014-12-02 17:29:51 -08:00
Phillip Webb
1a5735191f Warn on @ComponentScan of default package
Add ConfigurationWarningsApplicationContextInitializer to report
warnings for common configuration mistakes. Currently the initializer
will log a warning if @ComponentScan is used on a @Configuration class
in the "default" package.

Fixes gh-2050
2014-12-02 15:19:52 -08:00
Phillip Webb
447c9ff204 Polish 2014-12-02 15:19:51 -08:00
Andy Wilkinson
0a8bc482fa Add documentation for Ssl properties
Closes gh-2049
2014-12-02 17:48:46 +01:00
Graeme Rocher
dbcbebca4a Propagate exception / test failures so that the correct status code is returned.
Fixes gh-2048 and fixes gh-2051
2014-12-02 16:22:47 +00:00
Stephane Nicoll
1611e631db Merge pull request #2029 from maciejwalkowiak/spring-jms-pub-sub-fix
* spring-jms-pub-sub-fix:
  Apply pubSubDomain property to ContainerFactory
2014-12-02 15:06:18 +01:00
Maciej Walkowiak
c74e56d185 Apply pubSubDomain property to ContainerFactory
Previously, tuning the pubSubDomain flag only impacted the created
JmsTemplate leaving any default listeners with the default settings.

If no default JmsListenerContainerFactory is defined, the created
one is using that property as well now.
2014-12-02 15:04:00 +01:00
Stephane Nicoll
4ce621951c Add debug property to meta-data
Closes gh-2044
2014-12-02 14:57:49 +01:00
Andy Wilkinson
f9b5c6b1ae Merge branch '1.1.x' 2014-12-02 11:22:57 +00:00
Andy Wilkinson
3b78aa9493 Make Security auto-config conditional on spring-security-config
SecurityAutoConfiguration, via its import of
AuthenticationManagerConfiguration, requires spring-security-config
to be on the classpath as AuthenticationManagerConfiguration extends
GlobalAuthenticationConfigurerAdapter from spring-security-config.

This commit makes SecurityAutoConfiguration conditional on the
presence of GlobalAuthenticationConfigurerAdapter so that the
auto-configuration will be disabled in its absence rather than causing
an app to fail to start.

Closes gh-2046
2014-12-02 11:18:23 +00:00
Dave Syer
9de82f9c69 Add some space between the trace filter and the end of the chain 2014-12-02 11:14:03 +00:00
Andy Wilkinson
8520554eb2 Allow the SpringApplication class used by the CLI to be configured
This commit adds support to the CLI for launching a custom
SpringApplication implementation. The class that is launched can be
configured using the spring.application.class.name System property
or the SPRING_APPLICATION_CLASS_NAME environment variable with the
former taking priority.

Closes gh-2030
2014-12-02 10:01:05 +00:00
Andy Wilkinson
064f88a9fb Use a free port, rather than 8080, in WebSocketAutoConfigurationTests
Closes gh-2043
2014-12-02 09:46:48 +00:00
Phillip Webb
09dac5ff00 Apply formatting and cleanup rules 2014-12-01 19:35:03 -08:00
Phillip Webb
48db5457f1 Polish 2014-12-01 19:32:05 -08:00
Phillip Webb
237defaf18 Merge branch '1.1.x' 2014-12-01 14:29:58 -08:00
Phillip Webb
41c15f205f Polish concurrent gaugeLocks map access
See gh-1995
2014-12-01 14:29:22 -08:00