Remove another annotation= attribute

Hopefully really fixes gh-151
pull/160/merge
Dave Syer 11 years ago
parent f2cdb8c69f
commit cf53b76430

@ -54,6 +54,10 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration implemen
private ClassLoader classLoader; private ClassLoader classLoader;
public HibernateJpaAutoConfiguration() {
this.environment = null;
}
@Override @Override
public void setBeanClassLoader(ClassLoader classLoader) { public void setBeanClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader; this.classLoader = classLoader;

@ -82,6 +82,7 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
@EnableConfigurationProperties @EnableConfigurationProperties
@ConditionalOnClass({ EnableWebSecurity.class }) @ConditionalOnClass({ EnableWebSecurity.class })
@ConditionalOnMissingBean(WebSecurityConfiguration.class) @ConditionalOnMissingBean(WebSecurityConfiguration.class)
// @ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
public class SecurityAutoConfiguration { public class SecurityAutoConfiguration {
private static List<String> DEFAULT_IGNORED = Arrays.asList("/css/**", "/js/**", private static List<String> DEFAULT_IGNORED = Arrays.asList("/css/**", "/js/**",
@ -101,7 +102,8 @@ public class SecurityAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean({ IgnoredPathsWebSecurityConfigurerAdapter.class }) @ConditionalOnMissingBean({ IgnoredPathsWebSecurityConfigurerAdapter.class })
@ConditionalOnBean(annotation = EnableWebSecurity.class) // @ConditionalOnBean(annotation = EnableWebSecurity.class)
@ConditionalOnBean(WebSecurityConfiguration.class)
public SecurityConfigurer<Filter, WebSecurity> ignoredPathsWebSecurityConfigurerAdapter() { public SecurityConfigurer<Filter, WebSecurity> ignoredPathsWebSecurityConfigurerAdapter() {
return new IgnoredPathsWebSecurityConfigurerAdapter(); return new IgnoredPathsWebSecurityConfigurerAdapter();
} }

Loading…
Cancel
Save