Index: lams_common/web/admin/adminContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_common/web/admin/Attic/adminContent.jsp,v diff -u -r1.4 -r1.5 --- lams_common/web/admin/adminContent.jsp 28 Jan 2005 04:21:09 -0000 1.4 +++ lams_common/web/admin/adminContent.jsp 30 Aug 2005 04:37:55 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/web/admin/Attic/userContent.jsp,v diff -u -r1.3 -r1.4 --- lams_common/web/admin/userContent.jsp 28 Jan 2005 04:21:08 -0000 1.3 +++ lams_common/web/admin/userContent.jsp 30 Aug 2005 04:37:55 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/web/admin/Attic/usersaddContent.jsp,v diff -u -r1.3 -r1.4 --- lams_common/web/admin/usersaddContent.jsp 28 Jan 2005 05:34:55 -0000 1.3 +++ lams_common/web/admin/usersaddContent.jsp 30 Aug 2005 04:37:55 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/web/admin/Attic/usersremoveContent.jsp,v diff -u -r1.2 -r1.3 --- lams_common/web/admin/usersremoveContent.jsp 28 Jan 2005 04:21:09 -0000 1.2 +++ lams_common/web/admin/usersremoveContent.jsp 30 Aug 2005 04:37:55 -0000 1.3 @@ -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" %> <%!