xlawrence 2005/01/07 14:26:13 CET
Modified files:
webapp/admin/src/webapp/WEB-INF web.xml
webapp/uiclient/src/webapp/WEB-INF web.xml
Log:
Updated config files
Revision Changes Path
1.3 +4 -4 uwcal_JSR168/webapp/admin/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/admin/src/webapp/WEB-INF/web.xml.diff?r1=1.2&r2=1.3&f=h
1.3 +4 -8 uwcal_JSR168/webapp/uiclient/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/uiclient/src/webapp/WEB-INF/web.xml.diff?r1=1.2&r2=1.3&f=h
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/webapp/admin/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 6 Jan 2005 16:38:23 -0000 1.2
+++ web.xml 7 Jan 2005 13:26:13 -0000 1.3
@@ -90,19 +90,19 @@
<taglib>
<taglib-uri>struts-bean</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-bean.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-bean.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>struts-html</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-html.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-html.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>struts-logic</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-logic.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-logic.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>struts-template</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-template.tld</taglib-location>
</taglib>
<!-- JDBC DataSources (java:comp/env/jdbc) -->
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/webapp/uiclient/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 6 Jan 2005 16:38:23 -0000 1.2
+++ web.xml 7 Jan 2005 13:26:13 -0000 1.3
@@ -4,10 +4,6 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
-<!-- guest/web.xml and user/web.xml in uwcalxml should be
- identical except for the security piece.
- -->
-
<web-app>
<display-name>UWCal Client Application</display-name>
@@ -76,19 +72,19 @@
<taglib>
<taglib-uri>struts-bean</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-bean.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-bean.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>struts-html</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-html.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-html.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>struts-logic</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-logic.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-logic.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>struts-template</taglib-uri>
- <taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location>
+ <taglib-location>/WEB-INF/tld/struts-template.tld</taglib-location>
</taglib>
<!-- JDBC DataSources (java:comp/env/jdbc) -->
