Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll 2017-03-02 09:55:29 +01:00
commit b5b69cca03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -3228,9 +3228,9 @@ replacing those elements from the `web.xml` as follows:
container as if it was a `<servlet/>` and `<servlet-mapping/>` in `web.xml`.
* A `@Bean` of type `Filter` or `FilterRegistrationBean` behaves similarly (like a
`<filter/>` and `<filter-mapping/>`.
* An `ApplicationContext` in an XML file can be added to an `@Import` in your
`Application`. Or simple cases where annotation configuration is heavily used already
can be recreated in a few lines as `@Bean` definitions.
* An `ApplicationContext` in an XML file can be added through an `@ImportResource` in
your `Application`. Or simple cases where annotation configuration is heavily used
already can be recreated in a few lines as `@Bean` definitions.
Once the war is working we make it executable by adding a `main` method to our
`Application`, e.g.