Commit f3537daf authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #8143 from michael-simons:doc-migration

* pr/8143:
  Fix indentation
  Clarify usage of @ImportResource in doc
parents 3e4ed59f 09205a8f
...@@ -3235,9 +3235,9 @@ replacing those elements from the `web.xml` as follows: ...@@ -3235,9 +3235,9 @@ replacing those elements from the `web.xml` as follows:
container as if it was a `<servlet/>` and `<servlet-mapping/>` in `web.xml`. container as if it was a `<servlet/>` and `<servlet-mapping/>` in `web.xml`.
* A `@Bean` of type `Filter` or `FilterRegistrationBean` behaves similarly (like a * A `@Bean` of type `Filter` or `FilterRegistrationBean` behaves similarly (like a
`<filter/>` and `<filter-mapping/>`. `<filter/>` and `<filter-mapping/>`.
* An `ApplicationContext` in an XML file can be added to an `@Import` in your * An `ApplicationContext` in an XML file can be added through an `@ImportResource` in
`Application`. Or simple cases where annotation configuration is heavily used already your `Application`. Or simple cases where annotation configuration is heavily used
can be recreated in a few lines as `@Bean` definitions. 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 Once the war is working we make it executable by adding a `main` method to our
`Application`, e.g. `Application`, e.g.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment