Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
b7c2bd9c
Commit
b7c2bd9c
authored
Dec 14, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove problematic words from documentation
Closes gh-11224
parent
ef78cb33
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
94 additions
and
94 deletions
+94
-94
appendix-configuration-metadata.adoc
...cs/src/main/asciidoc/appendix-configuration-metadata.adoc
+5
-5
build-tool-plugins.adoc
...pring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
+2
-2
howto.adoc
...oot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
+8
-8
spring-boot-features.adoc
...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+60
-60
using-spring-boot.adoc
...spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+2
-2
CompleteTwoDataSourcesExample.java
...ingframework/boot/jdbc/CompleteTwoDataSourcesExample.java
+10
-10
SimpleTwoDataSourcesExample.java
...pringframework/boot/jdbc/SimpleTwoDataSourcesExample.java
+7
-7
No files found.
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc
View file @
b7c2bd9c
...
...
@@ -236,13 +236,13 @@ should no longer be used. If no reason and replacement are available, an empty
Deprecation can also be specified declaratively in code by adding the
`@DeprecatedConfigurationProperty` annotation to the getter exposing the deprecated
property. For instance, assume that the `app.
foo
.target` property was confusing and
was renamed to `app.
foo
.name`. The following example shows how to handle that situation:
property. For instance, assume that the `app.
acme
.target` property was confusing and
was renamed to `app.
acme
.name`. The following example shows how to handle that situation:
[source,java,indent=0]
----
@ConfigurationProperties("app.
foo
")
public class
Foo
Properties {
@ConfigurationProperties("app.
acme
")
public class
Acme
Properties {
private String name;
...
...
@@ -250,7 +250,7 @@ was renamed to `app.foo.name`. The following example shows how to handle that si
public void setName(String name) { ... }
@DeprecatedConfigurationProperty(replacement = "app.
foo
.name")
@DeprecatedConfigurationProperty(replacement = "app.
acme
.name")
@Deprecated
public String getTarget() {
return getName();
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
View file @
b7c2bd9c
...
...
@@ -256,7 +256,7 @@ of the application.
[source,xml,indent=0]
----
<spring-boot:exejar destfile="target/my-application.jar"
classes="target/classes" start-class="com.
foo
.MyApplication">
classes="target/classes" start-class="com.
example
.MyApplication">
<resources>
<fileset dir="src/main/resources" />
</resources>
...
...
@@ -318,7 +318,7 @@ attributes are supported:
.Override and set
[source,xml,indent=0]
----
<findmainclass mainclass="com.
foo
.MainClass" property="main-class" />
<findmainclass mainclass="com.
example
.MainClass" property="main-class" />
----
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
View file @
b7c2bd9c
...
...
@@ -1666,7 +1666,7 @@ on the primary data source:
include::{code-examples}/jdbc/SimpleTwoDataSourcesExample.java[tag=configuration]
----
TIP: `f
oo
DataSourceProperties` has to be flagged as `@Primary` so that the database
TIP: `f
irst
DataSourceProperties` has to be flagged as `@Primary` so that the database
initializer feature uses your copy (if you use the initializer).
Both data sources are also bound for advanced customizations. For instance, you could
...
...
@@ -1674,13 +1674,13 @@ configure them as follows:
[source,properties,indent=0]
----
app.datasource.f
oo
.type=com.zaxxer.hikari.HikariDataSource
app.datasource.f
oo
.maximum-pool-size=30
app.datasource.f
irst
.type=com.zaxxer.hikari.HikariDataSource
app.datasource.f
irst
.maximum-pool-size=30
app.datasource.
bar
.url=jdbc:mysql://localhost/test
app.datasource.
bar
.username=dbuser
app.datasource.
bar
.password=dbpass
app.datasource.
bar
.max-total=30
app.datasource.
second
.url=jdbc:mysql://localhost/test
app.datasource.
second
.username=dbuser
app.datasource.
second
.password=dbpass
app.datasource.
second
.max-total=30
----
You can apply the same concept to the secondary `DataSource` as well, as shown in the
...
...
@@ -2453,7 +2453,7 @@ Additional properties can be added by using the DSL, as shown in the following e
springBoot {
buildInfo {
additionalProperties = [
'
foo': 'bar
'
'
acme': 'test
'
]
}
}
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
b7c2bd9c
This diff is collapsed.
Click to expand it.
spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View file @
b7c2bd9c
...
...
@@ -65,8 +65,8 @@ filtering].
https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID], and
http://maven.apache.org/plugins/maven-shade-plugin/[shade]).
* Sensible resource filtering for `application.properties` and `application.yml`
including profile-specific files (for example, `application-
foo
.properties` and
`application-
foo
.yml`)
including profile-specific files (for example, `application-
dev
.properties` and
`application-
dev
.yml`)
Note that, since the `application.properties` and `application.yml` files accept Spring
style placeholders (`${...}`), the Maven filtering is changed to use `@..@` placeholders.
...
...
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/CompleteTwoDataSourcesExample.java
View file @
b7c2bd9c
...
...
@@ -41,28 +41,28 @@ public class CompleteTwoDataSourcesExample {
// tag::configuration[]
@Bean
@Primary
@ConfigurationProperties
(
"app.datasource.f
oo
"
)
public
DataSourceProperties
f
oo
DataSourceProperties
()
{
@ConfigurationProperties
(
"app.datasource.f
irst
"
)
public
DataSourceProperties
f
irst
DataSourceProperties
()
{
return
new
DataSourceProperties
();
}
@Bean
@Primary
@ConfigurationProperties
(
"app.datasource.f
oo
"
)
public
DataSource
f
oo
DataSource
()
{
return
f
oo
DataSourceProperties
().
initializeDataSourceBuilder
().
build
();
@ConfigurationProperties
(
"app.datasource.f
irst
"
)
public
DataSource
f
irst
DataSource
()
{
return
f
irst
DataSourceProperties
().
initializeDataSourceBuilder
().
build
();
}
@Bean
@ConfigurationProperties
(
"app.datasource.
bar
"
)
public
DataSourceProperties
bar
DataSourceProperties
()
{
@ConfigurationProperties
(
"app.datasource.
second
"
)
public
DataSourceProperties
second
DataSourceProperties
()
{
return
new
DataSourceProperties
();
}
@Bean
@ConfigurationProperties
(
"app.datasource.
bar
"
)
public
DataSource
bar
DataSource
()
{
return
bar
DataSourceProperties
().
initializeDataSourceBuilder
().
build
();
@ConfigurationProperties
(
"app.datasource.
second
"
)
public
DataSource
second
DataSource
()
{
return
second
DataSourceProperties
().
initializeDataSourceBuilder
().
build
();
}
// end::configuration[]
...
...
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/SimpleTwoDataSourcesExample.java
View file @
b7c2bd9c
...
...
@@ -43,21 +43,21 @@ public class SimpleTwoDataSourcesExample {
// tag::configuration[]
@Bean
@Primary
@ConfigurationProperties
(
"app.datasource.f
oo
"
)
public
DataSourceProperties
f
oo
DataSourceProperties
()
{
@ConfigurationProperties
(
"app.datasource.f
irst
"
)
public
DataSourceProperties
f
irst
DataSourceProperties
()
{
return
new
DataSourceProperties
();
}
@Bean
@Primary
@ConfigurationProperties
(
"app.datasource.f
oo
"
)
public
DataSource
f
oo
DataSource
()
{
return
f
oo
DataSourceProperties
().
initializeDataSourceBuilder
().
build
();
@ConfigurationProperties
(
"app.datasource.f
irst
"
)
public
DataSource
f
irst
DataSource
()
{
return
f
irst
DataSourceProperties
().
initializeDataSourceBuilder
().
build
();
}
@Bean
@ConfigurationProperties
(
"app.datasource.
bar
"
)
public
BasicDataSource
bar
DataSource
()
{
@ConfigurationProperties
(
"app.datasource.
second
"
)
public
BasicDataSource
second
DataSource
()
{
return
DataSourceBuilder
.
create
().
type
(
BasicDataSource
.
class
).
build
();
}
// end::configuration[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment