1 files changed, 479 insertions, 0 deletions
diff --git a/subsonic-main/src/main/webapp/WEB-INF/subsonic-servlet.xml b/subsonic-main/src/main/webapp/WEB-INF/subsonic-servlet.xml
new file mode 100644
index 00000000..b36bb0c8
--- /dev/null
+++ b/subsonic-main/src/main/webapp/WEB-INF/subsonic-servlet.xml
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+    <bean id="leftController" class="net.sourceforge.subsonic.controller.LeftController">
+        <property name="viewName" value="left"/>
+        <property name="mediaScannerService" ref="mediaScannerService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="musicIndexService" ref="musicIndexService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="playlistService" ref="playlistService"/>
+    </bean>
+    <bean id="rightController" class="net.sourceforge.subsonic.controller.RightController">
+        <property name="viewName" value="right"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="statusController" class="net.sourceforge.subsonic.controller.StatusController">
+        <property name="viewName" value="status"/>
+        <property name="statusService" ref="statusService"/>
+    </bean>
+    <bean id="mainController" class="net.sourceforge.subsonic.controller.MainController">
+        <property name="viewName" value="main"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="ratingService" ref="musicInfoService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="adService" ref="adService"/>
+    </bean>
+    <bean id="playlistController" class="net.sourceforge.subsonic.controller.PlaylistController">
+        <property name="viewName" value="playlist"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="playlistService" ref="playlistService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="importPlaylistController" class="net.sourceforge.subsonic.controller.ImportPlaylistController">
+        <property name="viewName" value="importPlaylist"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="playlistService" ref="playlistService"/>
+    </bean>
+    <bean id="topController" class="net.sourceforge.subsonic.controller.TopController">
+        <property name="viewName" value="top"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="versionService" ref="versionService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="helpController" class="net.sourceforge.subsonic.controller.HelpController">
+        <property name="viewName" value="help"/>
+        <property name="versionService" ref="versionService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="moreController" class="net.sourceforge.subsonic.controller.MoreController">
+        <property name="viewName" value="more"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="playerService" ref="playerService"/>
+    </bean>
+    <bean id="uploadController" class="net.sourceforge.subsonic.controller.UploadController">
+        <property name="viewName" value="upload"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="statusService" ref="statusService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="lyricsController" class="net.sourceforge.subsonic.controller.LyricsController">
+        <property name="viewName" value="lyrics"/>
+    </bean>
+    <bean id="allmusicController" class="net.sourceforge.subsonic.controller.AllmusicController">
+        <property name="viewName" value="allmusic"/>
+    </bean>
+    <bean id="podcastController" class="net.sourceforge.subsonic.controller.PodcastController">
+        <property name="viewName" value="podcast"/>
+        <property name="playlistService" ref="playlistService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="podcastReceiverController" class="net.sourceforge.subsonic.controller.PodcastReceiverController">
+        <property name="viewName" value="podcastReceiver"/>
+        <property name="podcastService" ref="podcastService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="podcastReceiverAdminController"
+          class="net.sourceforge.subsonic.controller.PodcastReceiverAdminController">
+        <property name="podcastService" ref="podcastService"/>
+    </bean>
+    <bean id="setMusicFileInfoController" class="net.sourceforge.subsonic.controller.SetMusicFileInfoController">
+        <property name="mediaFileService" ref="mediaFileService"/>
+    </bean>
+    <bean id="shareManagementController" class="net.sourceforge.subsonic.controller.ShareManagementController">
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="shareService" ref="shareService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="setRatingController" class="net.sourceforge.subsonic.controller.SetRatingController">
+        <property name="ratingService" ref="musicInfoService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="randomPlayQueueController" class="net.sourceforge.subsonic.controller.RandomPlayQueueController">
+        <property name="viewName" value="reload"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="reloadFrames">
+            <list>
+                <bean class="net.sourceforge.subsonic.controller.ReloadFrame">
+                    <property name="frame" value="playQueue"/>
+                    <property name="view" value="playQueue.view?"/>
+                </bean>
+                <bean class="net.sourceforge.subsonic.controller.ReloadFrame">
+                    <property name="frame" value="main"/>
+                    <property name="view" value="more.view"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+    <bean id="changeCoverArtController" class="net.sourceforge.subsonic.controller.ChangeCoverArtController">
+        <property name="viewName" value="changeCoverArt"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+    </bean>
+    <bean id="nowPlayingController" class="net.sourceforge.subsonic.controller.NowPlayingController">
+        <property name="playerService" ref="playerService"/>
+        <property name="statusService" ref="statusService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+    </bean>
+    <bean id="starredController" class="net.sourceforge.subsonic.controller.StarredController">
+        <property name="viewName" value="starred"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaFileDao" ref="mediaFileDao"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+    </bean>
+    <bean id="searchController" class="net.sourceforge.subsonic.controller.SearchController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.SearchCommand"/>
+        <property name="successView" value="search"/>
+        <property name="formView" value="search"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="playerService" ref="playerService"/>
+    </bean>
+    <bean id="settingsController" class="net.sourceforge.subsonic.controller.SettingsController">
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="playerSettingsController" class="net.sourceforge.subsonic.controller.PlayerSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.PlayerSettingsCommand"/>
+        <property name="successView" value="playerSettings"/>
+        <property name="formView" value="playerSettings"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="transcodingService" ref="transcodingService"/>
+    </bean>
+    <bean id="shareSettingsController" class="net.sourceforge.subsonic.controller.ShareSettingsController">
+        <property name="viewName" value="shareSettings"/>
+        <property name="shareService" ref="shareService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+    </bean>
+    <bean id="musicFolderSettingsController" class="net.sourceforge.subsonic.controller.MusicFolderSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.MusicFolderSettingsCommand"/>
+        <property name="successView" value="musicFolderSettings"/>
+        <property name="formView" value="musicFolderSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaScannerService" ref="mediaScannerService"/>
+        <property name="artistDao" ref="artistDao"/>
+        <property name="albumDao" ref="albumDao"/>
+        <property name="mediaFolderDao" ref="mediaFileDao"/>
+    </bean>
+    <bean id="networkSettingsController" class="net.sourceforge.subsonic.controller.NetworkSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.NetworkSettingsCommand"/>
+        <property name="successView" value="networkSettings"/>
+        <property name="formView" value="networkSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="networkService" ref="networkService"/>
+    </bean>
+    <bean id="transcodingSettingsController" class="net.sourceforge.subsonic.controller.TranscodingSettingsController">
+        <property name="viewName" value="transcodingSettings"/>
+        <property name="transcodingService" ref="transcodingService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="internetRadioSettingsController"
+          class="net.sourceforge.subsonic.controller.InternetRadioSettingsController">
+        <property name="viewName" value="internetRadioSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="podcastSettingsController" class="net.sourceforge.subsonic.controller.PodcastSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.PodcastSettingsCommand"/>
+        <property name="successView" value="podcastSettings"/>
+        <property name="formView" value="podcastSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="podcastService" ref="podcastService"/>
+    </bean>
+    <bean id="generalSettingsController" class="net.sourceforge.subsonic.controller.GeneralSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.GeneralSettingsCommand"/>
+        <property name="successView" value="generalSettings"/>
+        <property name="formView" value="generalSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="advancedSettingsController" class="net.sourceforge.subsonic.controller.AdvancedSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.AdvancedSettingsCommand"/>
+        <property name="successView" value="advancedSettings"/>
+        <property name="formView" value="advancedSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="personalSettingsController" class="net.sourceforge.subsonic.controller.PersonalSettingsController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.PersonalSettingsCommand"/>
+        <property name="successView" value="personalSettings"/>
+        <property name="formView" value="personalSettings"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="avatarUploadController" class="net.sourceforge.subsonic.controller.AvatarUploadController">
+        <property name="viewName" value="avatarUploadResult"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="userSettingsController" class="net.sourceforge.subsonic.controller.UserSettingsController">
+        <property name="sessionForm" value="true"/>
+        <property name="commandClass" value="net.sourceforge.subsonic.command.UserSettingsCommand"/>
+        <property name="validator" ref="userSettingsValidator"/>
+        <property name="successView" value="userSettings"/>
+        <property name="formView" value="userSettings"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="transcodingService" ref="transcodingService"/>
+    </bean>
+    <bean id="passwordSettingsController" class="net.sourceforge.subsonic.controller.PasswordSettingsController">
+        <property name="sessionForm" value="true"/>
+        <property name="commandClass" value="net.sourceforge.subsonic.command.PasswordSettingsCommand"/>
+        <property name="validator" ref="passwordSettingsValidator"/>
+        <property name="successView" value="passwordSettings"/>
+        <property name="formView" value="passwordSettings"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="homeController" class="net.sourceforge.subsonic.controller.HomeController">
+        <property name="viewName" value="home"/>
+        <property name="ratingService" ref="musicInfoService"/>
+        <property name="mediaScannerService" ref="mediaScannerService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="editTagsController" class="net.sourceforge.subsonic.controller.EditTagsController">
+        <property name="viewName" value="editTags"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="metaDataParserFactory" ref="metaDataParserFactory"/>
+    </bean>
+    <bean id="playQueueController" class="net.sourceforge.subsonic.controller.PlayQueueController">
+        <property name="viewName" value="playQueue"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="coverArtController" class="net.sourceforge.subsonic.controller.CoverArtController">
+        <property name="securityService" ref="securityService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="artistDao" ref="artistDao"/>
+        <property name="albumDao" ref="albumDao"/>
+    </bean>
+    <bean id="avatarController" class="net.sourceforge.subsonic.controller.AvatarController">
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="proxyController" class="net.sourceforge.subsonic.controller.ProxyController"/>
+    <bean id="statusChartController" class="net.sourceforge.subsonic.controller.StatusChartController">
+        <property name="statusService" ref="statusService"/>
+    </bean>
+    <bean id="userChartController" class="net.sourceforge.subsonic.controller.UserChartController">
+        <property name="securityService" ref="securityService"/>
+    </bean>
+    <bean id="m3uController" class="net.sourceforge.subsonic.controller.M3UController">
+        <property name="playerService" ref="playerService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="transcodingService" ref="transcodingService"/>
+    </bean>
+    <bean id="streamController" class="net.sourceforge.subsonic.controller.StreamController">
+        <property name="playerService" ref="playerService"/>
+        <property name="playlistService" ref="playlistService"/>
+        <property name="statusService" ref="statusService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="transcodingService" ref="transcodingService"/>
+        <property name="audioScrobblerService" ref="audioScrobblerService"/>
+    </bean>
+    <bean id="videoPlayerController" class="net.sourceforge.subsonic.controller.VideoPlayerController">
+        <property name="viewName" value="videoPlayer"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="playerService" ref="playerService"/>
+    </bean>
+    <bean id="externalPlayerController" class="net.sourceforge.subsonic.controller.ExternalPlayerController">
+        <property name="viewName" value="externalPlayer"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="shareDao" ref="shareDao"/>
+    </bean>
+    <bean id="downloadController" class="net.sourceforge.subsonic.controller.DownloadController">
+        <property name="playerService" ref="playerService"/>
+        <property name="statusService" ref="statusService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="playlistService" ref="playlistService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+    </bean>
+    <bean id="donateController" class="net.sourceforge.subsonic.controller.DonateController">
+        <property name="commandClass" value="net.sourceforge.subsonic.command.DonateCommand"/>
+        <property name="successView" value="donate"/>
+        <property name="formView" value="donate"/>
+        <property name="validator" ref="donateValidator"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="multiController" class="net.sourceforge.subsonic.controller.MultiController">
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+        <property name="playlistService" ref="playlistService"/>
+    </bean>
+    <bean id="wapController" class="net.sourceforge.subsonic.controller.WapController">
+        <property name="settingsService" ref="settingsService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="playlistService" ref="playlistService"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="musicIndexService" ref="musicIndexService"/>
+    </bean>
+    <bean id="restController" class="net.sourceforge.subsonic.controller.RESTController">
+        <property name="settingsService" ref="settingsService"/>
+        <property name="securityService" ref="securityService"/>
+        <property name="playerService" ref="playerService"/>
+        <property name="mediaFileService" ref="mediaFileService"/>
+        <property name="transcodingService" ref="transcodingService"/>
+        <property name="statusService" ref="statusService"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="jukeboxService" ref="jukeboxService"/>
+        <property name="audioScrobblerService" ref="audioScrobblerService"/>
+        <property name="playlistService" ref="playlistService"/>
+        <property name="playQueueService" ref="ajaxPlayQueueService"/>
+        <property name="ratingService" ref="musicInfoService"/>
+        <property name="chatService" ref="ajaxChatService"/>
+        <property name="lyricsService" ref="ajaxLyricsService"/>
+        <property name="podcastService" ref="podcastService"/>
+        <property name="shareService" ref="shareService"/>
+        <property name="mediaFileDao" ref="mediaFileDao"/>
+        <property name="artistDao" ref="artistDao"/>
+        <property name="albumDao" ref="albumDao"/>
+        <property name="downloadController" ref="downloadController"/>
+        <property name="streamController" ref="streamController"/>
+        <property name="coverArtController" ref="coverArtController"/>
+        <property name="avatarController" ref="avatarController"/>
+        <property name="userSettingsController" ref="userSettingsController"/>
+        <property name="leftController" ref="leftController"/>
+        <property name="homeController" ref="homeController"/>
+    </bean>
+    <bean id="dbController" class="net.sourceforge.subsonic.controller.DBController">
+        <property name="viewName" value="db"/>
+        <property name="daoHelper" ref="daoHelper"/>
+    </bean>
+    <bean id="donateValidator" class="net.sourceforge.subsonic.validator.DonateValidator">
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="userSettingsValidator" class="net.sourceforge.subsonic.validator.UserSettingsValidator">
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+    <bean id="passwordSettingsValidator" class="net.sourceforge.subsonic.validator.PasswordSettingsValidator"/>
+
+    <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+        <property name="alwaysUseFullPath" value="true"/>
+        <property name="mappings">
+            <props>
+                <prop key="/main.view">mainController</prop>
+                <prop key="/playlist.view">playlistController</prop>
+                <prop key="/help.view">helpController</prop>
+                <prop key="/lyrics.view">lyricsController</prop>
+                <prop key="/left.view">leftController</prop>
+                <prop key="/right.view">rightController</prop>
+                <prop key="/status.view">statusController</prop>
+                <prop key="/more.view">moreController</prop>
+                <prop key="/upload.view">uploadController</prop>
+                <prop key="/importPlaylist.view">importPlaylistController</prop>
+                <prop key="/exportPlaylist.view">multiController</prop>
+                <prop key="/setMusicFileInfo.view">setMusicFileInfoController</prop>
+                <prop key="/createShare.view">shareManagementController</prop>
+                <prop key="/setRating.view">setRatingController</prop>
+                <prop key="/top.view">topController</prop>
+                <prop key="/randomPlayQueue.view">randomPlayQueueController</prop>
+                <prop key="/changeCoverArt.view">changeCoverArtController</prop>
+                <prop key="/login.view">multiController</prop>
+                <prop key="/recover.view">multiController</prop>
+                <prop key="/accessDenied.view">multiController</prop>
+                <prop key="/notFound.view">multiController</prop>
+                <prop key="/gettingStarted.view">multiController</prop>
+                <prop key="/index.view">multiController</prop>
+                <prop key="/videoPlayer.view">videoPlayerController</prop>
+                <prop key="/nowPlaying.view">nowPlayingController</prop>
+                <prop key="/starred.view">starredController</prop>
+                <prop key="/search.view">searchController</prop>
+                <prop key="/settings.view">settingsController</prop>
+                <prop key="/playerSettings.view">playerSettingsController</prop>
+                <prop key="/shareSettings.view">shareSettingsController</prop>
+                <prop key="/musicFolderSettings.view">musicFolderSettingsController</prop>
+                <prop key="/networkSettings.view">networkSettingsController</prop>
+                <prop key="/transcodingSettings.view">transcodingSettingsController</prop>
+                <prop key="/internetRadioSettings.view">internetRadioSettingsController</prop>
+                <prop key="/podcastSettings.view">podcastSettingsController</prop>
+                <prop key="/generalSettings.view">generalSettingsController</prop>
+                <prop key="/advancedSettings.view">advancedSettingsController</prop>
+                <prop key="/personalSettings.view">personalSettingsController</prop>
+                <prop key="/avatarUpload.view">avatarUploadController</prop>
+                <prop key="/userSettings.view">userSettingsController</prop>
+                <prop key="/passwordSettings.view">passwordSettingsController</prop>
+                <prop key="/allmusic.view">allmusicController</prop>
+                <prop key="/home.view">homeController</prop>
+                <prop key="/editTags.view">editTagsController</prop>
+                <prop key="/playQueue.view">playQueueController</prop>
+                <prop key="/coverArt.view">coverArtController</prop>
+                <prop key="/avatar.view">avatarController</prop>
+                <prop key="/proxy.view">proxyController</prop>
+                <prop key="/statusChart.view">statusChartController</prop>
+                <prop key="/userChart.view">userChartController</prop>
+                <prop key="/download.view">downloadController</prop>
+                <prop key="/donate.view">donateController</prop>
+                <prop key="/db.view">dbController</prop>
+                <prop key="/test.view">multiController</prop>
+                <prop key="/podcastReceiver.view">podcastReceiverController</prop>
+                <prop key="/podcastReceiverAdmin.view">podcastReceiverAdminController</prop>
+                <prop key="/podcast.view">podcastController</prop>
+                <prop key="/podcast/**">podcastController</prop>
+                <prop key="/wap/download.view">downloadController</prop>
+                <prop key="/wap/**">wapController</prop>
+                <prop key="/rest/**">restController</prop>
+                <prop key="/play.m3u">m3uController</prop>
+                <prop key="/stream/**">streamController</prop>
+                <prop key="/share/**">externalPlayerController</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+        <property name="basename" value="net.sourceforge.subsonic.i18n.ResourceBundle"/>
+    </bean>
+
+    <bean id="themeSource" class="net.sourceforge.subsonic.theme.SubsonicThemeSource">
+        <property name="basenamePrefix" value="net.sourceforge.subsonic.theme."/>
+        <property name="defaultResourceBundle" value="net.sourceforge.subsonic.theme.default"/>
+    </bean>
+
+    <bean id="localeResolver"
+          class="net.sourceforge.subsonic.i18n.SubsonicLocaleResolver">
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+
+    <bean id="themeResolver"
+          class="net.sourceforge.subsonic.theme.SubsonicThemeResolver">
+        <property name="securityService" ref="securityService"/>
+        <property name="settingsService" ref="settingsService"/>
+    </bean>
+
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/jsp/"/>
+        <property name="suffix" value=".jsp"/>
+    </bean>
+
+</beans>