Merge branch 'conditional-beans' into 'master'
Conditional beans Closes #35 and #50 See merge request !157
Showing
- src/main/java/de/thm/arsnova/config/SecurityConfig.java 70 additions, 1 deletionsrc/main/java/de/thm/arsnova/config/SecurityConfig.java
- src/main/java/de/thm/arsnova/config/properties/AuthenticationProviderProperties.java 3 additions, 1 deletion...a/config/properties/AuthenticationProviderProperties.java
- src/main/java/de/thm/arsnova/config/properties/CouchDbProperties.java 2 additions, 1 deletion...a/de/thm/arsnova/config/properties/CouchDbProperties.java
- src/main/java/de/thm/arsnova/config/properties/MessageBrokerProperties.java 3 additions, 1 deletion...hm/arsnova/config/properties/MessageBrokerProperties.java
- src/main/java/de/thm/arsnova/config/properties/SecurityProperties.java 3 additions, 1 deletion.../de/thm/arsnova/config/properties/SecurityProperties.java
- src/main/java/de/thm/arsnova/config/properties/SystemProperties.java 3 additions, 1 deletion...va/de/thm/arsnova/config/properties/SystemProperties.java
- src/main/java/de/thm/arsnova/security/CasUserDetailsService.java 0 additions, 2 deletions...n/java/de/thm/arsnova/security/CasUserDetailsService.java
- src/main/java/de/thm/arsnova/security/pac4j/OauthCallbackFilter.java 0 additions, 2 deletions...va/de/thm/arsnova/security/pac4j/OauthCallbackFilter.java
Please register or sign in to comment