blob: 2a3d3a71c42c299fde4be422a1c7049906e462fd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- 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>
|
