Browse Source

Remove another annotation= attribute

Hopefully really fixes gh-151
pull/160/merge
Dave Syer 12 years ago
parent
commit
cf53b76430
  1. 4
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
  2. 4
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java

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

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java

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

Loading…
Cancel
Save