From 15642f036fded2f3ee5de097d76d96bd795813c5 Mon Sep 17 00:00:00 2001
From: erik <erik>
Date: Tue, 9 Dec 2008 04:08:12 +0000
Subject: [PATCH] specify servlet-api 2.5

---
 webapp/WEB-INF/web.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/webapp/WEB-INF/web.xml b/webapp/WEB-INF/web.xml
index ac7e17f..9f43ac3 100644
--- a/webapp/WEB-INF/web.xml
+++ b/webapp/WEB-INF/web.xml
@@ -1,4 +1,16 @@
-<web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  id="WebApp_ID"
+  version="2.5">
+
+    <display-name>album</display-name>
+    <welcome-file-list>
+      <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
 
 	<servlet>
 		<servlet-name>album</servlet-name>
@@ -10,11 +22,6 @@
         <servlet-class>org.apache.velocity.tools.view.servlet.VelocityViewServlet</servlet-class>
     </servlet>
 
-    <servlet-mapping>
-        <servlet-name>resin-file</servlet-name>
-        <url-pattern>/js/*</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>velocity</servlet-name>
         <url-pattern>/WEB-INF/velocity/*</url-pattern>
@@ -22,7 +29,7 @@
 
     <servlet-mapping>
 	    <servlet-name>album</servlet-name>
- 	 	<url-pattern>/*</url-pattern>
+ 	 	<url-pattern>/wedding/*</url-pattern>
     </servlet-mapping>
 
 </web-app>