Commit Graph
1009 Commits
Author SHA1 Message Date
Andrew DeMaria 11e80dd43b Jetty and Tomcat spring boot support
Spring boot supports both Jetty and Tomcat, however only one is supposed
to be used at a time. This is problematic for us, because we would like
to have both on the classpath so we can configure them (i.e.
org.libresonic.player.boot.TomcatApplication). To remedy this, we mark
both as provided, but have two profiles which then tell spring to
exclude one or the other from the lib-provided war. These exclude rules
are a bit fragile, but can be reproduced by analyzing mvn
dependency:tree output.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-24 16:20:34 -06:00
Andrew DeMaria b53f8eef17 Catch NoClassDefFoundError as well
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-23 22:46:38 -06:00
Eugene E. Kashpureff Jr 58e380b13c Libresonic v6.2.beta2 2017-03-24 04:31:46 +00:00
Andrew DeMaria 6900142c4d Added doc from @texneues for https on tomcat and freebsd 2017-03-23 20:41:33 -06:00
Andrew DeMaria 07ff71df0c Consolidate Logging
- Use sl4fj as a backend to org.libresonic.Logger
- Output the same logs to libresonic.log as the console
- Use spring-boot logging constructs
- Turn down logging to error for non-libresonic classes info for
  libresonic classes and liquibase (perhaps change this in the future,
  but might be helpful for folks migrating their databases).

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-22 21:36:00 -06:00
Andrew DeMaria a12bdd6e0a Merge branch 'stable' into develop
Conflicts:
	CHANGELOG.md
	INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-booter/src/main/resources/images/libresonic-512.png
	libresonic-installer-debian/pom.xml
	libresonic-installer-mac/pom.xml
	libresonic-installer-rpm/pom.xml
	libresonic-installer-windows/pom.xml
	libresonic-main/pom.xml
	libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema62.java
	libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png
	libresonic-main/src/main/webapp/icons/buuftheme/logo.png
	libresonic-main/src/main/webapp/icons/coolandclean/logo.png
	libresonic-main/src/main/webapp/icons/default_dark/logo_light.png
	libresonic-main/src/main/webapp/icons/default_light/logo.png
	libresonic-main/src/main/webapp/icons/denim/logo_light.png
	libresonic-main/src/main/webapp/icons/groove/logo.png
	libresonic-main/src/main/webapp/icons/hicon/logo.png
	libresonic-main/src/main/webapp/icons/hiconi/logo_light.png
	libresonic-main/src/main/webapp/icons/hitech/logo_light.png
	libresonic-main/src/main/webapp/icons/midnightfun/logo.png
	libresonic-main/src/main/webapp/icons/monochrome/logo.png
	libresonic-main/src/main/webapp/icons/monochrome/logo_light.png
	libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
	libresonic-main/src/main/webapp/icons/simplify/logo_light.png
	libresonic-main/src/main/webapp/icons/slick/logo_light.png
	libresonic-main/src/main/webapp/icons/sonic/logo.png
	libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
	libresonic-main/src/main/webapp/icons/sonic_white/logo.png
	libresonic-main/src/main/webapp/icons/subStandard/logo_light.png
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml
2017-03-22 19:47:57 -06:00
Andrew DeMaria a7be3743b1 Merge remote-tracking branch 'personal/album-subdirs-pagination' into develop 2017-03-22 19:07:19 -06:00
Andrew DeMaria 4b7ab82017 Merge remote-tracking branch 'origin/pr/304' into develop 2017-03-22 19:07:11 -06:00
Andrew DeMaria a1698861d4 Change to server-side pagination for Sibling Albums and Sub Dirs
- Only paritial pagination, first X, then showAll
- Default is 40 for subDirs and sibling albums each
- showAll parameter causes page refresh with entirely new list

TODO/Future improvements include:
- Finer grain pagination
- Pagination done at the database level
- Seamless refresh with JS
- Unify all pagination uses across the site

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-22 19:00:48 -06:00
Andrew DeMaria f78b4a2d76 Relax rest view suffix
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-20 18:10:56 -06:00
Andrew DeMaria c309eb79de Merge remote-tracking branch 'origin/pr/303' into develop 2017-03-19 19:43:31 -06:00
Andrew DeMaria 9c224b7853 Added UI for Database settings
Also cleanup some documentation

*Database Settings have been renamed and will require manually fixing
from 6.2beta1*

database.varchar.maxlength -> DatabaseMysqlMaxlength
database.config.type -> DatabaseConfigType
database.config.embed.driver -> DatabasigEmbedDriver
database.config.embed.url -> DatabaseConfigEmbedUrl
database.config.embed.username -> DatabasigEmbedUsername
database.config.embed.password -> DatabasigEmbedPassword
database.config.jndi.name -> DatabaseConfigJNDIName
database.usertable.quote -> DatabaseUsertableQuote

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-19 16:35:26 -06:00
Jonas LandGitHub a51b32ef35 Remove ad service 2017-03-18 23:13:08 +01:00
Jonas LandGitHub 9c5cb78cdf Typo fix 2017-03-18 22:38:48 +01:00
Andrew DeMaria 9b35781b87 Fix #296 4XX on podcasts page
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-16 15:27:07 -06:00
Lammler Jonas f3a4c964de remove outdated note haproxy docs 2017-03-16 20:00:19 +01:00
Andrew DeMaria a16ef6e9c3 Merge branch 'banner' into develop 2017-03-15 18:52:53 -06:00
Andrew DeMaria 83373193f4 Merge remote-tracking branch 'origin/pr/288' into develop 2017-03-14 21:13:39 -06:00
Andrew DeMaria b9b34d22d7 Remove stack trace output
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-14 21:12:00 -06:00
Andrew DeMaria 988c98b3a9 Added libresonic banner
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-14 21:02:11 -06:00
Rémi Cocula dfda4e560f Spring Boot upgrade from 1.4.2 to 1.4.5 2017-03-14 20:20:47 +01:00
Tom PowellandGitHub f8a0aa8e0a Merge pull request #286 from muff1nman/docs
Various documentation improvements
2017-03-13 14:38:03 -07:00
Andrew DeMaria 509fd8f6aa Various documentation improvements
- Remove duplicate and outdated INSTALL.md file
- Clarity around supported platforms
- Misc

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-11 19:05:04 -07:00
Andrew DeMaria 3c43630f93 Reduce logging during tests to make travis happy
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-11 18:21:03 -07:00
Andrew DeMaria d8eb4109b8 Turn off reuse forks
Reusing forks seems to cause problems with the Jenkins build.
It adds about 2 minutes additional test time

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-11 17:58:31 -07:00
Andrew DeMaria 6e5ba7a261 Cleanup unused file and reorder test home setup
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-11 17:38:45 -07:00
Andrew DeMaria 81553a55b5 Fix test dependency
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-11 17:22:17 -07:00
Andrew DeMaria dad809cf79 Added test case for special characters 2017-03-11 17:05:07 -07:00
Andrew DeMaria 97a54658c6 Avoid direct dependency on tomcat
- Use reflection to invoke tomcat configs

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-07 22:20:05 -07:00
Tom PowellandGitHub 0cdfbc0e12 Merge pull request #275 from muff1nman/pom-cleanup
Cleanup pom and remove full profile
2017-03-06 15:46:38 -08:00
Andrew DeMaria 68967a0f8d Cleanup pom and remove full profile
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-05 21:26:18 -07:00
Eugene E. Kashpureff Jr 847eb5c30b Libresonic v6.2.beta1 2017-03-05 23:24:50 +00:00
Eugene E. Kashpureff Jr d7c212b18a Merge PR #270 into develop 2017-03-05 22:59:41 +00:00
Andrew Rabert 9e2b49027b Missing space in README 2017-03-04 22:31:03 -05:00
Lammler Jonas 20c943e960 Replace icons / Add dimmensions 2017-03-04 12:27:15 +01:00
Lammler Jonas 7bad5e93de Remove old assets and add new one to /contrib 2017-03-04 12:00:54 +01:00
Andrew DeMaria 190208debc Correctly calculate base url in the case a proxy server is present
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-03 15:25:03 -07:00
Andrew DeMaria 0c629abd4f Removed unused network status
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-03 15:24:03 -07:00
Andrew DeMaria 8b92f2bc51 Remove url redirection
- Add upnp specific base url
- Use http request base url for areas used by url redirection
- Fix sharing
- Removed Network Settings tab

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-03-03 15:23:59 -07:00
Tom PowellandGitHub f1ab639a48 Merge pull request #261 from jooola/patch-1
Updating Haproxy documentation
2017-03-01 14:07:09 -08:00
Jonas LandGitHub 8e323bccac Some updates 2017-02-27 22:32:51 +01:00
Andrew DeMaria 333d2f13fd Fix link
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-02-26 13:56:36 -07:00
Andrew DeMaria dbab20e096 Added transcoder setup doc
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-02-26 13:54:39 -07:00
Jonas LandGitHub 8acd92b84c Updated some comments 2017-02-26 21:31:46 +01:00
Jonas LandGitHub 99198ae06c Remove warning about haproxy version
I used debian version wich is the 1.5.8 and its working just fine !
2017-02-26 21:29:16 +01:00
Jonas LandGitHub cc0d8d9f76 Again remove "mode http" 2017-02-26 21:24:54 +01:00
Jonas LandGitHub 002275468a Remove redirect scheme
I tested it without this lines and i don't like to have it in the frontend section ! I suggest removing it ! The only usefull line is in the backend
2017-02-26 21:24:17 +01:00
Jonas LandGitHub e2e4dd655d Remove "mode http"
This setting is by default in the configuration files in the "default" section, so we don't need to add it here ! ( If someone uses the tcp mode or else he sure knows how haproxy works ! )
2017-02-26 21:17:11 +01:00
Andrew DeMaria 464e2825d5 Removed unused import
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-02-25 16:08:13 -07:00
Andrew DeMaria 502b5fba17 Fix #257 Playlist download dups
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-02-25 16:04:20 -07:00