Merge branch 'java-config-only' into 'master' (2a75648b) · Commits · Paul-Christian Volkmer / ARSnova Backend

Commit 2a75648b authored 7 years ago by

Daniel Gerhardt

Merge branch 'java-config-only' into 'master'

Migrate remaining Spring XML config to Java

See merge request !51

parents acf18781 2ecbfec8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 2 additions, 0 deletions

src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
src/main/java/de/thm/arsnova/config/AppConfig.java 257 additions, 0 deletions

src/main/java/de/thm/arsnova/config/AppConfig.java
src/main/java/de/thm/arsnova/dao/CouchDBDao.java 4 additions, 2 deletions

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketListener.java 2 additions, 2 deletions

...ain/java/de/thm/arsnova/socket/ARSnovaSocketListener.java
src/main/webapp/WEB-INF/arsnova-servlet.xml 5 additions, 0 deletions

src/main/webapp/WEB-INF/arsnova-servlet.xml
src/main/webapp/WEB-INF/spring/arsnova-servlet.xml 0 additions, 103 deletions

src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
src/main/webapp/WEB-INF/spring/spring-main.xml 0 additions, 50 deletions

src/main/webapp/WEB-INF/spring/spring-main.xml
src/main/webapp/WEB-INF/web.xml 6 additions, 7 deletions

src/main/webapp/WEB-INF/web.xml
src/test/java/de/thm/arsnova/ImageUtilsTest.java 4 additions, 6 deletions

src/test/java/de/thm/arsnova/ImageUtilsTest.java
src/test/java/de/thm/arsnova/config/AppConfigTest.java 3 additions, 7 deletions

src/test/java/de/thm/arsnova/config/AppConfigTest.java
src/test/java/de/thm/arsnova/config/TestAppConfig.java 81 additions, 0 deletions

src/test/java/de/thm/arsnova/config/TestAppConfig.java
src/test/java/de/thm/arsnova/controller/AbstractControllerTest.java 14 additions, 1 deletion

...ava/de/thm/arsnova/controller/AbstractControllerTest.java
src/test/java/de/thm/arsnova/controller/CourseControllerTest.java 1 addition, 33 deletions

.../java/de/thm/arsnova/controller/CourseControllerTest.java
src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java 1 addition, 15 deletions

...ava/de/thm/arsnova/controller/FeedbackControllerTest.java
src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java 1 addition, 31 deletions

...hm/arsnova/controller/LecturerQuestionControllerTest.java
src/test/java/de/thm/arsnova/controller/LoginControllerTest.java 3 additions, 15 deletions

...t/java/de/thm/arsnova/controller/LoginControllerTest.java
src/test/java/de/thm/arsnova/controller/SessionControllerTest.java 1 addition, 31 deletions

...java/de/thm/arsnova/controller/SessionControllerTest.java
src/test/java/de/thm/arsnova/controller/StatisticsControllerTest.java 7 additions, 20 deletions

...a/de/thm/arsnova/controller/StatisticsControllerTest.java
src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 4 additions, 2 deletions

src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java 5 additions, 6 deletions

...est/java/de/thm/arsnova/services/FeedbackServiceTest.java

with 401 additions and 331 deletions

Please register or to comment