X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml.template;h=7f6cde7126d7c865a24f48f7f11bd8aaec09d684;hb=21bfcd532fa973f6cae3caec79b0995548b2cffe;hp=0e3d48cbcc73e98733a454c3ae3b6229fdf83645;hpb=7685e32a7bd457b50cb5e16202bba61968bfd2ca;p=demoscenemusic.git

diff --git a/src/main/webapp/WEB-INF/web.xml.template b/src/main/webapp/WEB-INF/web.xml.template
index 0e3d48c..7f6cde7 100644
--- a/src/main/webapp/WEB-INF/web.xml.template
+++ b/src/main/webapp/WEB-INF/web.xml.template
@@ -10,15 +10,9 @@
 	</listener>
 
 	<context-param>
-		<description>The directory where the streaming files (MP3, Vorbis, etc.) are stored.</description>
-		<param-name>storage.streamed</param-name>
-		<param-value>/var/lib/demoscene-music/streamed</param-value>
-	</context-param>
-
-	<context-param>
-		<description>The directory where the original files (binaries, SID files, MOD files, etc.) are stored.</description>
-		<param-name>storage.original</param-name>
-		<param-value>/var/lib/demoscene-music/original</param-value>
+		<description>The directory where the files are stored.</description>
+		<param-name>data-directory</param-name>
+		<param-value>/var/lib/demoscene-music/files</param-value>
 	</context-param>
 
 	<resource-ref>
@@ -29,6 +23,11 @@
 	</resource-ref>
 
 	<servlet>
+		<servlet-name>StaticServlet</servlet-name>
+		<servlet-class>net.pterodactylus.demoscenemusic.core.StaticServlet</servlet-class>
+	</servlet>
+
+	<servlet>
 		<servlet-name>TemplateServlet</servlet-name>
 		<servlet-class>net.pterodactylus.demoscenemusic.core.TemplateServlet</servlet-class>
 		<init-param>
@@ -48,6 +47,10 @@
 			<param-value>net.pterodactylus.demoscenemusic.page.LoginPage</param-value>
 		</init-param>
 		<init-param>
+			<param-name>logout</param-name>
+			<param-value>net.pterodactylus.demoscenemusic.page.LogoutPage</param-value>
+		</init-param>
+		<init-param>
 			<param-name>openid</param-name>
 			<param-value>net.pterodactylus.demoscenemusic.page.OpenIdPage</param-value>
 		</init-param>
@@ -60,13 +63,30 @@
 			<param-value>net.pterodactylus.demoscenemusic.page.TrackPage</param-value>
 		</init-param>
 		<init-param>
-			<param-name>admin/artists</param-name>
+			<param-name>admin.add-artist</param-name>
+			<param-value>net.pterodactylus.demoscenemusic.page.admin.AddArtistPage</param-value>
+		</init-param>
+		<init-param>
+			<param-name>admin.add-track</param-name>
+			<param-value>net.pterodactylus.demoscenemusic.page.admin.AddTrackPage</param-value>
+		</init-param>
+		<init-param>
+			<param-name>admin.artists</param-name>
 			<param-value>net.pterodactylus.demoscenemusic.page.admin.ArtistsAdminPage</param-value>
 		</init-param>
+		<init-param>
+			<param-name>admin.edit-artist</param-name>
+			<param-value>net.pterodactylus.demoscenemusic.page.admin.EditArtistPage</param-value>
+		</init-param>
 		<load-on-startup>0</load-on-startup>
 	</servlet>
 
 	<servlet-mapping>
+		<servlet-name>StaticServlet</servlet-name>
+		<url-pattern>/static/*</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
 		<servlet-name>TemplateServlet</servlet-name>
 		<url-pattern>/*</url-pattern>
 	</servlet-mapping>