Commit Graph

1089 Commits

Author SHA1 Message Date
Phillip Webb 67556ba8ea Restructure embedded web server packages
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:

Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server

Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter

Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server

Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded

In addition:

- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
  to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
  `ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
  `ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.

Fixes gh-8532
2017-03-12 21:08:25 -07:00
Phillip Webb d8f827d224 Cleanup and format code 2017-03-06 17:08:09 -08:00
Phillip Webb 425dbc3e52 Update copyright header for edited files 2017-03-06 15:04:07 -08:00
Phillip Webb 2a592103f0 Polish formatting 2017-03-06 15:03:43 -08:00
Vedran Pavic 1c789f1a8d Remove dependency management for `hibernate-entitymanager`
Closes gh-8433
2017-03-02 18:31:53 +01:00
Stephane Nicoll cb40ea485b Merge branch '1.5.x' 2017-03-02 14:31:49 +01:00
Stephane Nicoll 5cc569fc91 Improve execution speed of `CacheAutoConfigurationTests`
As of Hazelcast 3.7, the bootstrap is pretty slow by default due to the
networking discovery. This commit disables both TCP/IP and multicast
discoveries.
2017-03-02 14:28:33 +01:00
Phillip Webb a4bcd20b64 Merge branch '1.5.x' 2017-02-27 20:43:18 -08:00
Phillip Webb ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
Phillip Webb 5867cd6175 Polish 2017-02-27 20:41:18 -08:00
Phillip Webb 47fd5f4fac Merge branch '1.4.x' into 1.5.x 2017-02-27 14:00:46 -08:00
Phillip Webb 47b00c086c Polish 2017-02-27 13:56:17 -08:00
Stephane Nicoll 12397edbd4 Expose a WebTestClient with `@SpringBootTest`
This commit exposes a `WebTestClient` automatically in a reactive
integration test that uses an embedded web server. This is similar to
what we do with `TestRestTemplate` for servlet based integration tests.

Closes gh-8399
2017-02-24 13:50:58 +01:00
Brian Clozel c1e93d8991 Add WebFlux application sample
This commit adds a sample application for the
annotation variant of Spring WebFlux.
2017-02-24 13:03:12 +01:00
Andy Wilkinson ad30ad808b Merge branch '1.5.x' 2017-02-20 08:59:51 +00:00
Andy Wilkinson 4f29bc9c14 Make mvn verify work without install of spring-boot-dependencies
Previously, the custom layout sample could only be built successfully
if spring-boot-dependencies had be installed locally, making its
effective pom available in the local Maven cache.

This commit updates the sample's tests to look at its own pom to
determine the version of Spring Boot that should be used in the
Gradle tests.

Closes gh-8330
2017-02-20 08:59:13 +00:00
Stephane Nicoll 093140ae44 Merge branch '1.5.x' 2017-02-13 09:54:39 +01:00
Stephane Nicoll 842170768d Polish cache sample readme
Closes gh-8272
2017-02-13 09:53:37 +01:00
Andy Wilkinson df08863641 Make ServletRegistrationBean and FilterRegistration bean generic
Closes gh-7666
2017-02-09 13:36:35 +00:00
Andy Wilkinson fbf493b1e8 Merge branch '1.5.x' 2017-02-08 20:51:37 +00:00
Andy Wilkinson ab192d01cc Merge branch '1.4.x' into 1.5.x 2017-02-08 20:51:30 +00:00
Andy Wilkinson 7e030d2068 Polish 2017-02-08 20:51:23 +00:00
Andy Wilkinson 1efa700713 Merge branch '1.5.x' 2017-02-08 20:50:45 +00:00
Andy Wilkinson 25982ecf69 Merge branch '1.4.x' into 1.5.x 2017-02-08 20:50:24 +00:00
Andy Wilkinson 04c8b912ee Fall back to standard LiveBeansView behaviour when MBean is in use
Closes gh-8146
2017-02-08 20:49:16 +00:00
Brian Clozel 12d883f6b9 Introduce "server.servlet" configuration prefix
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.

Closes gh-8066
2017-02-07 16:48:22 +01:00
Stephane Nicoll b2ec03cd4e Restore couchbase support
This commit effectively reverts the changes that were applied to
workaround the breakage in spring-data-couchbase.

Closes gh-8200
2017-02-07 12:03:27 +01:00
Brian Clozel 8619d6a229 Rename EmbeddedServletContainer -> EmbeddedWebServer
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).

Fixes gh-8208
2017-02-06 17:44:26 +01:00
Stephane Nicoll 6af6e8e31b Remove auto-configuration for ServerProperties
This commit removes `ServerProperties` and `ManagementServerProperties`
auto-configurations. Those properties objects are now created using
`@EnableConfigurationProperties` only.

Closes gh-8108
2017-02-06 14:00:50 +01:00
Stephane Nicoll e0c8e1f514 Ignore test until couchbase support is restored
The changes required to restore our Couchbase support are too involved
and we should hear from the data couchbase team first.

See gh-8200
2017-02-06 13:27:22 +01:00
Stephane Nicoll cfdc75d384 Merge branch '1.5.x' 2017-02-06 10:38:16 +01:00
Stephane Nicoll 4d7b03b002 Polish contribution
Closes gh-8202
2017-02-06 10:34:22 +01:00
John Blum 31ed70e1b8 Improve spring-boot-sample-cache UX by using Maven profiles
See gh-8202
2017-02-06 09:50:40 +01:00
Madhura Bhave 5dafa3ae9c Fixup version numbers following release 2017-01-30 15:27:42 -08:00
Andy Wilkinson 95f659f4f9 Add new WebApplicationType enum to pave the way for Web Flux support
Closes gh-8077
2017-01-30 20:26:24 +00:00
Spring Buildmaster 5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Andy Wilkinson c00638fee3 Remove Thymeleaf's layout dialect from its starter and update samples
Closes gh-7557
2017-01-30 14:20:50 +00:00
Andy Wilkinson a9656145de Fix up version numbers following release 2017-01-30 12:27:04 +00:00
Spring Buildmaster a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Andy Wilkinson bed727ae8c Merge branch '1.5.x' 2017-01-26 15:05:02 +00:00
Andy Wilkinson f34d309548 Formatting 2017-01-26 15:03:02 +00:00
Stephane Nicoll bd0c1cb9c3 Fixup version numbers following release 2017-01-26 15:55:14 +01:00
Spring Buildmaster ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Andy Wilkinson 9bba73a1a9 Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.

Closes gh-7450
Closes gh-6258
See gh-7885
2017-01-25 13:59:09 +00:00
Andy Wilkinson 9c77708fcb Remove Jetty 9.3 sample that was missed in dbd10a8d
See gh-7985
2017-01-25 13:54:25 +00:00
Andy Wilkinson dbd10a8daa Remove support for Jetty 9.3 and earlier
Closes gh-7985
2017-01-24 20:00:50 +00:00
Andy Wilkinson 0807c27c26 Complete removing support for Tomcat 7
Closes gh-6416
2017-01-24 17:26:30 +00:00
Andy Wilkinson 0f998e2ae1 Merge branch '1.5.x' 2017-01-24 12:39:45 +00:00
Andy Wilkinson 013d45a4d7 Upgrade to Jetty 9.4.1.v20170120
Closes gh-7750
2017-01-24 12:39:22 +00:00
Andy Wilkinson fa22396dae Merge branch '1.5.x' 2017-01-24 10:53:29 +00:00