Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3211 from izeye/patch-21

Browse Source 
* patch-21:
  Fix meta-data for spring.jmx.server
  Fix mbean server property
This commit is contained in:
Stephane Nicoll
2015-06-13 18:21:26 +02:00
parent 641ceca3a9 bc4ae336f9
commit 253da6f3fe
2 changed files with 2 additions and 2 deletions
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

@@ -99,7 +99,7 @@
"defaultValue": true
},
{
"name": "spring.jmx.mbean-server",
"name": "spring.jmx.server",
"type": "java.lang.String",
"description": "MBeanServer bean name.",
"defaultValue": "mBeanServer"

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

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