root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3283 from izeye/mbeanserver 

* mbeanserver:
  Fix default MBeanServer bean name in doc
This commit is contained in:
Stephane Nicoll 2015-06-18 17:46:27 +02:00
parent b2960a7221 436054053c
commit c64da5d1d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -102,7 +102,7 @@
"name": "spring.jmx.server", "name": "spring.jmx.server",
"type": "java.lang.String", "type": "java.lang.String",
"description": "MBeanServer bean name.", "description": "MBeanServer bean name.",
"defaultValue": "mBeanServer" "defaultValue": "mbeanServer"
}, },
{ {
"name": "spring.jpa.open-in-view", "name": "spring.jpa.open-in-view",

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -447,7 +447,7 @@ content into your application; rather pick only the properties that you need.
# JMX # JMX
spring.jmx.default-domain= # JMX domain name spring.jmx.default-domain= # JMX domain name
spring.jmx.enabled=true # Expose MBeans from Spring spring.jmx.enabled=true # Expose MBeans from Spring
spring.jmx.server=mBeanServer # MBeanServer bean name spring.jmx.server=mbeanServer # MBeanServer bean name
# RABBIT ({sc-spring-boot-autoconfigure}/amqp/RabbitProperties.{sc-ext}[RabbitProperties]) # RABBIT ({sc-spring-boot-autoconfigure}/amqp/RabbitProperties.{sc-ext}[RabbitProperties])
spring.rabbitmq.addresses= # connection addresses (e.g. myhost:9999,otherhost:1111) spring.rabbitmq.addresses= # connection addresses (e.g. myhost:9999,otherhost:1111)