Author: jmitchell
Date: Tue Oct 10 14:12:33 2006
New Revision: 462568
URL: http://svn.apache.org/viewvc?view=rev&rev=462568
Log:
WW-1453 align the showcase web.xml with servlet 2.4
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?view=diff&rev=462568&r1=462567&r2=462568
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
Tue Oct 10 14:12:33 2006
@@ -21,10 +21,9 @@
sourceUrl += "?page="+request.getServletPath();
}
%>
-
-<%@ taglib uri="sitemesh-decorator" prefix="decorator" %>
-<%@ taglib uri="sitemesh-page" prefix="page" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<[EMAIL PROTECTED] prefix="decorator"
uri="http://www.opensymphony.com/sitemesh/decorator"; %>
+<[EMAIL PROTECTED] prefix="page"
uri="http://www.opensymphony.com/sitemesh/page"; %>
+<[EMAIL PROTECTED] prefix="s" uri="/struts-tags" %>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=462568&r1=462567&r2=462568
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Tue Oct
10 14:12:33 2006
@@ -148,14 +148,4 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
- <taglib>
- <taglib-uri>sitemesh-page</taglib-uri>
- <taglib-location>/WEB-INF/sitemesh-page.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>sitemesh-decorator</taglib-uri>
- <taglib-location>/WEB-INF/sitemesh-decorator.tld</taglib-location>
- </taglib>
-
</web-app>
