mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Polish
This commit is contained in:
parent
2f12dc823c
commit
a374929c90
@ -20,6 +20,7 @@ import javax.management.MBeanServer;
|
||||
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.FactoryBean;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
@ -87,7 +88,15 @@ public class JmxAutoConfiguration {
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(MBeanServer.class)
|
||||
public MBeanServer mbeanServer() {
|
||||
return SpecificPlatform.get().getMBeanServer();
|
||||
SpecificPlatform platform = SpecificPlatform.get();
|
||||
if (platform != null) {
|
||||
return platform.getMBeanServer();
|
||||
}
|
||||
MBeanServerFactoryBean factory = new MBeanServerFactoryBean();
|
||||
factory.setLocateExistingServerIfPossible(true);
|
||||
factory.afterPropertiesSet();
|
||||
return factory.getObject();
|
||||
|
||||
}
|
||||
|
||||
@EnableMBeanExport(defaultDomain = "${spring.jmx.default_domain:}", server = "${spring.jmx.server:mbeanServer}")
|
||||
@ -112,16 +121,6 @@ public class JmxAutoConfiguration {
|
||||
public FactoryBean<MBeanServer> getMBeanServerFactory() {
|
||||
return new WebSphereMBeanServerFactoryBean();
|
||||
}
|
||||
},
|
||||
|
||||
GENERIC("org.springframework.jmx.support.MBeanServerFactoryBean") {
|
||||
@Override
|
||||
public FactoryBean<MBeanServer> getMBeanServerFactory() {
|
||||
MBeanServerFactoryBean factory = new MBeanServerFactoryBean();
|
||||
factory.setLocateExistingServerIfPossible(true);
|
||||
factory.afterPropertiesSet();
|
||||
return factory;
|
||||
}
|
||||
};
|
||||
|
||||
private final String identifyingClass;
|
||||
@ -131,9 +130,12 @@ public class JmxAutoConfiguration {
|
||||
}
|
||||
|
||||
public MBeanServer getMBeanServer() {
|
||||
Object server;
|
||||
try {
|
||||
server = getMBeanServerFactory().getObject();
|
||||
FactoryBean<?> factory = getMBeanServerFactory();
|
||||
if (factory instanceof InitializingBean) {
|
||||
((InitializingBean) factory).afterPropertiesSet();
|
||||
}
|
||||
Object server = factory.getObject();
|
||||
Assert.isInstanceOf(MBeanServer.class, server);
|
||||
return (MBeanServer) server;
|
||||
}
|
||||
|
@ -169,9 +169,10 @@ public class CommandRunner implements Iterable<Command> {
|
||||
try {
|
||||
ExitStatus result = run(argsWithoutDebugFlags);
|
||||
// The caller will hang up if it gets a non-zero status
|
||||
return result == null ? 0
|
||||
: result.isHangup() ? (result.getCode() > 0 ? result.getCode() : 0)
|
||||
: 0;
|
||||
if (result != null && result.isHangup()) {
|
||||
return (result.getCode() > 0 ? result.getCode() : 0);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
catch (NoArgumentsException ex) {
|
||||
showUsage();
|
||||
|
@ -27,12 +27,12 @@ package org.springframework.boot.cli.command.status;
|
||||
public final class ExitStatus {
|
||||
|
||||
/**
|
||||
* Generic "OK" exit status with zero exit code and hangup=fa;se
|
||||
* Generic "OK" exit status with zero exit code and {@literal hangup=false}
|
||||
*/
|
||||
public static ExitStatus OK = new ExitStatus(0, "OK");
|
||||
|
||||
/**
|
||||
* Generic "not OK" exit status with non-zero exit code and hangup=true
|
||||
* Generic "not OK" exit status with non-zero exit code and {@literal hangup=true}
|
||||
*/
|
||||
public static ExitStatus ERROR = new ExitStatus(-1, "ERROR", true);
|
||||
|
||||
@ -44,7 +44,6 @@ public final class ExitStatus {
|
||||
|
||||
/**
|
||||
* Create a new ExitStatus with an exit code and name as specified.
|
||||
*
|
||||
* @param code the exit code
|
||||
* @param name the name
|
||||
*/
|
||||
@ -90,7 +89,6 @@ public final class ExitStatus {
|
||||
|
||||
/**
|
||||
* Convert the existing code to a hangup.
|
||||
*
|
||||
* @return a new ExitStatus with hangup=true
|
||||
*/
|
||||
public ExitStatus hangup() {
|
||||
|
@ -265,24 +265,23 @@ executable jar file. For example:
|
||||
$ spring jar my-app.jar *.groovy
|
||||
----
|
||||
|
||||
The resulting jar will contain the classes produced by compiling the
|
||||
application and all of the application's dependencies so that it can
|
||||
then be run using `java -jar`. The jar file will also contain entries
|
||||
from the application's classpath. You can add explicit paths to the
|
||||
jar using `--include` and `--exclude` (both are comma separated, and
|
||||
both accept prefixes to the values "+" and "-" to signify that they
|
||||
shoudl be removed from the defaults). The default includes are
|
||||
The resulting jar will contain the classes produced by compiling the application and all
|
||||
of the application's dependencies so that it can then be run using `java -jar`. The jar
|
||||
file will also contain entries from the application's classpath. You can add explicit
|
||||
paths to the jar using `--include` and `--exclude` (both are comma separated, and both
|
||||
accept prefixes to the values ``+'' and ``-'' to signify that they should be removed from
|
||||
the defaults). The default includes are
|
||||
|
||||
[indent=0]
|
||||
----
|
||||
public/**, resources/**, static/**, templates/**, META-INF/**, *
|
||||
public/**, resources/**, static/**, templates/**, META-INF/**, *
|
||||
----
|
||||
|
||||
and the default excludes are
|
||||
and the default excludes are
|
||||
|
||||
[indent=0]
|
||||
----
|
||||
.*, repository/**, build/**, target/**, **/*.jar, **/*.groovy
|
||||
.*, repository/**, build/**, target/**, **/*.jar, **/*.groovy
|
||||
----
|
||||
|
||||
See the output of `spring help jar` for more information.
|
||||
|
Loading…
Reference in New Issue
Block a user