whoops

[mir.git] / etc / web.xml

diff --git a/etc/web.xml b/etc/web.xml
index 5415ac6..42b5798 100755 (executable)
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -30,32 +30,26 @@
 
         <init-param>
             <param-name>Config</param-name>
-            <param-value>config</param-value>
+            <param-value>etc/config.properties</param-value>
         </init-param>
 
     </servlet>
     
-    <servlet>
+    <servlet-mapping>
         <servlet-name>
-            OutputMir
+            Mir
         </servlet-name>
-        <servlet-class>
-            OutputMir
-        </servlet-class>
-
-        <init-param>
-            <param-name>Config</param-name>
-            <param-value>config</param-value>
-        </init-param>
-
-    </servlet>
+        <url-pattern>
+            /Mir
+        </url-pattern>
+    </servlet-mapping>
 
     <servlet-mapping>
         <servlet-name>
             Mir
         </servlet-name>
         <url-pattern>
-            /Mir
+            /servlet/Mir
         </url-pattern>
     </servlet-mapping>
 
@@ -63,10 +57,9 @@
         <servlet-name>OpenMir</servlet-name>
         <url-pattern>/OpenMir</url-pattern>
     </servlet-mapping>
-
     <servlet-mapping>
-        <servlet-name>OutputMir</servlet-name>
-        <url-pattern>/OutputMir</url-pattern>
+        <servlet-name>OpenMir</servlet-name>
+        <url-pattern>/servlet/OpenMir</url-pattern>
     </servlet-mapping>
 
     <mime-mapping>
@@ -134,17 +127,6 @@
       </mime-type>
     </mime-mapping>
 
-
-
-    <taglib>
-        <taglib-uri>
-          http://java.apache.org/tomcat/examples-taglib
-        </taglib-uri>
-        <taglib-location>
-           /WEB-INF/jsp/example-taglib.tld
-        </taglib-location>
-    </taglib>
-
     <security-constraint>
       <web-resource-collection>
          <web-resource-name>Protected Area</web-resource-name>