Merge branch 'yaml-config' into 'master'
Use YAML instead of properties format for config See merge request !137
Showing
- pom.xml 8 additions, 0 deletionspom.xml
- src/main/java/de/thm/arsnova/config/AppConfig.java 22 additions, 28 deletionssrc/main/java/de/thm/arsnova/config/AppConfig.java
- src/main/java/de/thm/arsnova/config/PersistenceConfig.java 16 additions, 14 deletionssrc/main/java/de/thm/arsnova/config/PersistenceConfig.java
- src/main/java/de/thm/arsnova/config/PrefixedYamlPropertiesFactoryBean.java 21 additions, 0 deletions...thm/arsnova/config/PrefixedYamlPropertiesFactoryBean.java
- src/main/java/de/thm/arsnova/config/SecurityConfig.java 73 additions, 73 deletionssrc/main/java/de/thm/arsnova/config/SecurityConfig.java
- src/main/java/de/thm/arsnova/config/WebSocketConfig.java 17 additions, 14 deletionssrc/main/java/de/thm/arsnova/config/WebSocketConfig.java
- src/main/java/de/thm/arsnova/config/YamlPropertySourceFactory.java 30 additions, 0 deletions...java/de/thm/arsnova/config/YamlPropertySourceFactory.java
- src/main/java/de/thm/arsnova/config/properties/AuthenticationProviderProperties.java 313 additions, 0 deletions...a/config/properties/AuthenticationProviderProperties.java
- src/main/java/de/thm/arsnova/config/properties/CouchDbProperties.java 79 additions, 0 deletions...a/de/thm/arsnova/config/properties/CouchDbProperties.java
- src/main/java/de/thm/arsnova/config/properties/MessageBrokerProperties.java 82 additions, 0 deletions...hm/arsnova/config/properties/MessageBrokerProperties.java
- src/main/java/de/thm/arsnova/config/properties/SecurityProperties.java 97 additions, 0 deletions.../de/thm/arsnova/config/properties/SecurityProperties.java
- src/main/java/de/thm/arsnova/config/properties/SystemProperties.java 199 additions, 0 deletions...va/de/thm/arsnova/config/properties/SystemProperties.java
- src/main/java/de/thm/arsnova/controller/ConfigurationController.java 7 additions, 3 deletions...va/de/thm/arsnova/controller/ConfigurationController.java
- src/main/java/de/thm/arsnova/controller/ControllerExceptionHelper.java 7 additions, 2 deletions.../de/thm/arsnova/controller/ControllerExceptionHelper.java
- src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java 63 additions, 106 deletions...e/thm/arsnova/controller/v2/AuthenticationController.java
- src/main/java/de/thm/arsnova/model/ServiceDescription.java 31 additions, 9 deletionssrc/main/java/de/thm/arsnova/model/ServiceDescription.java
- src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java 8 additions, 3 deletions.../thm/arsnova/security/ApplicationPermissionEvaluator.java
- src/main/java/de/thm/arsnova/security/jwt/JwtService.java 5 additions, 12 deletionssrc/main/java/de/thm/arsnova/security/jwt/JwtService.java
- src/main/java/de/thm/arsnova/service/UserServiceImpl.java 30 additions, 51 deletionssrc/main/java/de/thm/arsnova/service/UserServiceImpl.java
- src/main/resources/arsnova.properties.example 0 additions, 349 deletionssrc/main/resources/arsnova.properties.example
Please register or sign in to comment