fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb 2016-01-21 10:53:25 -08:00
parent af36bf6864
commit c71aa32fbb
6 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

14
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
View File

@ -549,19 +549,13 @@ public class PropertiesLauncher extends Launcher {
if (url.toString().endsWith(".jar") || url.toString().endsWith(".zip")) { if (url.toString().endsWith(".jar") || url.toString().endsWith(".zip")) {
return new JarFileArchive(new File(url.toURI())); return new JarFileArchive(new File(url.toURI()));
} }
else if (url.toString().endsWith("/*")) { if (url.toString().endsWith("/*")) {
String name = url.getFile(); String name = url.getFile();
File dir = new File(name.substring(0, name.length() - 1)); File dir = new File(name.substring(0, name.length() - 1));
if (dir.exists()) { return (dir.exists() ? new ExplodedArchive(dir, false) : null);
return new ExplodedArchive(new File(name.substring(0, name.length() - 1)),
false);
}
} }
else { String filename = URLDecoder.decode(url.getFile(), "UTF-8");
String filename = URLDecoder.decode(url.getFile(), "UTF-8"); return new ExplodedArchive(new File(filename));
return new ExplodedArchive(new File(filename));
}
return null;
} }
private void addNestedArchivesFromParent(List<Archive> urls) { private void addNestedArchivesFromParent(List<Archive> urls) {

18
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -600,9 +600,9 @@ public class TomcatEmbeddedServletContainerFactory
private static class TomcatErrorPage { private static class TomcatErrorPage {
private static final String ERROR_PAGE_TOMCAT7 = "org.apache.catalina.deploy.ErrorPage"; private static final String ERROR_PAGE_CLASS = "org.apache.tomcat.util.descriptor.web.ErrorPage";
private static final String ERROR_PAGE_TOMCAT = "org.apache.tomcat.util.descriptor.web.ErrorPage"; private static final String LEGACY_ERROR_PAGE_CLASS = "org.apache.catalina.deploy.ErrorPage";
private final String location; private final String location;
@ -622,13 +622,13 @@ public class TomcatEmbeddedServletContainerFactory
private Object createNativePage(ErrorPage errorPage) { private Object createNativePage(ErrorPage errorPage) {
Object nativePage = null; Object nativePage = null;
try { try {
if (ClassUtils.isPresent(ERROR_PAGE_TOMCAT, null)) { if (ClassUtils.isPresent(ERROR_PAGE_CLASS, null)) {
nativePage = BeanUtils.instantiate(ClassUtils nativePage = BeanUtils
.forName(ERROR_PAGE_TOMCAT, null)); .instantiate(ClassUtils.forName(ERROR_PAGE_CLASS, null));
} }
else if (ClassUtils.isPresent(ERROR_PAGE_TOMCAT7, null)) { else if (ClassUtils.isPresent(LEGACY_ERROR_PAGE_CLASS, null)) {
nativePage = BeanUtils.instantiate(ClassUtils nativePage = BeanUtils.instantiate(
.forName(ERROR_PAGE_TOMCAT7, null)); ClassUtils.forName(LEGACY_ERROR_PAGE_CLASS, null));
} }
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
@ -643,7 +643,7 @@ public class TomcatEmbeddedServletContainerFactory
public void addToContext(Context context) { public void addToContext(Context context) {
Assert.state(this.nativePage != null, Assert.state(this.nativePage != null,
"Neither Tomcat 7 nor 8 detected so no native error page exists"); "Neither Tomcat 7 nor 8 detected so no native error page exists");
if (ClassUtils.isPresent(ERROR_PAGE_TOMCAT, null)) { if (ClassUtils.isPresent(ERROR_PAGE_CLASS, null)) {
org.apache.tomcat.util.descriptor.web.ErrorPage errorPage = (org.apache.tomcat.util.descriptor.web.ErrorPage) this.nativePage; org.apache.tomcat.util.descriptor.web.ErrorPage errorPage = (org.apache.tomcat.util.descriptor.web.ErrorPage) this.nativePage;
errorPage.setLocation(this.location); errorPage.setLocation(this.location);
errorPage.setErrorCode(this.errorCode); errorPage.setErrorCode(this.errorCode);