|
|
|
@ -197,7 +197,7 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa |
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
/* |
|
|
|
* (non-Javadoc) |
|
|
|
* (non-Javadoc) |
|
|
|
* |
|
|
|
* |
|
|
|
* @see org.springframework.context.annotation.ImportAware#setImportMetadata(org. |
|
|
|
* @see org.springframework.context.annotation.ImportAware#setImportMetadata(org. |
|
|
|
* springframework.core.type.AnnotationMetadata) |
|
|
|
* springframework.core.type.AnnotationMetadata) |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@ -206,23 +206,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa |
|
|
|
.getAnnotationAttributes(EnableWebSecurity.class.getName()); |
|
|
|
.getAnnotationAttributes(EnableWebSecurity.class.getName()); |
|
|
|
AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes |
|
|
|
AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes |
|
|
|
.fromMap(enableWebSecurityAttrMap); |
|
|
|
.fromMap(enableWebSecurityAttrMap); |
|
|
|
if (enableWebSecurityAttrs == null) { |
|
|
|
|
|
|
|
// search parent classes
|
|
|
|
|
|
|
|
Class<?> currentClass = ClassUtils.resolveClassName( |
|
|
|
|
|
|
|
importMetadata.getClassName(), beanClassLoader); |
|
|
|
|
|
|
|
for (Class<?> classToInspect = currentClass; classToInspect != null; classToInspect = classToInspect |
|
|
|
|
|
|
|
.getSuperclass()) { |
|
|
|
|
|
|
|
EnableWebSecurity enableWebSecurityAnnotation = AnnotationUtils |
|
|
|
|
|
|
|
.findAnnotation(classToInspect, EnableWebSecurity.class); |
|
|
|
|
|
|
|
if (enableWebSecurityAnnotation == null) { |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
enableWebSecurityAttrMap = AnnotationUtils |
|
|
|
|
|
|
|
.getAnnotationAttributes(enableWebSecurityAnnotation); |
|
|
|
|
|
|
|
enableWebSecurityAttrs = AnnotationAttributes |
|
|
|
|
|
|
|
.fromMap(enableWebSecurityAttrMap); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
debugEnabled = enableWebSecurityAttrs.getBoolean("debug"); |
|
|
|
debugEnabled = enableWebSecurityAttrs.getBoolean("debug"); |
|
|
|
if (webSecurity != null) { |
|
|
|
if (webSecurity != null) { |
|
|
|
webSecurity.debug(debugEnabled); |
|
|
|
webSecurity.debug(debugEnabled); |
|
|
|
@ -231,7 +214,7 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa |
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
/* |
|
|
|
* (non-Javadoc) |
|
|
|
* (non-Javadoc) |
|
|
|
* |
|
|
|
* |
|
|
|
* @see |
|
|
|
* @see |
|
|
|
* org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java. |
|
|
|
* org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java. |
|
|
|
* lang.ClassLoader) |
|
|
|
* lang.ClassLoader) |
|
|
|
|