Commit Graph
100 Commits
Author SHA1 Message Date
Rémi Cocula ded37073f2 Merge branch 'biconou_develop_PR_SpringBootMain' into biconou_develop_PR_metrics 2017-01-13 23:22:02 +01:00
Rémi Cocula 0e7c41d299 Merge branch 'develop' into biconou_develop_PR_metrics
Conflicts:
	libresonic-main/src/main/resources/application.properties
2017-01-13 22:18:37 +01:00
Rémi Cocula 3fe8b7c0df Refactor application configuration load. 2017-01-13 21:41:55 +01:00
Rémi Cocula 551fc4afcf Fix for issue 214.
POST rest requests must be excluded from csrf validation
getLicense rest api method is required.
2017-01-12 23:46:30 +01:00
Rémi Cocula ef3551929b Add Spring web minimal logging config 2017-01-12 22:02:04 +01:00
Rémi Cocula 5cf079e72b Add metrics filter 2017-01-12 21:53:52 +01:00
Rémi Cocula 6027f7ce15 Fix after code review 2017-01-07 14:26:48 +01:00
Rémi Cocula 4c49c77641 Restore PasswordSettingsController 2017-01-05 23:23:47 +01:00
Rémi Cocula 884826b3b8 WIP 2017-01-05 22:33:08 +01:00
Rémi Cocula 9e8876d34e Fix logout 2017-01-03 21:20:42 +01:00
Rémi Cocula d6870f7c75 Ignore some dependency analyse errors 2017-01-01 16:23:00 +01:00
Rémi Cocula 03938ca497 rest API migration. 2016-12-31 20:33:41 +01:00
Rémi Cocula dbda1132df rest API migration (WIP) + fixes. 2016-12-31 19:55:02 +01:00
Rémi Cocula 44de72c602 revert commit edd5cc9dd1 2016-12-31 19:03:44 +01:00
Rémi Cocula 08942fe9c5 Merge remote-tracking branch 'upstream/develop' into biconou_develop_PR_SpringBoot 2016-12-31 18:34:00 +01:00
Rémi Cocula 5b2297af96 rest API migration (WIP). 2016-12-31 13:51:22 +01:00
Rémi Cocula e51e2e8b10 delete wap controller. 2016-12-31 02:51:03 +01:00
Rémi Cocula edd5cc9dd1 Packages to scan listed in spring boot application rather than in xml file. 2016-12-31 02:47:45 +01:00
Rémi Cocula 4a015c2e94 Register of AdditionalPropertySourceConfigurer previously present in web.xml. 2016-12-31 02:23:32 +01:00
Rémi Cocula c28fb87a1f applicationContext clean up 2016-12-31 02:22:50 +01:00
Rémi Cocula 473902cdca applicationContext-db must move to resources/classes 2016-12-30 19:54:23 +01:00
Rémi Cocula f829176c31 Merge branch 'develop' into _tmp 2016-12-30 19:31:11 +01:00
Rémi Cocula fc01f8f83c Spring security configuration has moved to java. 2016-12-30 19:29:01 +01:00
Rémi Cocula 97f3607b1c Register REST Filter 2016-12-24 23:39:14 +01:00
Rémi Cocula 87a9cb1c12 RESTRequestParameterProcessingFilter moved to annotated bean. 2016-12-24 23:36:54 +01:00
Rémi Cocula e301f2363f Start RestController migration. 2016-12-24 22:03:57 +01:00
Rémi Cocula f76470537f Controller migration 2016-12-24 19:45:44 +01:00
Rémi Cocula 376f98d670 Controller migration 2016-12-24 12:20:20 +01:00
Rémi Cocula b2d58fee47 Controller migration 2016-12-24 12:08:42 +01:00
Rémi Cocula 24996c628e Controller migration 2016-12-24 11:53:59 +01:00
Rémi Cocula cf8a0f6d70 Controller migration 2016-12-24 11:47:46 +01:00
Rémi Cocula a0f7966163 StreamController migration 2016-12-23 02:59:32 +01:00
Rémi Cocula b7b42ea4cb Exclude /dwr urls from csrf validation. 2016-12-23 02:48:46 +01:00
Rémi Cocula ed7758acab registration of dwr servlet 2016-12-23 01:31:29 +01:00
Rémi Cocula d8919d9cb9 Fix after merge. 2016-12-22 23:57:15 +01:00
Rémi Cocula e5dc517fa1 Merge branch 'develop' into _tmp
Conflicts:
	libresonic-main/pom.xml
	libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
	libresonic-main/src/main/webapp/WEB-INF/libresonic-servlet.xml
	pom.xml
2016-12-22 23:26:10 +01:00
Rémi Cocula b2dd04e864 Controller migration 2016-12-22 22:17:48 +01:00
Rémi Cocula b8ade50810 Controller migration 2016-12-22 21:58:46 +01:00
Rémi Cocula 8c81778f5a Controller migration 2016-12-22 21:54:12 +01:00
Rémi Cocula 217caba28f Controller migration 2016-12-22 21:49:44 +01:00
Rémi Cocula 2bb026b968 Controller migration 2016-12-22 21:47:31 +01:00
Rémi Cocula 449f6a906a Controllers migration. 2016-12-18 01:31:39 +01:00
Rémi Cocula 2767d06731 Controllers migration. 2016-12-18 01:14:33 +01:00
Rémi Cocula 42709b0e0d Controllers migration. 2016-12-18 01:07:35 +01:00
Rémi Cocula 70ed378ae0 Controllers migration. 2016-12-18 00:12:16 +01:00
Rémi Cocula f90de5e310 Controllers migration. 2016-12-18 00:08:05 +01:00
Rémi Cocula 97be70531e Controllers migration. 2016-12-17 19:15:00 +01:00
Rémi Cocula caac456171 Controllers migration. 2016-12-17 19:11:32 +01:00
Rémi Cocula 1ac243b49b Controllers migration. 2016-12-17 17:05:02 +01:00
Rémi Cocula 2c63e287df Controllers migration. 2016-12-17 14:15:27 +01:00
Rémi Cocula 8231a44089 Controllers migration. 2016-12-17 14:11:47 +01:00
Rémi Cocula 010815a578 Controllers migration. 2016-12-16 00:02:02 +01:00
Rémi Cocula 878d250930 Merge branch 'develop' into biconou_develop_PR_SpringBoot
Conflicts:
	libresonic-main/src/main/resources/libresonic-servlet.xml
2016-12-15 23:26:38 +01:00
Rémi Cocula 627a8a9341 Controllers migration. 2016-12-15 23:16:20 +01:00
Rémi Cocula 5b8e2b94c1 Controllers migration. 2016-12-15 23:06:05 +01:00
Rémi Cocula adfde5dae0 New GettingStarted controller 2016-12-15 21:47:18 +01:00
Rémi Cocula 78022e34c3 make index frameset work again. 2016-12-15 21:38:18 +01:00
Rémi Cocula a51389a8d7 import clean up 2016-12-14 23:57:12 +01:00
Rémi Cocula cab1ee9b6e Spring Boot : make login form work again. 2016-12-14 22:55:21 +01:00
Rémi Cocula 88ab70117e Change version to 6.2.beta1.springboot 2016-12-14 21:01:16 +01:00
Rémi Cocula c0ee1ef786 Merge remote-tracking branch 'upstream/develop' into biconou_develop_PR_SpringBoot
Conflicts:
	libresonic-main/src/main/resources/applicationContext-security.xml
2016-12-14 00:29:35 +01:00
Rémi Cocula 2e09bc9b75 WIP Spring Boot 2016-12-14 00:24:58 +01:00
Rémi Cocula 8cc6ab95fd Change version number to 6.2.beta1.spring4 2016-12-12 21:37:42 +01:00
Rémi Cocula c3240b03bd Remove direct Spring dependencies (as they come from SpringBoot) 2016-12-12 21:20:01 +01:00
Rémi Cocula 2ad8ec005c Add SpringBoot application. 2016-12-11 22:39:13 +01:00
Rémi Cocula 33b7d81dd9 Merge branch 'biconou_spring-4-update_PR' into biconou_develop_PR_SpringBoot 2016-12-11 22:23:52 +01:00
Rémi Cocula 5ae6f5462a Clean up dependencies 2016-12-11 22:23:22 +01:00
Rémi Cocula 63253e4ff8 Intoduce SpringBoot 2016-12-11 21:46:31 +01:00
Rémi Cocula ddd8498040 Move to Spring4 + remove PasswordSettingsController + remove PremiumSettingsController 2016-12-11 21:13:51 +01:00
Rémi Cocula d78244aa36 Corrections on UserSettingsController. 2016-12-11 19:31:33 +01:00
Rémi Cocula ddea3f47ff Corrections on PlayerSettingsController and SearchController. 2016-12-11 19:21:02 +01:00
Rémi Cocula 4561e38807 Corrections on GeneralSettingsController. 2016-12-11 19:11:29 +01:00
Rémi Cocula b2b4384387 Corrections on MusicFolderSettingsController. 2016-12-11 19:03:41 +01:00
Rémi Cocula a0ab86a6ac Corrections on NetworkSettingsController. 2016-12-11 17:44:31 +01:00
Rémi Cocula ba80e99703 Migration of PersonalSettingsController + unit test. 2016-12-11 17:18:28 +01:00
Rémi Cocula f4636a09ed Migration of UserSettingsController + unit test. 2016-12-06 19:51:24 +01:00
Rémi Cocula 0c265e2f3d Migration of SearchController + unit test. 2016-12-01 22:19:28 +01:00
Rémi Cocula c46416834b Migration of PlayerSettingsController + unit test. 2016-12-01 21:53:55 +01:00
Rémi Cocula 7a76a3ea75 Migration of GeneralSettingsController + unit test. 2016-11-30 22:22:05 +01:00
Rémi Cocula f5a380eada Migration of MusicFolderSettingsController + unit test. 2016-11-30 22:05:40 +01:00
Rémi Cocula 9bdbb5ab4f Migration of NetworkSettingsController + unit test. 2016-11-30 21:10:18 +01:00
Rémi Cocula d422fc4086 Begin of migration of deprecated controllers style. 2016-11-30 00:18:50 +01:00
Rémi Cocula f6541632bb Add temporary test jetty server (to be removed later). 2016-11-29 23:03:07 +01:00
Rémi Cocula 3354f6623a Change version to 6.2.spring4-SNAPSHOT. 2016-11-28 21:22:20 +01:00
Rémi Cocula 02544d8406 LoginController : no need to declare members final. 2016-11-28 20:52:03 +01:00
Rémi Cocula c7c2ee4875 Merge branch 'biconou_spring-3-update_PR' into biconou_spring-4-update_PR 2016-11-28 20:49:53 +01:00
Rémi Cocula 685e997258 Merge remote-tracking branch 'origin/biconou_develop_PR_MediaScannerTestCase' into biconou_develop_PR_MediaScannerTestCase
Conflicts:
	libresonic-main/pom.xml
2016-11-24 22:13:05 +01:00
remi 58dae1ae97 Test audio files size reduced.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:41 +01:00
remi dd88ac6806 Assertion added in org.libresonic.player.service.MediaScannerServiceTestCase.testScanLibrary
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:33 +01:00
remi 26793653a1 Removed an unused method in MediaScannerServiceTestCase.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:28 +01:00
remi 05518019b5 The LIBRESONIC_HOME directory used for tests is now a temporary directory.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:23 +01:00
remi 6fa150e194 Lack of version number for metrics.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:19 +01:00
remi 799739458c Clean unused method.
(cherry picked from commit 6c44bb5)

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:13 +01:00
remi f599271163 Refactoring in test cases. The /tmp/libresonic directory used as LIBRESONIC_HOME for tests is now located in the target dir of the project.
(cherry picked from commit 32d4580)

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:04 +01:00
remi ba28d52ba4 MediaScannerService unit test and test media library
(cherry picked from commit c2b17f0)

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:07:26 +01:00
remi 520008bb60 No need for a constructor in the LoginController. Just need to @Autowire each property. 2016-11-22 22:09:16 +01:00
remi a03aa2805d New LoginController in place of the login method in MultiController.
Slight introduction to Java annotation based configuration (note that <mvc:annotation-driven /> has been added to libresonic-servlet.xml).
2016-11-21 23:32:43 +01:00
remi c9bdff4dff Merge remote-tracking branch 'muff1nman/spring-3-update' into biconou_spring-3-update_PR 2016-11-21 21:11:12 +01:00
remi a215cb960a Test audio files size reduced. 2016-11-17 22:36:49 +01:00
remi edd53e26a3 Assertion added in org.libresonic.player.service.MediaScannerServiceTestCase.testScanLibrary 2016-11-17 21:53:25 +01:00