Merge remote-tracking branch 'personal/master'

2017-08-23 20:59:34 -06:00
parent ec68a8e7de 8b798d1d66
commit 3312f5c114
9 changed files with 59 additions and 25 deletions
@@ -1,3 +1,6 @@
 org.springframework.context.ApplicationListener=\
  org.airsonic.player.spring.LoggingFileOverrideListener,\
  org.airsonic.player.security.LoginFailureListener
+
+org.springframework.context.ApplicationContextInitializer=\
+  org.airsonic.player.spring.CustomPropertySourceConfigurer
@@ -123,7 +123,10 @@

    <bean id="networkService" class="org.airsonic.player.service.NetworkService" />

-    <bean id="playerService" class="org.airsonic.player.service.PlayerService" init-method="init">
+    <bean id="playerService"
+          class="org.airsonic.player.service.PlayerService"
+          init-method="init"
+          depends-on="liquibase">
        <property name="playerDao" ref="playerDao"/>
        <property name="statusService" ref="statusService"/>
        <property name="securityService" ref="securityService"/>