Index: lams_common/web/admin/adminContent.jsp =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -r0208a5d324d405fc0506c571a6d25d8cb84ed56b --- lams_common/web/admin/adminContent.jsp (.../adminContent.jsp) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/web/admin/adminContent.jsp (.../adminContent.jsp) (revision 0208a5d324d405fc0506c571a6d25d8cb84ed56b) @@ -11,9 +11,9 @@ <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %> <%@ page import="org.lamsfoundation.lams.usermanagement.User" %> <%@ page import="org.lamsfoundation.lams.web.AttributeNames" %> -<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> Index: lams_common/web/admin/userContent.jsp =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -r0208a5d324d405fc0506c571a6d25d8cb84ed56b --- lams_common/web/admin/userContent.jsp (.../userContent.jsp) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/web/admin/userContent.jsp (.../userContent.jsp) (revision 0208a5d324d405fc0506c571a6d25d8cb84ed56b) @@ -4,9 +4,9 @@ <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %> <%@ page import="org.lamsfoundation.lams.usermanagement.User" %> <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> Index: lams_common/web/admin/usersaddContent.jsp =================================================================== diff -u -re492b26493063bca3a73c31c590f987bf6e89cdc -r0208a5d324d405fc0506c571a6d25d8cb84ed56b --- lams_common/web/admin/usersaddContent.jsp (.../usersaddContent.jsp) (revision e492b26493063bca3a73c31c590f987bf6e89cdc) +++ lams_common/web/admin/usersaddContent.jsp (.../usersaddContent.jsp) (revision 0208a5d324d405fc0506c571a6d25d8cb84ed56b) @@ -1,7 +1,7 @@ <%@ page contentType="text/html; charset=iso-8859-1" language="java" %> -<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> <%@ page import="java.util.Map"%> <%@ page import="org.lamsfoundation.lams.usermanagement.web.UsersAddActionForm"%> Index: lams_common/web/admin/usersremoveContent.jsp =================================================================== diff -u -r19c9010eff6be2e29657beed94349a978088650f -r0208a5d324d405fc0506c571a6d25d8cb84ed56b --- lams_common/web/admin/usersremoveContent.jsp (.../usersremoveContent.jsp) (revision 19c9010eff6be2e29657beed94349a978088650f) +++ lams_common/web/admin/usersremoveContent.jsp (.../usersremoveContent.jsp) (revision 0208a5d324d405fc0506c571a6d25d8cb84ed56b) @@ -10,9 +10,9 @@ <%@ page import="org.lamsfoundation.lams.usermanagement.User" %> <%@ page import="org.lamsfoundation.lams.usermanagement.Organisation" %> <%@ page import="org.lamsfoundation.lams.usermanagement.web.UsersRemoveActionForm" %> -<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> <%!