-
Notifications
You must be signed in to change notification settings - Fork 40.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Polish "Polish formatting of log configuration file"
See gh-43322
- Loading branch information
Showing
12 changed files
with
20 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <included> | ||
| <springProfile name="production"> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE" /> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE"/> | ||
| </springProfile> | ||
| </included> |
2 changes: 1 addition & 1 deletion
2
...oot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <included> | ||
| <springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test" /> | ||
| <springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test"/> | ||
| </included> |
4 changes: 2 additions & 2 deletions
4
...-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProfile name="production, test"> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE" /> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE"/> | ||
| </springProfile> | ||
| </configuration> |
4 changes: 2 additions & 2 deletions
4
...roject/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProfile name="outer"> | ||
| <springProfile name="inner"> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE" /> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE"/> | ||
| </springProfile> | ||
| </springProfile> | ||
| </configuration> |
4 changes: 2 additions & 2 deletions
4
...g-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProfile name="production"> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE" /> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE"/> | ||
| </springProfile> | ||
| </configuration> |
4 changes: 2 additions & 2 deletions
4
...g-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProfile name="production | test"> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE" /> | ||
| <logger name="org.springframework.boot.logging.logback" level="TRACE"/> | ||
| </springProfile> | ||
| </configuration> |
4 changes: 2 additions & 2 deletions
4
...g-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/include-with-profile.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <include resource="org/springframework/boot/logging/logback/include-with-profile.xml"/> | ||
| </configuration> |
2 changes: 1 addition & 1 deletion
2
...ot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProperty scope="context" name="SIMPLE" source="testpropertyfoobar" defaultValue="foo"/> | ||
| <springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/> | ||
| </configuration> |
6 changes: 3 additions & 3 deletions
6
...pring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <springProperty scope="context" name="MINE" source="my.example-property" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProperty scope="context" name="MINE" source="my.example-property"/> | ||
| <if condition='property("MINE").contains("true")'> | ||
| <then> | ||
| <variable scope="context" name="MYCHECK" value="i-was-included" /> | ||
| <variable scope="context" name="MYCHECK" value="i-was-included"/> | ||
| </then> | ||
| </if> | ||
| </configuration> |
4 changes: 2 additions & 2 deletions
4
...-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/include-with-property.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <include resource="org/springframework/boot/logging/logback/include-with-property.xml"/> | ||
| </configuration> |
2 changes: 1 addition & 1 deletion
2
...ject/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configuration> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml" /> | ||
| <include resource="org/springframework/boot/logging/logback/base.xml"/> | ||
| <springProperty scope="context" name="SIMPLE" source="testpropertyfoobar"/> | ||
| <springProperty scope="context" name="MINE" source="my.example-property"/> | ||
| </configuration> |