From f50a0f97074bf82c147e17f85d5414a4d165d6a8 Mon Sep 17 00:00:00 2001 From: "Michael J. Simons" Date: Tue, 31 Jan 2017 09:08:19 +0100 Subject: [PATCH 1/2] Clarify usage of @ImportResource in doc See gh-8143 --- spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 0451c16423..846d41f1ed 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -3235,7 +3235,7 @@ replacing those elements from the `web.xml` as follows: container as if it was a `` and `` in `web.xml`. * A `@Bean` of type `Filter` or `FilterRegistrationBean` behaves similarly (like a `` and ``. -* 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 your `Application`. Or simple cases where annotation configuration is heavily used already can be recreated in a few lines as `@Bean` definitions. From 09205a8fc812315ab0c4516af373a9043a02b643 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 2 Mar 2017 09:54:34 +0100 Subject: [PATCH 2/2] Fix indentation Closes gh-8143 --- spring-boot-docs/src/main/asciidoc/howto.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 846d41f1ed..45b307530b 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -3235,9 +3235,9 @@ replacing those elements from the `web.xml` as follows: container as if it was a `` and `` in `web.xml`. * A `@Bean` of type `Filter` or `FilterRegistrationBean` behaves similarly (like a `` and ``. -* 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. +* 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.