Commit 83bd36d8 authored by Phillip Webb's avatar Phillip Webb

Merge branch '1.1.x'

Conflicts:
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
parents 1fe13999 eb721b1e
...@@ -97,7 +97,7 @@ public class MetricFilterAutoConfiguration { ...@@ -97,7 +97,7 @@ public class MetricFilterAutoConfiguration {
try { try {
httpStatus = HttpStatus.valueOf(status); httpStatus = HttpStatus.valueOf(status);
} }
catch (Exception e) { catch (Exception ex) {
// not convertible // not convertible
} }
if (bestMatchingPattern != null) { if (bestMatchingPattern != null) {
......
...@@ -17,7 +17,14 @@ ...@@ -17,7 +17,14 @@
package org.springframework.boot.autoconfigure; package org.springframework.boot.autoconfigure;
import java.io.IOException; import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration.ResourceBundleCondition; import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration.ResourceBundleCondition;
import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
...@@ -118,7 +125,7 @@ public class MessageSourceAutoConfiguration { ...@@ -118,7 +125,7 @@ public class MessageSourceAutoConfiguration {
private Resource[] getResources(ClassLoader classLoader, String name) { private Resource[] getResources(ClassLoader classLoader, String name) {
try { try {
return new PathMatchingResourcePatternResolver(classLoader) return new ExtendedPathMatchingResourcePatternResolver(classLoader)
.getResources("classpath*:" + name + "*.properties"); .getResources("classpath*:" + name + "*.properties");
} }
catch (IOException ex) { catch (IOException ex) {
...@@ -128,4 +135,67 @@ public class MessageSourceAutoConfiguration { ...@@ -128,4 +135,67 @@ public class MessageSourceAutoConfiguration {
} }
/**
* Extended version of {@link PathMatchingResourcePatternResolver} to deal with the
* fact that "{@code classpath*:...*.properties}" patterns don't work with
* {@link URLClassLoader}s.
*/
private static class ExtendedPathMatchingResourcePatternResolver extends
PathMatchingResourcePatternResolver {
private static final Log logger = LogFactory
.getLog(PathMatchingResourcePatternResolver.class);
public ExtendedPathMatchingResourcePatternResolver(ClassLoader classLoader) {
super(classLoader);
}
@Override
protected Resource[] findAllClassPathResources(String location)
throws IOException {
String path = location;
if (path.startsWith("/")) {
path = path.substring(1);
}
if ("".equals(path)) {
Set<Resource> result = new LinkedHashSet<Resource>(16);
result.addAll(Arrays.asList(super.findAllClassPathResources(location)));
addAllClassLoaderJarUrls(getClassLoader(), result);
return result.toArray(new Resource[result.size()]);
}
return super.findAllClassPathResources(location);
}
private void addAllClassLoaderJarUrls(ClassLoader classLoader,
Set<Resource> result) {
if (classLoader != null) {
if (classLoader instanceof URLClassLoader) {
addAllClassLoaderJarUrls(((URLClassLoader) classLoader).getURLs(),
result);
}
addAllClassLoaderJarUrls(classLoader.getParent(), result);
}
}
private void addAllClassLoaderJarUrls(URL[] urls, Set<Resource> result) {
for (URL url : urls) {
if ("file".equals(url.getProtocol())
&& url.toString().toLowerCase().endsWith(".jar")) {
try {
URL jarUrl = new URL("jar:" + url.toString() + "!/");
jarUrl.openConnection();
result.add(convertClassLoaderURL(jarUrl));
}
catch (Exception ex) {
if (logger.isWarnEnabled()) {
logger.warn("Cannot search for matching files underneath "
+ url + " because it cannot be accessed as a JAR", ex);
}
}
}
}
}
}
} }
...@@ -127,6 +127,7 @@ public class AuthenticationManagerConfiguration extends ...@@ -127,6 +127,7 @@ public class AuthenticationManagerConfiguration extends
GlobalAuthenticationConfigurerAdapter { GlobalAuthenticationConfigurerAdapter {
private AuthenticationManagerBuilder defaultAuth; private AuthenticationManagerBuilder defaultAuth;
private AuthenticationManager parent; private AuthenticationManager parent;
public void configureParent(AuthenticationManagerBuilder auth) { public void configureParent(AuthenticationManagerBuilder auth) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment