69 lines
2.3 KiB
XML
69 lines
2.3 KiB
XML
--- src/jsp/WEB-INF/web.xml.orig 2015-10-11 16:41:55 UTC
|
|
+++ src/jsp/WEB-INF/web.xml
|
|
@@ -1,8 +1,8 @@
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
-xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
|
|
-version="2.5">
|
|
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
|
|
+version="3.1">
|
|
|
|
|
|
<!-- Spring context -->
|
|
@@ -333,33 +333,30 @@ version="2.5">
|
|
<!-- TAG Library Descriptors -->
|
|
|
|
<!-- Struts TLDs -->
|
|
- <taglib>
|
|
- <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
|
|
- <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
|
|
- </taglib>
|
|
- <taglib>
|
|
- <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
|
|
- <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
|
|
- </taglib>
|
|
- <taglib>
|
|
- <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
|
|
- <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
|
|
- </taglib>
|
|
+ <jsp-config>
|
|
+ <taglib>
|
|
+ <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
|
|
+ <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
|
|
+ </taglib>
|
|
+ <taglib>
|
|
+ <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
|
|
+ <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
|
|
+ </taglib>
|
|
+ <taglib>
|
|
+ <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
|
|
+ <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
|
|
+ </taglib>
|
|
|
|
<!-- AjaxAnywhere TLDs -->
|
|
- <taglib>
|
|
- <taglib-uri>/WEB-INF/ajaxanywhere.tld</taglib-uri>
|
|
- <taglib-location>/WEB-INF/ajaxanywhere.tld</taglib-location>
|
|
- </taglib>
|
|
+ <taglib>
|
|
+ <taglib-uri>/WEB-INF/ajaxanywhere.tld</taglib-uri>
|
|
+ <taglib-location>/WEB-INF/ajaxanywhere.tld</taglib-location>
|
|
+ </taglib>
|
|
|
|
<!-- OpenEMM TLD -->
|
|
- <taglib>
|
|
- <taglib-uri>
|
|
- WEB-INF/agnitas-taglib.tld
|
|
- </taglib-uri>
|
|
- <taglib-location>
|
|
- /WEB-INF/agnitas-taglib.tld
|
|
- </taglib-location>
|
|
- </taglib>
|
|
-
|
|
+ <taglib>
|
|
+ <taglib-uri>WEB-INF/agnitas-taglib.tld</taglib-uri>
|
|
+ <taglib-location>/WEB-INF/agnitas-taglib.tld</taglib-location>
|
|
+ </taglib>
|
|
+ </jsp-config>
|
|
</web-app>
|