Index: lams_learning/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/build.xml,v diff -u -r1.13 -r1.14 --- lams_learning/build.xml 1 Nov 2005 01:29:57 -0000 1.13 +++ lams_learning/build.xml 9 Nov 2005 06:57:24 -0000 1.14 @@ -245,7 +245,9 @@ + + Index: lams_learning/conf/xdoclet/taglibs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/taglibs.xml,v diff -u -r1.2 -r1.3 --- lams_learning/conf/xdoclet/taglibs.xml 21 Feb 2005 05:31:39 -0000 1.2 +++ lams_learning/conf/xdoclet/taglibs.xml 9 Nov 2005 06:57:24 -0000 1.3 @@ -1,80 +1,88 @@ - + - http://jakarta.apache.org/struts/struts-bean - /WEB-INF/struts/struts-bean.tld + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld - http://jakarta.apache.org/struts/struts-bean-el - /WEB-INF/struts/struts-bean-el.tld + tags-html + /WEB-INF/struts/tlds/struts-html.tld - http://jakarta.apache.org/struts/struts-html - /WEB-INF/struts/struts-html.tld + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld - http://jakarta.apache.org/struts/struts-html-el - /WEB-INF/struts/struts-html-el.tld + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld - http://jakarta.apache.org/struts/struts-logic - /WEB-INF/struts/struts-logic.tld + tags-bean-el + + /WEB-INF/struts/tlds/struts-bean-el.tld + - http://jakarta.apache.org/struts/struts-logic-el - /WEB-INF/struts/struts-logic-el.tld + tags-html-el + + /WEB-INF/struts/tlds/struts-html-el.tld + - http://jakarta.apache.org/struts/struts-template - /WEB-INF/struts/struts-template.tld + tags-logic-el + + /WEB-INF/struts/tlds/struts-logic-el.tld + - http://jakarta.apache.org/struts/struts-tiles - /WEB-INF/struts/struts-tiles.tld + tags-tiles-el + + /WEB-INF/struts/tlds/struts-tiles-el.tld + - http://java.sun.com/jstl/core - /WEB-INF/jstl/c.tld + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld - http://java.sun.com/jstl/core_rt - /WEB-INF/jstl/c-rt.tld + tags-fmt-rt + /WEB-INF/jstl/tlds/fmt-rt.tld - http://java.sun.com/jstl/fmt - /WEB-INF/jstl/fmt.tld + tags-core + /WEB-INF/jstl/tlds/c.tld - http://java.sun.com/jstl/fmt_rt - /WEB-INF/jstl/fmt-rt.tld + tags-core-rt + /WEB-INF/jstl/tlds/c-rt.tld - http://java.sun.com/jstl/xml - /WEB-INF/jstl/x.tld + tags-xml + /WEB-INF/jstl/tlds/x.tld - http://java.sun.com/jstl/xml_rt - /WEB-INF/jstl/x-rt.tld + tags-xml_rt + /WEB-INF/jstl/tlds/x-rt.tld Index: lams_learning/web/controlBottomFrame.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/controlBottomFrame.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/controlBottomFrame.jsp 23 Feb 2005 04:59:05 -0000 1.1 +++ lams_learning/web/controlBottomFrame.jsp 9 Nov 2005 06:57:23 -0000 1.2 @@ -20,9 +20,9 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_learning/web/controlFrame.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/controlFrame.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/controlFrame.jsp 23 Feb 2005 04:59:05 -0000 1.1 +++ lams_learning/web/controlFrame.jsp 9 Nov 2005 06:57:23 -0000 1.2 @@ -20,11 +20,11 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-tiles" prefix="tiles"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-tiles" prefix="tiles"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_learning/web/controlTopFrame.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/controlTopFrame.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/controlTopFrame.jsp 23 Feb 2005 04:59:05 -0000 1.1 +++ lams_learning/web/controlTopFrame.jsp 9 Nov 2005 06:57:23 -0000 1.2 @@ -20,9 +20,9 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_learning/web/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/error.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/error.jsp 14 Sep 2005 01:06:39 -0000 1.1 +++ lams_learning/web/error.jsp 9 Nov 2005 06:57:23 -0000 1.2 @@ -19,9 +19,9 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="tags-html-el" prefix="html-el" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c" %> <%@ page import="org.apache.struts.action.Action" %> <% String cprotocol = request.getProtocol(); Index: lams_learning/web/exportPortfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/exportPortfolio.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/exportPortfolio.jsp 12 Oct 2005 01:30:13 -0000 1.2 +++ lams_learning/web/exportPortfolio.jsp 9 Nov 2005 06:57:23 -0000 1.3 @@ -1,7 +1,7 @@ -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> Index: lams_learning/web/exportPortfolioPrintVersion.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/exportPortfolioPrintVersion.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/exportPortfolioPrintVersion.jsp 12 Oct 2005 01:30:39 -0000 1.1 +++ lams_learning/web/exportPortfolioPrintVersion.jsp 9 Nov 2005 06:57:23 -0000 1.2 @@ -1,7 +1,7 @@ -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> Index: lams_learning/web/exportWaitingPage.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/exportWaitingPage.jsp 21 Oct 2005 06:06:32 -0000 1.2 +++ lams_learning/web/exportWaitingPage.jsp 9 Nov 2005 06:57:23 -0000 1.3 @@ -19,11 +19,11 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> <% Index: lams_learning/web/lessonComplete.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v diff -u -r1.3 -r1.4 --- lams_learning/web/lessonComplete.jsp 21 Feb 2005 05:31:39 -0000 1.3 +++ lams_learning/web/lessonComplete.jsp 9 Nov 2005 06:57:23 -0000 1.4 @@ -20,10 +20,10 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %>

Index: lams_learning/web/loadToolActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/loadToolActivity.jsp 19 Oct 2005 05:58:50 -0000 1.2 +++ lams_learning/web/loadToolActivity.jsp 9 Nov 2005 06:57:23 -0000 1.3 @@ -20,10 +20,10 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> <% String protocol = request.getProtocol(); if(protocol.startsWith("HTTPS")){ Index: lams_learning/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v diff -u -r1.4 -r1.5 --- lams_learning/web/main.jsp 14 Sep 2005 01:08:41 -0000 1.4 +++ lams_learning/web/main.jsp 9 Nov 2005 06:57:23 -0000 1.5 @@ -20,11 +20,10 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-tiles" prefix="tiles"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_learning/web/optionsActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v diff -u -r1.4 -r1.5 --- lams_learning/web/optionsActivity.jsp 21 Feb 2005 05:31:39 -0000 1.4 +++ lams_learning/web/optionsActivity.jsp 9 Nov 2005 06:57:23 -0000 1.5 @@ -20,10 +20,10 @@ --%> <%@ page language="java"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-bean" prefix="bean"%> -<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %>