tiny fix

[mir.git] / etc / web.xml

diff --git a/etc/web.xml b/etc/web.xml
index f5f55a2..42b5798 100755 (executable)
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -15,11 +15,7 @@
 
         <init-param>
             <param-name>Config</param-name>
-            <param-value>config</param-value>
-        </init-param>
-        <init-param>
-            <param-name>xml-config</param-name>
-            <param-value>/home/heckmann/mir/Mir/server.xml</param-value>
+            <param-value>etc/config.properties</param-value>
         </init-param>
 
     </servlet>
@@ -34,15 +30,11 @@
 
         <init-param>
             <param-name>Config</param-name>
-            <param-value>config</param-value>
-        </init-param>
-        <init-param>
-            <param-name>xml-config</param-name>
-            <param-value>/home/heckmann/mir/Mir/server.xml</param-value>
+            <param-value>etc/config.properties</param-value>
         </init-param>
 
     </servlet>
-
+    
     <servlet-mapping>
         <servlet-name>
             Mir
@@ -53,19 +45,87 @@
     </servlet-mapping>
 
     <servlet-mapping>
+        <servlet-name>
+            Mir
+        </servlet-name>
+        <url-pattern>
+            /servlet/Mir
+        </url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
         <servlet-name>OpenMir</servlet-name>
         <url-pattern>/OpenMir</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>OpenMir</servlet-name>
+        <url-pattern>/servlet/OpenMir</url-pattern>
+    </servlet-mapping>
 
-
-    <taglib>
-        <taglib-uri>
-          http://java.apache.org/tomcat/examples-taglib
-        </taglib-uri>
-        <taglib-location>
-           /WEB-INF/jsp/example-taglib.tld
-        </taglib-location>
-    </taglib>
+    <mime-mapping>
+      <extension>
+        mp3 
+      </extension>
+      <mime-type>
+        audio/x-mp3
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        ra
+      </extension>
+      <mime-type>
+        audio/vnd.rn-realaudio
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        rm
+      </extension>
+      <mime-type>
+        application/vnd.rn-realmedia
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        mov
+      </extension>
+      <mime-type>
+        video/quicktime 
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        mpg
+      </extension>
+      <mime-type>
+        video/mpeg
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        avi
+      </extension>
+      <mime-type>
+        video/x-msvideo
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        asf
+      </extension>
+      <mime-type>
+        video/x-ms-asf
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        pdf
+      </extension>
+      <mime-type>
+        application/pdf
+      </mime-type>
+    </mime-mapping>
 
     <security-constraint>
       <web-resource-collection>