Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java =================================================================== diff -u -ra94de5ff6e0fa1bf65e068d94c81ccdd232c06df -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java (.../McAttachmentDTO.java) (revision a94de5ff6e0fa1bf65e068d94c81ccdd232c06df) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java (.../McAttachmentDTO.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,23 +1,25 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *This program is free software; you can redistribute it and/or modify - *it under the terms of the GNU General Public License as published by - *the Free Software Foundation; either version 2 of the License, or - *(at your option) any later version. - * - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU General Public License for more details. - * - *You should have received a copy of the GNU General Public License - *along with this program; if not, write to the Free Software - *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java =================================================================== diff -u -r5a7e9a97c3fc8fee48ea812601f86a41251879ce -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java (.../McMonitoredAnswersDTO.java) (revision 5a7e9a97c3fc8fee48ea812601f86a41251879ce) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java (.../McMonitoredAnswersDTO.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,23 +1,25 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *This program is free software; you can redistribute it and/or modify - *it under the terms of the GNU General Public License as published by - *the Free Software Foundation; either version 2 of the License, or - *(at your option) any later version. - * - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU General Public License for more details. - * - *You should have received a copy of the GNU General Public License - *along with this program; if not, write to the Free Software - *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import java.util.List; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== diff -u -rbec706f6a70906dc5c7a6d3d03575d26100a3b10 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision bec706f6a70906dc5c7a6d3d03575d26100a3b10) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,7 +1,25 @@ -/* - * Created on 21/04/2005 - * - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import java.text.DateFormat; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -r77f932966d3bc4ce011c78dc938f5a18f8f4a5c0 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 77f932966d3bc4ce011c78dc938f5a18f8f4a5c0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -25,7 +25,6 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO; -import org.lamsfoundation.lams.tool.mc.pojos.McQueContent; import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr; import org.lamsfoundation.lams.tool.mc.pojos.McSession; import org.springframework.orm.hibernate3.HibernateTemplate; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java =================================================================== diff -u -ra94de5ff6e0fa1bf65e068d94c81ccdd232c06df -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java (.../McToolContentHandler.java) (revision a94de5ff6e0fa1bf65e068d94c81ccdd232c06df) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java (.../McToolContentHandler.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,23 +1,25 @@ -/* -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -USA - -http://www.gnu.org/licenses/gpl.txt -*/ package org.lamsfoundation.lams.tool.mc.util; import org.lamsfoundation.lams.contentrepository.client.ToolContentHandler; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== diff -u -rbec706f6a70906dc5c7a6d3d03575d26100a3b10 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision bec706f6a70906dc5c7a6d3d03575d26100a3b10) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -181,6 +181,8 @@ IMcService mcService =McUtils.getToolService(request); AuthoringUtil.readData(request, mcAuthoringForm); mcAuthoringForm.resetUserAction(); + + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); return null; } @@ -205,6 +207,7 @@ { logger.debug("dispatching addNewQuestion..."); McUtils.debugMaps(request); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; IMcService mcService =McUtils.getToolService(request); @@ -336,6 +339,8 @@ ServletException { logger.debug("dispatching removeQuestion..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); + McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; IMcService mcService =McUtils.getToolService(request); @@ -455,6 +460,7 @@ { logger.debug("dispatching editOptions..."); McUtils.debugMaps(request); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; IMcService mcService =McUtils.getToolService(request); @@ -812,6 +818,7 @@ ServletException { logger.debug("dispatching addOption..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -963,6 +970,7 @@ ServletException { logger.debug("dispatching removeOption..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -1104,6 +1112,7 @@ ServletException { logger.debug("dispatching moveQuestionDown..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -1213,6 +1222,7 @@ ServletException { logger.debug("dispatching moveQuestionUp..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -1321,6 +1331,7 @@ ServletException { logger.debug("dispatching doneOptions..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -1470,6 +1481,7 @@ ToolException { logger.debug("dispatching editActivityQuestions..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); IMcService mcService =McUtils.getToolService(request); @@ -1511,6 +1523,7 @@ { logger.debug("dispatching submitQuestions..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -1886,7 +1899,7 @@ errors.add(Globals.ERROR_KEY,new ActionMessage("sbmt.successful")); logger.debug("add sbmt.successful to ActionMessages"); saveErrors(request,errors); - request.setAttribute(SUBMIT_SUCCESS, new Integer(1)); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(1)); logger.debug("set SUBMIT_SUCCESS to 1"); request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0)); @@ -1953,6 +1966,7 @@ { logger.debug("dispatching deleteOfflineFile..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -2003,6 +2017,7 @@ { logger.debug("dispatching deleteOnlineFile..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -2052,6 +2067,7 @@ RepositoryCheckedException { logger.debug("dispatching submitOfflineFile..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -2121,7 +2137,9 @@ RepositoryCheckedException { logger.debug("dispatching submitOnlineFiles..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); + McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; IMcService mcService =McUtils.getToolService(request); @@ -2186,6 +2204,7 @@ ServletException { logger.debug("dispatching doneAdvancedTab..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -2225,6 +2244,7 @@ ServletException { logger.debug("dispatching doneInstructionsTab..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -2270,7 +2290,9 @@ ServletException { logger.debug("dispatching cancelAuthoring..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); + McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; /* determine whether the request is from Monitoring url Edit Activity*/ @@ -2300,6 +2322,7 @@ protected boolean validateQuestionWeights(HttpServletRequest request, Map mapWeights, McAuthoringForm mcAuthoringForm) { logger.debug("mapWeights: " + mapWeights); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); McUtils.debugMaps(request); Iterator itMap = mapWeights.entrySet().iterator(); Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AbstractMcTestCase.java =================================================================== diff -u -r899f826e2aff2a1a624a0c4a212a284660fe4a60 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AbstractMcTestCase.java (.../AbstractMcTestCase.java) (revision 899f826e2aff2a1a624a0c4a212a284660fe4a60) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AbstractMcTestCase.java (.../AbstractMcTestCase.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,3 +1,24 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc; Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,3 +1,25 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import java.util.HashSet; @@ -15,7 +37,7 @@ import org.lamsfoundation.lams.tool.mc.pojos.McSession; /** - * @author ozgurd + * @author Ozgur Demirtas */ public class McDataAccessTestCase extends AbstractLamsTestCase { Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,24 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.mc; @@ -16,7 +29,7 @@ /* * - * @author ozgurd + * @author Ozgur Demirtas * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,12 +1,26 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import java.util.Iterator; @@ -40,21 +54,6 @@ super(name); } - /* - public void testCreateMcOptionsContent() - { - McQueContent mcQueContent = mcQueContentDAO.getMcQueContentByUID(new Long(1)); - McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent, new HashSet()); - mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent); - - McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent, new HashSet()); - mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2); - - McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent, new HashSet()); - mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3); - } - */ - public void testRetrieveMcOptionsContent() { List list=mcOptionsContentDAO.findMcOptionsContentByQueId(new Long(1)); @@ -67,7 +66,6 @@ System.out.println("option text:" + mcOptsContent.getMcQueOptionText()); } } - } Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java (.../TestMcQueContent.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java (.../TestMcQueContent.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,19 +1,33 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; /* * - * @author ozgurd + * @author Ozgur Demirtas * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java (.../TestMcQueUsr.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java (.../TestMcQueUsr.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,12 +1,26 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-20 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import java.util.HashSet; @@ -18,7 +32,7 @@ /** * This test is designed to test all service provided by SurveyQueUsr domain * class - * @author ozgurd + * @author Ozgur Demirtas * */ Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java (.../TestMcSession.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java (.../TestMcSession.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,12 +1,26 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import org.lamsfoundation.lams.tool.mc.pojos.McSession; @@ -16,7 +30,7 @@ /* * - * @author ozgurd + * @author Ozgur Demirtas * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java =================================================================== diff -u -r9219b0a1d1623f192568d6427be86e8c795b4b4a -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java (.../TestMcUsrAttempt.java) (revision 9219b0a1d1623f192568d6427be86e8c795b4b4a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java (.../TestMcUsrAttempt.java) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,12 +1,26 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.mc; import java.util.Date; @@ -21,7 +35,7 @@ /* * - * @author ozgurd + * @author Ozgur Demirtas * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates Index: lams_tool_lamc/web/BaseContent.jsp =================================================================== diff -u -r4db5a791a1d9fc010b172c50f9f60677ed71d0fe -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/BaseContent.jsp (.../BaseContent.jsp) (revision 4db5a791a1d9fc010b172c50f9f60677ed71d0fe) +++ lams_tool_lamc/web/BaseContent.jsp (.../BaseContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>

Base Content

Index: lams_tool_lamc/web/Errorbox.jsp =================================================================== diff -u -rb43ad006ae82eb3755ceb8dc154a3101ec83ca75 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/Errorbox.jsp (.../Errorbox.jsp) (revision b43ad006ae82eb3755ceb8dc154a3101ec83ca75) +++ lams_tool_lamc/web/Errorbox.jsp (.../Errorbox.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + + - + images/success.gif" align="left" width=20 height=20> - + - + images/error.jpg" align="left" width=20 height=20> - + Index: lams_tool_lamc/web/Footer.jsp =================================================================== diff -u -r4db5a791a1d9fc010b172c50f9f60677ed71d0fe -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/Footer.jsp (.../Footer.jsp) (revision 4db5a791a1d9fc010b172c50f9f60677ed71d0fe) +++ lams_tool_lamc/web/Footer.jsp (.../Footer.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> Index: lams_tool_lamc/web/Header.jsp =================================================================== diff -u -r703f3c0889f578233872be21462c7b5e4c23b787 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/Header.jsp (.../Header.jsp) (revision 703f3c0889f578233872be21462c7b5e4c23b787) +++ lams_tool_lamc/web/Header.jsp (.../Header.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> <%@ page contentType="text/html; charset=iso-8859-1" language="java" %> Index: lams_tool_lamc/web/McErrorBox.jsp =================================================================== diff -u -ra7aa5455fba74eeaccd67a8db11328941867fe3d -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/McErrorBox.jsp (.../McErrorBox.jsp) (revision a7aa5455fba74eeaccd67a8db11328941867fe3d) +++ lams_tool_lamc/web/McErrorBox.jsp (.../McErrorBox.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
Index: lams_tool_lamc/web/Template.jsp =================================================================== diff -u -r297f0e255a9be2d90979a846954649e37ee2000c -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/Template.jsp (.../Template.jsp) (revision 297f0e255a9be2d90979a846954649e37ee2000c) +++ lams_tool_lamc/web/Template.jsp (.../Template.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - -<%@ taglib uri="tags-tiles" prefix="tiles" %> -<%@ taglib uri="tags-html" prefix="html" %> +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-c" prefix="c" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/jstl/tlds/c-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/jstl/tlds/c.tld =================================================================== diff -u -r4db5a791a1d9fc010b172c50f9f60677ed71d0fe -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/WEB-INF/jstl/tlds/c.tld (.../c.tld) (revision 4db5a791a1d9fc010b172c50f9f60677ed71d0fe) +++ lams_tool_lamc/web/WEB-INF/jstl/tlds/c.tld (.../c.tld) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,415 +1,562 @@ - - - - 1.0 - 1.2 - c - http://java.sun.com/jstl/core + + + + + JSTL 1.1 core library JSTL core - JSTL 1.0 core library + 1.1 + c + http://java.sun.com/jsp/jstl/core + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlCoreTLV + org.apache.taglibs.standard.tlv.JstlCoreTLV - - expressionAttributes - - out:value - out:default - out:escapeXml - if:test - import:url - import:context - import:charEncoding - forEach:items - forEach:begin - forEach:end - forEach:step - forTokens:items - forTokens:begin - forTokens:end - forTokens:step - param:encode - param:name - param:value - redirect:context - redirect:url - set:property - set:target - set:value - url:context - url:value - when:test - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP Catches any Throwable that occurs in its body and optionally exposes it. + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + +Name of the exported scoped variable for the +exception thrown from a nested action. The type of the +scoped variable is the type of the exception thrown. + var false false + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + choose org.apache.taglibs.standard.tag.common.core.ChooseTag JSP - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - out - org.apache.taglibs.standard.tag.el.core.OutTag - JSP - Like <%= ... >, but for expressions. + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition - - value - true - false - - - default - false - false - - - escapeXml - false - false - - - - if - org.apache.taglibs.standard.tag.el.core.IfTag + org.apache.taglibs.standard.tag.rt.core.IfTag JSP - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - + +The test condition that determines whether or +not the body content should be processed. + test true - false + true + boolean + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + var false false + +Scope for var. + scope false false + + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + import - org.apache.taglibs.standard.tag.el.core.ImportTag + org.apache.taglibs.standard.tag.rt.core.ImportTag org.apache.taglibs.standard.tei.ImportTEI JSP - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - + +The URL of the resource to import. + url true - false + true + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is String. + var false false + +Scope for var. + scope false false + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is Reader. + varReader false false + +Name of the context when accessing a relative +URL resource that belongs to a foreign +context. + context false - false + true + +Character encoding of the content at the input +resource. + charEncoding false - false + true - forEach - org.apache.taglibs.standard.tag.el.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP The basic iteration tag, accepting many different collection types and supporting subsetting and other functionality + forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + +Collection of items to iterate over. + items false - false + true + java.lang.Object + +If items specified: +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. +If items not specified: +Iteration begins with index set at the value +specified. + begin false - false + true + int + +If items specified: +Iteration ends at the item located at the +specified index (inclusive). +If items not specified: +Iteration ends when index reaches the value +specified. + end false - false + true + int + +Iteration will only process every step items of +the collection, starting with the first one. + step false - false + true + int + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. Its type depends +on the object of the underlying collection. + var false false + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested +visibility. + varStatus false false - forTokens - org.apache.taglibs.standard.tag.el.core.ForTokensTag - JSP Iterates over tokens, separated by the supplied delimeters + forTokens + org.apache.taglibs.standard.tag.rt.core.ForTokensTag + JSP + +String of tokens to iterate over. + items true - false + true + java.lang.String + +The set of delimiters (the characters that +separate the tokens in the string). + delims true - false + true + java.lang.String + +Iteration begins at the token located at the +specified index. First token has index 0. + begin false - false + true + int + +Iteration ends at the token located at the +specified index (inclusive). + end false - false + true + int + +Iteration will only process every step tokens +of the string, starting with the first one. + step false - false + true + int + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. + var false false + +Name of the exported scoped variable for the +status of the iteration. Object exported is of +type +javax.servlet.jsp.jstl.core.LoopTag +Status. This scoped variable has nested +visibility. + varStatus false false - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag + + Like <%= ... >, but for expressions. + + out + org.apache.taglibs.standard.tag.rt.core.OutTag JSP + + +Expression to be evaluated. + + value + true + true + + + +Default value if the resulting value is null. + + default + false + true + + + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default value is +true. + + escapeXml + false + true + + + + + - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP - param - org.apache.taglibs.standard.tag.el.core.ParamTag - JSP - Adds a parameter to a containing 'import' tag's URL. + Adds a parameter to a containing 'import' tag's URL. + param + org.apache.taglibs.standard.tag.rt.core.ParamTag + JSP + +Name of the query string parameter. + name true - false + true + +Value of the parameter. + value false - false + true - redirect - org.apache.taglibs.standard.tag.el.core.RedirectTag - JSP - Redirects to a new URL. + Redirects to a new URL. + redirect + org.apache.taglibs.standard.tag.rt.core.RedirectTag + JSP - var + +The URL of the resource to redirect to. + + url false - false + true - scope - false - false - - - url - true - false - - + +Name of the context when redirecting to a relative URL +resource that belongs to a foreign context. + context false - false + true + + Removes a scoped variable (from a particular scope, if specified). + remove org.apache.taglibs.standard.tag.common.core.RemoveTag empty - - Removes a scoped variable (from a particular scope, if specified). - + +Name of the scoped variable to be removed. + var true false + +Scope for var. + scope false false - - set - org.apache.taglibs.standard.tag.el.core.SetTag - JSP + - Sets the result of an expression evaluation in a 'scope' + Sets the result of an expression evaluation in a 'scope' + set + org.apache.taglibs.standard.tag.rt.core.SetTag + JSP + +Name of the exported scoped variable to hold the value +specified in the action. The type of the scoped variable is +whatever type the value expression evaluates to. + var false false + +Expression to be evaluated. + value false - false + true + +Target object whose property will be set. Must evaluate to +a JavaBeans object with setter property property, or to a +java.util.Map object. + target false - false + true + +Name of the property to be set in the target object. + property false - false + true + +Scope for var. + scope false false - url - org.apache.taglibs.standard.tag.el.core.UrlTag - JSP - Prints or exposes a URL with optional query parameters - (via the c:param tag). + Creates a URL with optional query parameters. + url + org.apache.taglibs.standard.tag.rt.core.UrlTag + JSP + +Name of the exported scoped variable for the +processed url. The type of the scoped variable is +String. + var false false + +Scope for var. + scope false false + +URL to be processed. + value - true - false + false + true + +Name of the context when specifying a relative URL +resource that belongs to a foreign context. + context false - false + true - when - org.apache.taglibs.standard.tag.el.core.WhenTag - JSP - Subtag of <choose> that includes its body if its - condition evalutes to 'true' + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + when + org.apache.taglibs.standard.tag.rt.core.WhenTag + JSP + +The test condition that determines whether or not the +body content should be processed. + test true - false + true + boolean Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/jstl/tlds/fmt-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/jstl/tlds/fmt.tld =================================================================== diff -u -r4db5a791a1d9fc010b172c50f9f60677ed71d0fe -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/WEB-INF/jstl/tlds/fmt.tld (.../fmt.tld) (revision 4db5a791a1d9fc010b172c50f9f60677ed71d0fe) +++ lams_tool_lamc/web/WEB-INF/jstl/tlds/fmt.tld (.../fmt.tld) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,438 +1,667 @@ - - - - 1.0 - 1.2 - fmt - http://java.sun.com/jstl/fmt + + + + + JSTL 1.1 i18n-capable formatting library JSTL fmt - JSTL 1.0 i18n-capable formatting library + 1.1 + fmt + http://java.sun.com/jsp/jstl/fmt + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlFmtTLV + org.apache.taglibs.standard.tlv.JstlFmtTLV - - expressionAttributes - - requestEncoding:value - setLocale:value - setLocale:variant - timeZone:value - setTimeZone:value - bundle:basename - bundle:prefix - setBundle:basename - message:key - message:bundle - param:value - formatNumber:value - formatNumber:pattern - formatNumber:currencyCode - formatNumber:currencySymbol - formatNumber:groupingUsed - formatNumber:maxIntegerDigits - formatNumber:minIntegerDigits - formatNumber:maxFractionDigits - formatNumber:minFractionDigits - parseNumber:value - parseNumber:pattern - parseNumber:parseLocale - parseNumber:integerOnly - formatDate:value - formatDate:pattern - formatDate:timeZone - parseDate:value - parseDate:pattern - parseDate:timeZone - parseDate:parseLocale - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - requestEncoding - org.apache.taglibs.standard.tag.el.fmt.RequestEncodingTag - empty Sets the request character encoding + requestEncoding + org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag + empty + +Name of character encoding to be applied when +decoding request parameters. + value false - false + true - setLocale - org.apache.taglibs.standard.tag.el.fmt.SetLocaleTag - empty Stores the given locale in the locale configuration variable + setLocale + org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag + empty + +A String value is interpreted as the +printable representation of a locale, which +must contain a two-letter (lower-case) +language code (as defined by ISO-639), +and may contain a two-letter (upper-case) +country code (as defined by ISO-3166). +Language and country codes must be +separated by hyphen (-) or underscore +(_). + value true - false + true + +Vendor- or browser-specific variant. +See the java.util.Locale javadocs for +more information on variants. + variant false - false + true + +Scope of the locale configuration variable. + scope false false - timeZone - org.apache.taglibs.standard.tag.el.fmt.TimeZoneTag - JSP Specifies the time zone for any time formatting or parsing actions nested in its body + timeZone + org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag + JSP + +The time zone. A String value is interpreted as +a time zone ID. This may be one of the time zone +IDs supported by the Java platform (such as +"America/Los_Angeles") or a custom time zone +ID (such as "GMT-8"). See +java.util.TimeZone for more information on +supported time zone formats. + value true - false + true - setTimeZone - org.apache.taglibs.standard.tag.el.fmt.SetTimeZoneTag - empty Stores the given time zone in the time zone configuration variable + setTimeZone + org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag + empty + +The time zone. A String value is interpreted as +a time zone ID. This may be one of the time zone +IDs supported by the Java platform (such as +"America/Los_Angeles") or a custom time zone +ID (such as "GMT-8"). See java.util.TimeZone for +more information on supported time zone +formats. + value true - false + true + +Name of the exported scoped variable which +stores the time zone of type +java.util.TimeZone. + var false false + +Scope of var or the time zone configuration +variable. + scope false false - bundle - org.apache.taglibs.standard.tag.el.fmt.BundleTag - JSP Loads a resource bundle to be used by its tag body + bundle + org.apache.taglibs.standard.tag.rt.fmt.BundleTag + JSP + +Resource bundle base name. This is the bundle's +fully-qualified resource name, which has the same +form as a fully-qualified class name, that is, it uses +"." as the package component separator and does not +have any file type (such as ".class" or ".properties") +suffix. + basename true - false + true + +Prefix to be prepended to the value of the message +key of any nested <fmt:message> action. + prefix false - false + true - setBundle - org.apache.taglibs.standard.tag.el.fmt.SetBundleTag - empty Loads a resource bundle and stores it in the named scoped variable or the bundle configuration variable + setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag + empty + +Resource bundle base name. This is the bundle's +fully-qualified resource name, which has the same +form as a fully-qualified class name, that is, it uses +"." as the package component separator and does not +have any file type (such as ".class" or ".properties") +suffix. + basename true - false + true + +Name of the exported scoped variable which stores +the i18n localization context of type +javax.servlet.jsp.jstl.fmt.LocalizationC +ontext. + var false false + +Scope of var or the localization context +configuration variable. + scope false false - message - org.apache.taglibs.standard.tag.el.fmt.MessageTag - JSP Maps key to localized message and performs parametric replacement + message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag + JSP + +Message key to be looked up. + key false - false + true + +Localization context in whose resource +bundle the message key is looked up. + bundle false - false + true + +Name of the exported scoped variable +which stores the localized message. + var false false + +Scope of var. + scope false false - param - org.apache.taglibs.standard.tag.el.fmt.ParamTag - JSP Supplies an argument for parametric replacement to a containing <message> tag + param + org.apache.taglibs.standard.tag.rt.fmt.ParamTag + JSP + +Argument used for parametric replacement. + value false - false + true - formatNumber - org.apache.taglibs.standard.tag.el.fmt.FormatNumberTag - JSP Formats a numeric value as a number, currency, or percentage + formatNumber + org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag + JSP + +Numeric value to be formatted. + value false - false + true + +Specifies whether the value is to be +formatted as number, currency, or +percentage. + type false - false + true + +Custom formatting pattern. + pattern false - false + true + +ISO 4217 currency code. Applied only +when formatting currencies (i.e. if type is +equal to "currency"); ignored otherwise. + currencyCode false - false + true + +Currency symbol. Applied only when +formatting currencies (i.e. if type is equal +to "currency"); ignored otherwise. + currencySymbol false - false + true + +Specifies whether the formatted output +will contain any grouping separators. + groupingUsed false - false + true + +Maximum number of digits in the integer +portion of the formatted output. + maxIntegerDigits false - false + true + +Minimum number of digits in the integer +portion of the formatted output. + minIntegerDigits false - false + true + +Maximum number of digits in the +fractional portion of the formatted output. + maxFractionDigits false - false + true + +Minimum number of digits in the +fractional portion of the formatted output. + minFractionDigits false - false + true + +Name of the exported scoped variable +which stores the formatted result as a +String. + var false false + +Scope of var. + scope false false - parseNumber - org.apache.taglibs.standard.tag.el.fmt.ParseNumberTag - JSP Parses the string representation of a number, currency, or percentage + parseNumber + org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag + JSP + +String to be parsed. + value false - false + true + +Specifies whether the string in the value +attribute should be parsed as a number, +currency, or percentage. + type false - false + true + +Custom formatting pattern that determines +how the string in the value attribute is to be +parsed. + pattern false - false + true + +Locale whose default formatting pattern (for +numbers, currencies, or percentages, +respectively) is to be used during the parse +operation, or to which the pattern specified +via the pattern attribute (if present) is +applied. + parseLocale false - false + true + +Specifies whether just the integer portion of +the given value should be parsed. + integerOnly false - false + true + +Name of the exported scoped variable which +stores the parsed result (of type +java.lang.Number). + var false false + +Scope of var. + scope false false - formatDate - org.apache.taglibs.standard.tag.el.fmt.FormatDateTag - empty Formats a date and/or time using the supplied styles and pattern + formatDate + org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag + empty + +Date and/or time to be formatted. + value true - false + true + +Specifies whether the time, the date, or both +the time and date components of the given +date are to be formatted. + type false - false + true + +Predefined formatting style for dates. Follows +the semantics defined in class +java.text.DateFormat. Applied only +when formatting a date or both a date and +time (i.e. if type is missing or is equal to +"date" or "both"); ignored otherwise. + dateStyle false - false + true + +Predefined formatting style for times. Follows +the semantics defined in class +java.text.DateFormat. Applied only +when formatting a time or both a date and +time (i.e. if type is equal to "time" or "both"); +ignored otherwise. + timeStyle false - false + true + +Custom formatting style for dates and times. + pattern false - false + true + +Time zone in which to represent the formatted +time. + timeZone false - false + true + +Name of the exported scoped variable which +stores the formatted result as a String. + var false false + +Scope of var. + scope false false - parseDate - org.apache.taglibs.standard.tag.el.fmt.ParseDateTag - JSP Parses the string representation of a date and/or time + parseDate + org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag + JSP + +Date string to be parsed. + value false - false + true + +Specifies whether the date string in the +value attribute is supposed to contain a +time, a date, or both. + type false - false + true + +Predefined formatting style for days +which determines how the date +component of the date string is to be +parsed. Applied only when formatting a +date or both a date and time (i.e. if type +is missing or is equal to "date" or "both"); +ignored otherwise. + dateStyle false - false + true + +Predefined formatting styles for times +which determines how the time +component in the date string is to be +parsed. Applied only when formatting a +time or both a date and time (i.e. if type +is equal to "time" or "both"); ignored +otherwise. + timeStyle false - false + true + +Custom formatting pattern which +determines how the date string is to be +parsed. + pattern false - false + true + +Time zone in which to interpret any time +information in the date string. + timeZone false - false + true + +Locale whose predefined formatting styles +for dates and times are to be used during +the parse operation, or to which the +pattern specified via the pattern +attribute (if present) is applied. + parseLocale false - false + true + +Name of the exported scoped variable in +which the parsing result (of type +java.util.Date) is stored. + var false false + +Scope of var. + scope false false Index: lams_tool_lamc/web/WEB-INF/jstl/tlds/fn.tld =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/jstl/tlds/fn.tld (revision 0) +++ lams_tool_lamc/web/WEB-INF/jstl/tlds/fn.tld (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -0,0 +1,207 @@ + + + + + JSTL 1.1 functions library + JSTL functions + 1.1 + fn + http://java.sun.com/jsp/jstl/functions + + + + Tests if an input string contains the specified substring. + + contains + org.apache.taglibs.standard.functions.Functions + boolean contains(java.lang.String, java.lang.String) + + <c:if test="${fn:contains(name, searchString)}"> + + + + + + Tests if an input string contains the specified substring in a case insensitive way. + + containsIgnoreCase + org.apache.taglibs.standard.functions.Functions + boolean containsIgnoreCase(java.lang.String, java.lang.String) + + <c:if test="${fn:containsIgnoreCase(name, searchString)}"> + + + + + + Tests if an input string ends with the specified suffix. + + endsWith + org.apache.taglibs.standard.functions.Functions + boolean endsWith(java.lang.String, java.lang.String) + + <c:if test="${fn:endsWith(filename, ".txt")}"> + + + + + + Escapes characters that could be interpreted as XML markup. + + escapeXml + org.apache.taglibs.standard.functions.Functions + java.lang.String escapeXml(java.lang.String) + + ${fn:escapeXml(param:info)} + + + + + + Returns the index withing a string of the first occurrence of a specified substring. + + indexOf + org.apache.taglibs.standard.functions.Functions + int indexOf(java.lang.String, java.lang.String) + + ${fn:indexOf(name, "-")} + + + + + + Joins all elements of an array into a string. + + join + org.apache.taglibs.standard.functions.Functions + java.lang.String join(java.lang.String[], java.lang.String) + + ${fn:join(array, ";")} + + + + + + Returns the number of items in a collection, or the number of characters in a string. + + length + org.apache.taglibs.standard.functions.Functions + int length(java.lang.Object) + + You have ${fn:length(shoppingCart.products)} in your shopping cart. + + + + + + Returns a string resulting from replacing in an input string all occurrences + of a "before" string into an "after" substring. + + replace + org.apache.taglibs.standard.functions.Functions + java.lang.String replace(java.lang.String, java.lang.String, java.lang.String) + + ${fn:replace(text, "-", "•")} + + + + + + Splits a string into an array of substrings. + + split + org.apache.taglibs.standard.functions.Functions + java.lang.String[] split(java.lang.String, java.lang.String) + + ${fn:split(customerNames, ";")} + + + + + + Tests if an input string starts with the specified prefix. + + startsWith + org.apache.taglibs.standard.functions.Functions + boolean startsWith(java.lang.String, java.lang.String) + + <c:if test="${fn:startsWith(product.id, "100-")}"> + + + + + + Returns a subset of a string. + + substring + org.apache.taglibs.standard.functions.Functions + java.lang.String substring(java.lang.String, int, int) + + P.O. Box: ${fn:substring(zip, 6, -1)} + + + + + + Returns a subset of a string following a specific substring. + + substringAfter + org.apache.taglibs.standard.functions.Functions + java.lang.String substringAfter(java.lang.String, java.lang.String) + + P.O. Box: ${fn:substringAfter(zip, "-")} + + + + + + Returns a subset of a string before a specific substring. + + substringBefore + org.apache.taglibs.standard.functions.Functions + java.lang.String substringBefore(java.lang.String, java.lang.String) + + Zip (without P.O. Box): ${fn:substringBefore(zip, "-")} + + + + + + Converts all of the characters of a string to lower case. + + toLowerCase + org.apache.taglibs.standard.functions.Functions + java.lang.String toLowerCase(java.lang.String) + + Product name: ${fn.toLowerCase(product.name)} + + + + + + Converts all of the characters of a string to upper case. + + toUpperCase + org.apache.taglibs.standard.functions.Functions + java.lang.String toUpperCase(java.lang.String) + + Product name: ${fn.UpperCase(product.name)} + + + + + + Removes white spaces from both ends of a string. + + trim + org.apache.taglibs.standard.functions.Functions + java.lang.String trim(java.lang.String) + + Name: ${fn.trim(name)} + + + + Index: lams_tool_lamc/web/WEB-INF/jstl/tlds/permittedTaglibs.tld =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/jstl/tlds/permittedTaglibs.tld (revision 0) +++ lams_tool_lamc/web/WEB-INF/jstl/tlds/permittedTaglibs.tld (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -0,0 +1,34 @@ + + + + + Restricts JSP pages to the JSTL tag libraries + + permittedTaglibs + 1.1 + permittedTaglibs + http://jakarta.apache.org/taglibs/standard/permittedTaglibs + + + + javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV + + + + Whitespace-separated list of taglib URIs to permit. This example + TLD for the Standard Taglib allows only JSTL 'el' taglibs to be + imported. + + permittedTaglibs + + http://java.sun.com/jsp/jstl/core + http://java.sun.com/jsp/jstl/fmt + http://java.sun.com/jsp/jstl/sql + http://java.sun.com/jsp/jstl/xml + + + + Index: lams_tool_lamc/web/WEB-INF/jstl/tlds/scriptfree.tld =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/jstl/tlds/scriptfree.tld (revision 0) +++ lams_tool_lamc/web/WEB-INF/jstl/tlds/scriptfree.tld (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -0,0 +1,51 @@ + + + + + Validates JSP pages to prohibit use of scripting elements. + + 1.1 + scriptfree + http://jakarta.apache.org/taglibs/standard/scriptfree + + + + Validates prohibitions against scripting elements. + + + javax.servlet.jsp.jstl.tlv.ScriptFreeTLV + + + + Controls whether or not declarations are considered valid. + + allowDeclarations + false + + + + Controls whether or not scriptlets are considered valid. + + allowScriptlets + false + + + + Controls whether or not top-level expressions are considered valid. + + allowExpressions + false + + + + Controls whether or not expressions used to supply request-time + attribute values are considered valid. + + allowRTExpressions + false + + + Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/jstl/tlds/sql-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/jstl/tlds/sql.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/jstl/tlds/x-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/jstl/tlds/x.tld =================================================================== diff -u -r4db5a791a1d9fc010b172c50f9f60677ed71d0fe -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/WEB-INF/jstl/tlds/x.tld (.../x.tld) (revision 4db5a791a1d9fc010b172c50f9f60677ed71d0fe) +++ lams_tool_lamc/web/WEB-INF/jstl/tlds/x.tld (.../x.tld) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,269 +1,444 @@ - - - - 1.0 - 1.2 - x - http://java.sun.com/jstl/xml + + + + + JSTL 1.1 XML library JSTL XML - JSTL 1.0 XML library + 1.1 + x + http://java.sun.com/jsp/jstl/xml + + Provides validation features for JSTL XML tags. + org.apache.taglibs.standard.tlv.JstlXmlTLV - - expressionAttributes - - out:escapeXml - parse:xml - parse:systemId - parse:filter - transform:xml - transform:xmlSystemId - transform:xslt - transform:xsltSystemId - transform:result - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - choose - org.apache.taglibs.standard.tag.common.core.ChooseTag - JSP Simple conditional tag that establishes a context for mutually exclusive conditional operations, marked by <when> and <otherwise> + choose + org.apache.taglibs.standard.tag.common.core.ChooseTag + JSP - out - org.apache.taglibs.standard.tag.el.xml.ExprTag - empty Like <%= ... >, but for XPath expressions. + out + org.apache.taglibs.standard.tag.rt.xml.ExprTag + empty + +XPath expression to be evaluated. + select true false + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default +value is true. + escapeXml false - false + true + + XML conditional tag, which evalutes its body if the + supplied XPath expression evalutes to 'true' as a boolean + if org.apache.taglibs.standard.tag.common.xml.IfTag JSP - - XML conditional tag, which evalutes its body if the - supplied XPath expression evalutes to 'true' as a boolean - + +The test condition that tells whether or not the +body content should be processed. + select true false + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + var false false + +Scope for var. + scope false false - forEach - org.apache.taglibs.standard.tag.common.xml.ForEachTag - JSP XML iteration tag. + forEach + org.apache.taglibs.standard.tag.common.xml.ForEachTag + JSP + +Name of the exported scoped variable for the +current item of the iteration. This scoped variable +has nested visibility. Its type depends on the +result of the XPath expression in the select +attribute. + var false false + +XPath expression to be evaluated. + select true false + + +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. + + begin + false + true + int + + + +Iteration ends at the item located at the specified +index (inclusive). + + end + false + true + int + + + +Iteration will only process every step items of +the collection, starting with the first one. + + step + false + true + int + + + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility. + + varStatus + false + false + - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag - JSP Subtag of <choose> that follows <when> tags and runs only if all of the prior conditions evaluated to 'false' + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP - param - org.apache.taglibs.standard.tag.el.xml.ParamTag - JSP Adds a parameter to a containing 'transform' tag's Transformer + param + org.apache.taglibs.standard.tag.rt.xml.ParamTag + JSP + +Name of the transformation parameter. + name true - false + true + +Value of the parameter. + value false - false + true - parse - org.apache.taglibs.standard.tag.el.xml.ParseTag - org.apache.taglibs.standard.tei.XmlParseTEI - JSP Parses XML content from 'source' attribute or 'body' + parse + org.apache.taglibs.standard.tag.rt.xml.ParseTag + org.apache.taglibs.standard.tei.XmlParseTEI + JSP + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is implementation +dependent. + var false false + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is +org.w3c.dom.Document. + varDom false false + +Scope for var. + scope false false + +Scope for varDom. + scopeDom false false + +Deprecated. Use attribute 'doc' instead. + xml false - false + true + +Source XML document to be parsed. + + doc + false + true + + + +The system identifier (URI) for parsing the +XML document. + systemId false - false + true + +Filter to be applied to the source +document. + filter false - false + true - set - org.apache.taglibs.standard.tag.common.xml.SetTag - empty Saves the result of an XPath expression evaluation in a 'scope' + set + org.apache.taglibs.standard.tag.common.xml.SetTag + empty + +Name of the exported scoped variable to hold +the value specified in the action. The type of the +scoped variable is whatever type the select +expression evaluates to. + var true false + +XPath expression to be evaluated. + select false false + +Scope for var. + scope false false - transform - org.apache.taglibs.standard.tag.el.xml.TransformTag - org.apache.taglibs.standard.tei.XmlTransformTEI - JSP Conducts a transformation given a source XML document and an XSLT stylesheet + transform + org.apache.taglibs.standard.tag.rt.xml.TransformTag + org.apache.taglibs.standard.tei.XmlTransformTEI + JSP + +Name of the exported +scoped variable for the +transformed XML +document. The type of the +scoped variable is +org.w3c.dom.Document. + var false false + +Scope for var. + scope false false + +Result +Object that captures or +processes the transformation +result. + result false - false + true + +Deprecated. Use attribute +'doc' instead. + xml false - false + true + +Source XML document to be +transformed. (If exported by +<x:set>, it must correspond +to a well-formed XML +document, not a partial +document.) + + doc + false + true + + + +Deprecated. Use attribute +'docSystemId' instead. + xmlSystemId false - false + true + +The system identifier (URI) +for parsing the XML +document. + + docSystemId + false + true + + + +javax.xml.transform.Source +Transformation stylesheet as +a String, Reader, or +Source object. + xslt false - false + true + +The system identifier (URI) +for parsing the XSLT +stylesheet. + xsltSystemId false - false + true - when - org.apache.taglibs.standard.tag.common.xml.WhenTag - JSP Subtag of <choose> that includes its body if its expression evalutes to 'true' + when + org.apache.taglibs.standard.tag.common.xml.WhenTag + JSP + +The test condition that tells whether or +not the body content should be +processed + select true false Index: lams_tool_lamc/web/WEB-INF/lams.tld =================================================================== diff -u -r8c9cc087f7be90e71c24ac01bbf7f2c8ba719cd8 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision 8c9cc087f7be90e71c24ac01bbf7f2c8ba719cd8) +++ lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -32,22 +32,197 @@ - css - org.lamsfoundation.lams.web.tag.CssTag - - - - localLink - false - + WebAppURL + org.lamsfoundation.lams.web.tag.WebAppURLTag + - WebAppURL - org.lamsfoundation.lams.web.tag.WebAppURLTag - + css + org.lamsfoundation.lams.web.tag.CssTag + + + STRUTS-textarea + org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag + + accesskey + false + true + + + alt + false + true + + + altKey + false + true + + + bundle + false + true + + + cols + false + true + + + disabled + false + true + + + errorKey + false + true + + + errorStyle + false + true + + + errorStyleClass + false + true + + + errorStyleId + false + true + + + indexed + false + true + + + name + false + true + + + onblur + false + true + + + onchange + false + true + + + onclick + false + true + + + ondblclick + false + true + + + onfocus + false + true + + + onkeydown + false + true + + + onkeypress + false + true + + + onkeyup + false + true + + + onmousedown + false + true + + + onmousemove + false + true + + + onmouseout + false + true + + + onmouseover + false + true + + + onmouseup + false + true + + + property + true + true + + + readonly + false + true + + + rows + false + true + + + style + false + true + + + styleClass + false + true + + + styleId + false + true + + + tabindex + false + true + + + title + false + true + + + titleKey + false + true + + + value + false + true + + + Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== diff -u -r7acf4cc01795792d865247d66ef3da75f7049c1f -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 7acf4cc01795792d865247d66ef3da75f7049c1f) +++ lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -16,7 +16,7 @@ key="error.system.mc" type="org.lamsfoundation.lams.tool.mc.McApplicationException" handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler" - path=".systemError" + path="/SystemErrorContent.jsp" scope="request" /> @@ -32,57 +32,57 @@ + input="/index.jsp"> @@ -93,7 +93,7 @@ type="org.lamsfoundation.lams.tool.mc.web.McAction" name="McAuthoringForm" scope="session" - input=".questions" + input="/authoring/AuthoringMaincontent.jsp" parameter="dispatch" unknown="false" validate="true"> @@ -102,51 +102,45 @@ key="error.exception.McApplication" type="org.lamsfoundation.lams.tool.mc.McApplicationException" handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler" - path=".mcErrorBox" + path="/McErrorBox.jsp" scope="request" /> - - @@ -157,39 +151,39 @@ + input="/index.jsp"> @@ -199,57 +193,57 @@ + input="/learningIndex.jsp"> @@ -260,7 +254,7 @@ type="org.lamsfoundation.lams.tool.mc.web.McLearningAction" name="McLearningForm" scope="session" - input=".answers" + input="/learning/AnswersContent.jsp" parameter="method" unknown="false" validate="true"> @@ -269,69 +263,69 @@ key="error.exception.McApplication" type="org.lamsfoundation.lams.tool.mc.McApplicationException" handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler" - path=".mcErrorBox" + path="/McErrorBox.jsp" scope="request" /> @@ -341,45 +335,45 @@ + input="/monitoringIndex.jsp"> @@ -390,7 +384,7 @@ type="org.lamsfoundation.lams.tool.mc.web.McMonitoringAction" name="McMonitoringForm" scope="session" - input=".monitoringContent" + input="/monitoring/MonitoringMaincontent.jsp" parameter="method" unknown="false" validate="true"> @@ -399,39 +393,39 @@ key="error.exception.McApplication" type="org.lamsfoundation.lams.tool.mc.McApplicationException" handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler" - path=".mcErrorBox" + path="/McErrorBox.jsp" scope="request" /> @@ -450,17 +444,17 @@ key="error.exception.McApplication" type="java.lang.NullPointerException" handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler" - path=".mcErrorBox" + path="/McErrorBox.jsp" scope="request" /> Index: lams_tool_lamc/web/WEB-INF/struts/tlds/c.tld =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/struts/tlds/c.tld (revision 0) +++ lams_tool_lamc/web/WEB-INF/struts/tlds/c.tld (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -0,0 +1,416 @@ + + + + 1.0 + 1.2 + c + http://java.sun.com/jstl/core + JSTL core + JSTL 1.0 core library + + + + org.apache.taglibs.standard.tlv.JstlCoreTLV + + + expressionAttributes + + out:value + out:default + out:escapeXml + if:test + import:url + import:context + import:charEncoding + forEach:items + forEach:begin + forEach:end + forEach:step + forTokens:items + forTokens:begin + forTokens:end + forTokens:step + param:encode + param:name + param:value + redirect:context + redirect:url + set:property + set:target + set:value + url:context + url:value + when:test + + + Whitespace-separated list of colon-separated token pairs + describing tag:attribute combinations that accept expressions. + The validator uses this information to determine which + attributes need their syntax validated. + + + + + + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + + Catches any Throwable that occurs in its body and optionally + exposes it. + + + var + false + false + + + + + choose + org.apache.taglibs.standard.tag.common.core.ChooseTag + JSP + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + + + + + out + org.apache.taglibs.standard.tag.el.core.OutTag + JSP + + Like <%= ... >, but for expressions. + + + value + true + false + + + default + false + false + + + escapeXml + false + false + + + + + if + org.apache.taglibs.standard.tag.el.core.IfTag + JSP + + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition + + + test + true + false + + + var + false + false + + + scope + false + false + + + + + import + org.apache.taglibs.standard.tag.el.core.ImportTag + org.apache.taglibs.standard.tei.ImportTEI + JSP + + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + + + url + true + false + + + var + false + false + + + scope + false + false + + + varReader + false + false + + + context + false + false + + + charEncoding + false + false + + + + + forEach + org.apache.taglibs.standard.tag.el.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + + The basic iteration tag, accepting many different + collection types and supporting subsetting and other + functionality + + + items + false + false + + + begin + false + false + + + end + false + false + + + step + false + false + + + var + false + false + + + varStatus + false + false + + + + + forTokens + org.apache.taglibs.standard.tag.el.core.ForTokensTag + JSP + + Iterates over tokens, separated by the supplied delimeters + + + items + true + false + + + delims + true + false + + + begin + false + false + + + end + false + false + + + step + false + false + + + var + false + false + + + varStatus + false + false + + + + + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP + + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + + + + + param + org.apache.taglibs.standard.tag.el.core.ParamTag + JSP + + Adds a parameter to a containing 'import' tag's URL. + + + name + true + false + + + value + false + false + + + + + redirect + org.apache.taglibs.standard.tag.el.core.RedirectTag + JSP + + Redirects to a new URL. + + + var + false + false + + + scope + false + false + + + url + true + false + + + context + false + false + + + + + remove + org.apache.taglibs.standard.tag.common.core.RemoveTag + empty + + Removes a scoped variable (from a particular scope, if specified). + + + var + true + false + + + scope + false + false + + + + + set + org.apache.taglibs.standard.tag.el.core.SetTag + JSP + + Sets the result of an expression evaluation in a 'scope' + + + var + false + false + + + value + false + false + + + target + false + false + + + property + false + false + + + scope + false + false + + + + + url + org.apache.taglibs.standard.tag.el.core.UrlTag + JSP + + Prints or exposes a URL with optional query parameters + (via the c:param tag). + + + var + false + false + + + scope + false + false + + + value + true + false + + + context + false + false + + + + + when + org.apache.taglibs.standard.tag.el.core.WhenTag + JSP + + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + + + test + true + false + + + + Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/struts/tlds/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/struts/tlds/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a819720ed4933e91d93b0eb4a8a9801d31a6cb45 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/struts/tlds/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== diff -u -r21c22cf6617e27cf126f319f08be6e0fc7a3377c -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 21c22cf6617e27cf126f319f08be6e0fc7a3377c) +++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,61 +1,101 @@ - + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.mc.web.McResources + + + contextConfigLocation - + classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml - + - - - org.springframework.web.context.ContextLoaderListener - - - hibernateFilter - - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - mcSessionFactory - + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + + + sessionFactoryBeanName + mcSessionFactory + - - - SystemSessionFilter + + + LocaleFilter - org.lamsfoundation.lams.web.session.SystemSessionFilter + org.lamsfoundation.lams.web.filter.LocaleFilter - + - hibernateFilter - /* - - SystemSessionFilter + /* + + + + hibernateFilter /* - + + + LocaleFilter + /* + + + + + org.springframework.web.context.ContextLoaderListener + + + + + + org.lamsfoundation.lams.web.SessionListener + + + context org.springframework.web.context.ContextLoaderServlet 1 + action org.apache.struts.action.ActionServlet @@ -77,28 +117,9 @@ 2 - - - download - Instructions Download - Instructions Download org.lamsfoundation.lams.contentrepository.client.ToolDownload toolContentHandlerBeanName @@ -109,14 +130,28 @@ exportPortfolio - Export Portfolio - Export Portfolio org.lamsfoundation.lams.tool.mc.web.McExportServlet - + + + + + Connector + com.fredck.FCKeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + + 1 + + action - *.do + *.do @@ -128,112 +163,111 @@ exportPortfolio /portfolioExport - - - + + Connector + /fckeditor/editor/filemanager/browser/default/connectors/jsp/connector + - - 120 - + + 120 + - + 403 /403.html + + - - - - tags-bean - /WEB-INF/struts/tlds/struts-bean.tld - + + --> - - tags-html - /WEB-INF/struts/tlds/struts-html.tld - + - - tags-tiles - /WEB-INF/struts/tlds/struts-tiles.tld - + + + + + + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld + + + tags-html + /WEB-INF/struts/tlds/struts-html.tld + + + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld + + + tags-logic-el + /WEB-INF/struts/tlds/struts-logic-el.tld + + + + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld + + + + + + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld + + + tags-core + /WEB-INF/jstl/tlds/c.tld + + + tags-function + /WEB-INF/jstl/tlds/fn.tld + + + tags-xml + /WEB-INF/jstl/tlds/x.tld + + + + + + tags-permittedTaglibs + /WEB-INF/jstl/tlds/permittedTaglibs.tld + + + tags-scriptfree + /WEB-INF/jstl/tlds/scriptfree.tld + + + + + + fck-editor + /WEB-INF/fckeditor/tlds/FCKeditor.tld + + + tags-lams + /WEB-INF/lams.tld + + - - tags-bean-el - /WEB-INF/struts/tlds/struts-bean-el.tld - - - - tags-html-el - /WEB-INF/struts/tlds/struts-html-el.tld - - - - tags-logic-el - /WEB-INF/struts/tlds/struts-logic-el.tld - - - - tags-tiles-el - /WEB-INF/struts/tlds/struts-tiles-el.tld - - - - - - - - tags-fmt - /WEB-INF/jstl/tlds/fmt.tld - - - - tags-fmt-rt - /WEB-INF/jstl/tlds/fmt-rt.tld - - - - tags-c - /WEB-INF/jstl/tlds/c.tld - - - - tags-core-rt - /WEB-INF/jstl/tlds/c-rt.tld - - - - - - - - - tags-lams - /WEB-INF/lams.tld - - - - tags-fck-editor - /WEB-INF/fckeditor/tlds/FCKeditor.tld - - Secure Content - /* + *.jsp + *.html + /index.jsp + /flashCrashDump LEARNER @@ -245,46 +279,43 @@ - - + - Secure Content - /* + Authoring Update + /authoring.do - LEARNER - TEACHER - STAFF AUTHOR - ADMIN - SYSADMIN + + + Staff Content + /monitoring.do + + + STAFF + + - Authoring Update - /authoringStarter.do - /authoring.do - + Adminstrator Content + /admin.do + - AUTHOR + ADMIN - - - Staff Content - /monitoringStarter.do - /monitoring.do + LAMS System Adminstrator Content + /sysadmin.do - STAFF + SYSADMIN - - @@ -299,14 +330,45 @@ - FORM LAMS /login.jsp + /login.jsp?failed=y + + + + + Student + LEARNER + + + Student + TEACHER + + + Can create/modify a learning design + AUTHOR + + + + Can running and monitoring a learning session + STAFF + + + + Can add/remove users to the system, set up classes of users for sessions + ADMIN + + + + Can add/remove users to the system, set up classes of users for sessions + SYSADMIN + + Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp =================================================================== diff -u -r87f8b07f0e1e275d6fd8fbabb31d8ccf7a7105e9 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 87f8b07f0e1e275d6fd8fbabb31d8ccf7a7105e9) +++ lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,37 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + + +
- Error occured + images/error.jpg" alt="Error occured"/> Index: lams_tool_lamc/web/SystemErrorContent.jsp =================================================================== diff -u -r703f3c0889f578233872be21462c7b5e4c23b787 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/SystemErrorContent.jsp (.../SystemErrorContent.jsp) (revision 703f3c0889f578233872be21462c7b5e4c23b787) +++ lams_tool_lamc/web/SystemErrorContent.jsp (.../SystemErrorContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,4 +1,4 @@ - - -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
@@ -36,7 +40,7 @@

- <%@ include file="Errorbox.jsp" %> + <%@ include file="/Errorbox.jsp" %>
@@ -140,7 +192,22 @@ Index: lams_tool_lamc/web/authoring/AuthoringTabsHeader.jsp =================================================================== diff -u -r45714918e7242285a8f5b1c8df7b57dc10550249 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/authoring/AuthoringTabsHeader.jsp (.../AuthoringTabsHeader.jsp) (revision 45714918e7242285a8f5b1c8df7b57dc10550249) +++ lams_tool_lamc/web/authoring/AuthoringTabsHeader.jsp (.../AuthoringTabsHeader.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,9 +1,30 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> Index: lams_tool_lamc/web/authoring/BasicContent.jsp =================================================================== diff -u -ra9512154c624c83ef76373ede64af104251f4101 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision a9512154c624c83ef76373ede64af104251f4101) +++ lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -r5f096566109d3f2ff2fe7ed22282215a6d9d5c78 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 5f096566109d3f2ff2fe7ed22282215a6d9d5c78) +++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,9 +1,31 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> @@ -89,13 +111,28 @@ - - - + + +
- - <%@ include file="/Errorbox.jsp" %> - -
+ + + + + images/success.gif" align="left" width=20 height=20> + + + + + + + + + images/error.jpg" align="left" width=20 height=20> + + + + +
@@ -123,7 +160,22 @@
- <%@ include file="/Errorbox.jsp" %> + + + + images/success.gif" align="left" width=20 height=20> + + + + + + + + + images/error.jpg" align="left" width=20 height=20> + + +
- <%@ include file="/Errorbox.jsp" %> + + + + images/success.gif" align="left" width=20 height=20> + + + + + + + + + images/error.jpg" align="left" width=20 height=20> + + +
- ','moveQuestionDown');"> + images/down.gif" align=left onclick="javascript:submitModifyQuestion('','moveQuestionDown');"> + - ','moveQuestionUp');"> + images/up.gif" align=left onclick="javascript:submitModifyQuestion('','moveQuestionUp');"> - ','moveQuestionDown');"> - ','moveQuestionUp');"> + images/down.gif" align=left onclick="javascript:submitModifyQuestion('','moveQuestionDown');"> + images/up.gif" align=left onclick="javascript:submitModifyQuestion('','moveQuestionUp');"> @@ -108,8 +134,8 @@ @@ -129,16 +155,16 @@ @@ -155,8 +181,8 @@ Index: lams_tool_lamc/web/authoring/InstructionsContent.jsp =================================================================== diff -u -r45714918e7242285a8f5b1c8df7b57dc10550249 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 45714918e7242285a8f5b1c8df7b57dc10550249) +++ lams_tool_lamc/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
- ','editOptions');"> - ','removeQuestion');"> + images/edit.gif" align=left onclick="javascript:submitModifyQuestion('','editOptions');"> + images/delete.gif" align=left onclick="javascript:submitModifyQuestion('','removeQuestion');">
- + images/down.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" > - + images/up.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" > - - + images/down.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" > + images/up.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" > - - + images/edit.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" > + images/delete.gif" align=left onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
@@ -134,7 +159,7 @@ Index: lams_tool_lamc/web/authoring/OptionsContent.jsp =================================================================== diff -u -ra9512154c624c83ef76373ede64af104251f4101 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/authoring/OptionsContent.jsp (.../OptionsContent.jsp) (revision a9512154c624c83ef76373ede64af104251f4101) +++ lams_tool_lamc/web/authoring/OptionsContent.jsp (.../OptionsContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
@@ -66,7 +91,7 @@ - ','deleteOfflineFile');"> + images/delete.gif" align=left onclick="javascript:submitDeleteFile('','deleteOfflineFile');">
- ','deleteOnlineFile');"> + images/delete.gif" align=left onclick="javascript:submitDeleteFile('','deleteOnlineFile');">
@@ -115,7 +140,7 @@ Index: lams_tool_lamc/web/exportPortfolio.jsp =================================================================== diff -u -r21c22cf6617e27cf126f319f08be6e0fc7a3377c -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 21c22cf6617e27cf126f319f08be6e0fc7a3377c) +++ lams_tool_lamc/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,7 +1,35 @@ -<%@ taglib uri="tags-core" prefix="c" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + Index: lams_tool_lamc/web/index.jsp =================================================================== diff -u -re2cb83063b7c748bcfe245cd63b2e08ea7538e97 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/index.jsp (.../index.jsp) (revision e2cb83063b7c748bcfe245cd63b2e08ea7538e97) +++ lams_tool_lamc/web/index.jsp (.../index.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,9 +1,32 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> <% Index: lams_tool_lamc/web/learning/AnswersContent.jsp =================================================================== diff -u -r5494070a60df587773ef68539b5fece07862d4b7 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 5494070a60df587773ef68539b5fece07862d4b7) +++ lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + + Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp =================================================================== diff -u -r5494070a60df587773ef68539b5fece07862d4b7 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision 5494070a60df587773ef68539b5fece07862d4b7) +++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
@@ -76,7 +101,7 @@ - + images/delete.gif" align=left onclick="javascript:deleteOption(1,'removeOption');">
- ,'removeOption');"> + images/delete.gif" align=left onclick="javascript:deleteOption(,'removeOption');">
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -r88587005ba96477adad7b33a009ebb90c6ca9195 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 88587005ba96477adad7b33a009ebb90c6ca9195) +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
Index: lams_tool_lamc/web/learning/Preview.jsp =================================================================== diff -u -r5494070a60df587773ef68539b5fece07862d4b7 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/Preview.jsp (.../Preview.jsp) (revision 5494070a60df587773ef68539b5fece07862d4b7) +++ lams_tool_lamc/web/learning/Preview.jsp (.../Preview.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,35 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + Index: lams_tool_lamc/web/learning/RedoQuestions.jsp =================================================================== diff -u -r5494070a60df587773ef68539b5fece07862d4b7 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/RedoQuestions.jsp (.../RedoQuestions.jsp) (revision 5494070a60df587773ef68539b5fece07862d4b7) +++ lams_tool_lamc/web/learning/RedoQuestions.jsp (.../RedoQuestions.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp =================================================================== diff -u -r5494070a60df587773ef68539b5fece07862d4b7 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/ResultsSummary.jsp (.../ResultsSummary.jsp) (revision 5494070a60df587773ef68539b5fece07862d4b7) +++ lams_tool_lamc/web/learning/ResultsSummary.jsp (.../ResultsSummary.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp =================================================================== diff -u -r5494070a60df587773ef68539b5fece07862d4b7 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp (.../SingleQuestionAnswersContent.jsp) (revision 5494070a60df587773ef68539b5fece07862d4b7) +++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp (.../SingleQuestionAnswersContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== diff -u -r663ca9ac7eb1f09b5fdcd89d1df351eab7e07786 -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 663ca9ac7eb1f09b5fdcd89d1df351eab7e07786) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) @@ -1,11 +1,36 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +