Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Nullable.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Nullable.java (.../Nullable.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Nullable.java (.../Nullable.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,6 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ - package org.lamsfoundation.lams.tool.vote; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -61,7 +61,6 @@ public static final String AUTHORING_CANCELLED ="authoringCancelled"; public static final String DEFINE_LATER_EDIT_ACTIVITY ="defineLaterEditActivity"; public static final String ACTIVE_MODULE ="activeModule"; - public static final String EDIT_OPTIONS_MODE ="editOptionsMode"; public static final String DEFINE_LATER_IN_EDIT_MODE ="defineLaterInEditMode"; public static final String SUBMIT_SUCCESS ="sbmtSuccess"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteApplicationException.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteApplicationException.java (.../VoteApplicationException.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteApplicationException.java (.../VoteApplicationException.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java (.../VoteAttachmentDTO.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java (.../VoteAttachmentDTO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteComparator.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteComparator.java (.../VoteComparator.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteComparator.java (.../VoteComparator.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -39,7 +39,6 @@ int key1=new Long(s1).intValue(); int key2=new Long(s2).intValue(); - //logger.debug(logger + " " + this.getClass().getName() + "comparing key1 and key2:" + key1 + " and " + key2); return key1 - key2; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -103,12 +103,12 @@ public int compareTo(Object o) { - VoteMonitoredAnswersDTO mcMonitoredAnswersDTO = (VoteMonitoredAnswersDTO) o; + VoteMonitoredAnswersDTO voteMonitoredAnswersDTO = (VoteMonitoredAnswersDTO) o; - if (mcMonitoredAnswersDTO == null) + if (voteMonitoredAnswersDTO == null) return 1; else - return (int) (new Long(questionUid).longValue() - new Long(mcMonitoredAnswersDTO.questionUid).longValue()); + return (int) (new Long(questionUid).longValue() - new Long(voteMonitoredAnswersDTO.questionUid).longValue()); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteStringComparator.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteStringComparator.java (.../VoteStringComparator.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteStringComparator.java (.../VoteStringComparator.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,6 @@ * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ - package org.lamsfoundation.lams.tool.vote; import java.io.Serializable; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,12 +1,11 @@ - /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,7 +27,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.TimeZone; import java.util.TreeMap; @@ -49,7 +47,7 @@ /** * @author Ozgur Demirtas - * Common MCQ utility functions live here. + * Common Voting utility functions live here. */ public abstract class VoteUtils implements VoteAppConstants { @@ -64,8 +62,8 @@ */ public static IVoteService getToolService(HttpServletRequest request) { - IVoteService mcService=(IVoteService)request.getSession().getAttribute(TOOL_SERVICE); - return mcService; + IVoteService voteService=(IVoteService)request.getSession().getAttribute(TOOL_SERVICE); + return voteService; } /** @@ -151,13 +149,13 @@ */ public static boolean existsContent(Long toolContentId, HttpServletRequest request) { - IVoteService mcService =VoteUtils.getToolService(request); - /* - VoteContent mcContent=mcService.retrieveVote(toolContentId); - logger.debug("retrieving mcContent: " + mcContent); - if (mcContent == null) + IVoteService voteService =VoteUtils.getToolService(request); + + VoteContent voteContent=voteService.retrieveVote(toolContentId); + logger.debug("retrieving voteContent: " + voteContent); + if (voteContent == null) return false; - */ + return true; } @@ -171,11 +169,11 @@ public static boolean existsSession(Long toolSessionId, HttpServletRequest request) { logger.debug("existsSession"); - IVoteService mcService =VoteUtils.getToolService(request); - VoteSession mcSession=mcService.retrieveVoteSession(toolSessionId); - logger.debug("mcSession:" + mcSession); + IVoteService voteService =VoteUtils.getToolService(request); + VoteSession voteSession=voteService.retrieveVoteSession(toolSessionId); + logger.debug("voteSession:" + voteSession); - if (mcSession == null) + if (voteSession == null) return false; return true; @@ -198,12 +196,12 @@ Long mapIndex=new Long(1); while (listIterator.hasNext()) { - VoteOptsContent mcOptionsContent = (VoteOptsContent)listIterator.next(); - logger.debug("mcOptionsContent:" + mcOptionsContent); - mapOptionsContent.put(mapIndex.toString(),mcOptionsContent.getVoteQueOptionText()); + VoteOptsContent voteOptionsContent = (VoteOptsContent)listIterator.next(); + logger.debug("voteOptionsContent:" + voteOptionsContent); + mapOptionsContent.put(mapIndex.toString(),voteOptionsContent.getVoteQueOptionText()); mapIndex=new Long(mapIndex.longValue()+1); } - logger.debug("generated mcOptionsContent: " + mapOptionsContent); + logger.debug("generated voteOptionsContent: " + mapOptionsContent); return mapOptionsContent; } @@ -236,6 +234,31 @@ public static void persistRichText(HttpServletRequest request) { + String richTextTitle = request.getParameter(TITLE); + String richTextInstructions = request.getParameter(INSTRUCTIONS); + String richTextPosting = request.getParameter(POSTING); + + logger.debug("richTextTitle: " + richTextTitle); + logger.debug("richTextInstructions: " + richTextInstructions); + logger.debug("richTextPosting: " + richTextPosting); + + + if (richTextTitle != null) + { + request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle); + } + + if (richTextInstructions != null) + { + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, richTextInstructions); + } + + if (richTextPosting != null) + { + request.getSession().setAttribute(POSTING, richTextPosting); + } + + String richTextOfflineInstructions=request.getParameter(RICHTEXT_OFFLINEINSTRUCTIONS); logger.debug("read parameter richTextOfflineInstructions: " + richTextOfflineInstructions); String richTextOnlineInstructions=request.getParameter(RICHTEXT_ONLINEINSTRUCTIONS); @@ -251,41 +274,7 @@ request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,richTextOnlineInstructions); } - - String richTextTitle=request.getParameter(RICHTEXT_TITLE); - logger.debug("read parameter richTextTitle: " + richTextTitle); - String richTextInstructions=request.getParameter(RICHTEXT_INSTRUCTIONS); - logger.debug("read parameter richTextInstructions: " + richTextInstructions); - - - if ((richTextTitle != null) && (richTextTitle.length() > 0)) - { - request.getSession().setAttribute(RICHTEXT_TITLE,richTextTitle); - } - - if ((richTextInstructions != null) && (richTextInstructions.length() > 0)) - { - request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,richTextInstructions); - } - - String richTextIncorrectFeedback=request.getParameter(RICHTEXT_INCORRECT_FEEDBACK); - logger.debug("read parameter richTextIncorrectFeedback: " + richTextIncorrectFeedback); - - if ((richTextIncorrectFeedback != null) && (richTextIncorrectFeedback.length() > 0)) - { - request.getSession().setAttribute(RICHTEXT_INCORRECT_FEEDBACK,richTextIncorrectFeedback); - } - - String richTextCorrectFeedback=request.getParameter(RICHTEXT_CORRECT_FEEDBACK); - logger.debug("read parameter richTextCorrectFeedback: " + richTextCorrectFeedback); - - if ((richTextCorrectFeedback != null) && (richTextCorrectFeedback.length() > 0)) - { - request.getSession().setAttribute(RICHTEXT_CORRECT_FEEDBACK,richTextCorrectFeedback); - } - - String richTextReportTitle=request.getParameter(RICHTEXT_REPORT_TITLE); logger.debug("read parameter richTextReportTitle: " + richTextReportTitle); @@ -302,67 +291,17 @@ request.getSession().setAttribute(RICHTEXT_END_LEARNING_MSG,richTextEndLearningMessage); } - Map mapIncorrectFeedback=(Map)request.getSession().getAttribute(MAP_INCORRECT_FEEDBACK); } - public static void configureContentRepository(HttpServletRequest request, IVoteService mcService) + public static void configureContentRepository(HttpServletRequest request, IVoteService voteService) { logger.debug("attempt configureContentRepository"); - mcService.configureContentRepository(); + voteService.configureContentRepository(); logger.debug("configureContentRepository ran successfully"); } - /** - * retrieves existing updated file information - * populateUploadedFilesData(HttpServletRequest request, VoteContent defaultVoteContent) - * - * @param request - * @param defaultVoteContent - */ - public static void populateUploadedFilesData(HttpServletRequest request, VoteContent defaultVoteContent) - { - logger.debug("attempt populateUploadedFilesData for: " + defaultVoteContent); - IVoteService mcService =VoteUtils.getToolService(request); - logger.debug("mcService: " + mcService); - - /** read the uploaded offline uuid + file name pair */ - List listOffFilesName=mcService.retrieveVoteUploadedOfflineFilesName(defaultVoteContent.getUid()); - logger.debug("initial listOfflineFilesName: " + listOffFilesName); - - /** read the uploaded online uuid + file name pair */ - List listOnFilesName=mcService.retrieveVoteUploadedOnlineFilesName(defaultVoteContent.getUid()); - logger.debug("initial listOnlineFilesName: " + listOnFilesName); - - request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES, listOffFilesName); - request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES, listOnFilesName); - } - - /** - * temporary function - * @return - */ - public static long generateId() - { - Random generator = new Random(); - long longId=generator.nextLong(); - if (longId < 0) longId=longId * (-1) ; - return longId; - } - - /** - * temporary function - * @return - */ - public static int generateIntegerId() - { - Random generator = new Random(); - int intId=generator.nextInt(); - if (intId < 0) intId=intId * (-1) ; - return intId; - } - /** * temporary function @@ -473,42 +412,42 @@ * The idea of content being in use is, once any one learner starts using a particular content * that content should become unmodifiable. * - * isContentInUse(VoteContent mcContent) - * @param mcContent + * isContentInUse(VoteContent voteContent) + * @param voteContent * @return boolean */ - public static boolean isContentInUse(VoteContent mcContent) + public static boolean isContentInUse(VoteContent voteContent) { - logger.debug("is content inuse: " + mcContent.isContentInUse()); - return mcContent.isContentInUse(); + logger.debug("is content inuse: " + voteContent.isContentInUse()); + return voteContent.isContentInUse(); } /** * find out if the content is being edited in monitoring interface or not. If it is, the author can not modify it. * - * isDefineLater(VoteContent mcContent) - * @param mcContent + * isDefineLater(VoteContent voteContent) + * @param voteContent * @return boolean */ - public static boolean isDefineLater(VoteContent mcContent) + public static boolean isDefineLater(VoteContent voteContent) { - logger.debug("is define later: " + mcContent.isDefineLater()); - return mcContent.isDefineLater(); + logger.debug("is define later: " + voteContent.isDefineLater()); + return voteContent.isDefineLater(); } /** * find out if the content is set to run offline or online. If it is set to run offline , the learners are informed about that.. - * isRubnOffline(VoteContent mcContent) + * isRubnOffline(VoteContent voteContent) * - * @param mcContent + * @param voteContent * @return boolean */ - public static boolean isRunOffline(VoteContent mcContent) + public static boolean isRunOffline(VoteContent voteContent) { - logger.debug("is run offline: " + mcContent.isRunOffline()); - return mcContent.isRunOffline(); + logger.debug("is run offline: " + voteContent.isRunOffline()); + return voteContent.isRunOffline(); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java (.../IVoteContentDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java (.../IVoteContentDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Fisheye: Tag 6cfdabe63a1d792f3135529031f9a969768a6b10 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteOptionsContentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java (.../IVoteQueContentDAO.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java (.../IVoteQueContentDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,6 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ - package org.lamsfoundation.lams.tool.vote.dao; import java.util.List; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java (.../IVoteSessionDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java (.../IVoteSessionDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java (.../IVoteUploadedFileDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java (.../IVoteUploadedFileDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,31 +1,29 @@ -/* - *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) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * 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.vote.dao; -import java.util.Iterator; import java.util.List; -import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile; -import org.springframework.orm.hibernate3.HibernateTemplate; /** * @@ -36,7 +34,7 @@ public interface IVoteUploadedFileDAO { public VoteUploadedFile getUploadedFileById(long submissionId); - ; + public VoteUploadedFile loadUploadedFileById(long uid); public void updateUploadFile(VoteUploadedFile voteUploadedFile); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java (.../IVoteUserDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java (.../IVoteUserDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java (.../VoteContentDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java (.../VoteContentDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Fisheye: Tag 6cfdabe63a1d792f3135529031f9a969768a6b10 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteOptionsContentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java (.../VoteUploadedFileDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java (.../VoteUploadedFileDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java (.../VoteUserDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java (.../VoteUserDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.dao.hibernate; import java.util.List; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java =================================================================== diff -u -r1140cc53ea50d189a37a13449ea73d5a79a6afa9 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java (.../VoteContent.java) (revision 1140cc53ea50d189a37a13449ea73d5a79a6afa9) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java (.../VoteContent.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,6 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ - package org.lamsfoundation.lams.tool.vote.pojos; import java.io.Serializable; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteOptsContent.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteOptsContent.java (.../VoteOptsContent.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteOptsContent.java (.../VoteOptsContent.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java =================================================================== diff -u -r1140cc53ea50d189a37a13449ea73d5a79a6afa9 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java (.../VoteQueContent.java) (revision 1140cc53ea50d189a37a13449ea73d5a79a6afa9) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java (.../VoteQueContent.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,6 +20,7 @@ * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.pojos; import java.io.Serializable; @@ -182,7 +183,7 @@ return this.voteOptionsContents; } - public void setMcOptionsContents(Set mcOptionsContents) { + public void setMcOptionsContents(Set voteOptionsContents) { this.voteOptionsContents = voteOptionsContents; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java (.../VoteQueUsr.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java (.../VoteQueUsr.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java (.../VoteSession.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java (.../VoteSession.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java (.../VoteUploadedFile.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java (.../VoteUploadedFile.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -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) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * 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.vote.pojos; import java.io.Serializable; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -42,7 +42,6 @@ import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.dao.DataAccessException; /** @@ -96,10 +95,6 @@ public void cleanAllQuestions(final Long mcContentUid) throws VoteApplicationException; - public void removeVoteOptionsContentByQueId(Long mcQueContentId) throws VoteApplicationException; - - public void removeVoteOptionsContent(VoteOptsContent mcOptsContent); - public VoteQueContent getQuestionContentByQuestionText(final String question, final Long mcContentUid); public void removeVoteQueContentByUID(Long uid) throws VoteApplicationException; @@ -132,18 +127,6 @@ public void deleteVoteQueUsr(VoteQueUsr mcQueUsr) throws VoteApplicationException; - public List findVoteOptionsContentByQueId(Long mcQueContentId) throws VoteApplicationException; - - public void saveVoteOptionsContent(VoteOptsContent mcOptsContent) throws VoteApplicationException; - - public VoteOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid); - - public void updateVoteOptionsContent(VoteOptsContent mcOptsContent) throws VoteApplicationException; - - public void deleteVoteOptionsContent(VoteOptsContent mcOptsContent) throws VoteApplicationException; - - public void deleteVoteOptionsContentByUID(Long uid) throws VoteApplicationException; - public User getCurrentUserData(String username) throws VoteApplicationException; public int getTotalNumberOfUsers() throws VoteApplicationException; @@ -239,7 +222,6 @@ public List getOfflineFilesMetaData(Long mcContentId) throws VoteApplicationException; public List getSessionsFromContent(VoteContent mcContent) throws VoteApplicationException; - - public List findVoteOptionNamesByQueId(Long mcQueContentId) throws VoteApplicationException; + } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -56,7 +56,6 @@ import org.lamsfoundation.lams.tool.vote.VoteAppConstants; import org.lamsfoundation.lams.tool.vote.VoteApplicationException; import org.lamsfoundation.lams.tool.vote.dao.IVoteContentDAO; -import org.lamsfoundation.lams.tool.vote.dao.IVoteOptionsContentDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteQueContentDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteSessionDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteUploadedFileDAO; @@ -97,7 +96,6 @@ private IVoteContentDAO voteContentDAO; private IVoteQueContentDAO voteQueContentDAO; - private IVoteOptionsContentDAO voteOptionsContentDAO; private IVoteSessionDAO voteSessionDAO; private IVoteUserDAO voteUserDAO; private IVoteUsrAttemptDAO voteUsrAttemptDAO; @@ -533,21 +531,7 @@ } } - public void removeVoteOptionsContent(VoteOptsContent voteOptsContent) throws VoteApplicationException - { - try - { - voteOptionsContentDAO.removeVoteOptionsContent(voteOptsContent); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is removing" - + " the vote options content: " - + e.getMessage(),e); - } - } - public VoteQueContent getQuestionContentByQuestionText(final String question, final Long voteContentId) { try @@ -781,22 +765,6 @@ } - public List findVoteOptionsContentByQueId(Long voteQueContentId) throws VoteApplicationException - { - try - { - List list=voteOptionsContentDAO.findVoteOptionsContentByQueId(voteQueContentId); - return list; - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is finding by que id" - + " the vote options: " - + e.getMessage(),e); - } - } - - public VoteOptsContent getVoteOptionsContentByUID(Long uid) throws VoteApplicationException { try @@ -811,49 +779,6 @@ } - public void saveVoteOptionsContent(VoteOptsContent voteOptsContent) throws VoteApplicationException - { - try - { - voteOptionsContentDAO.saveVoteOptionsContent(voteOptsContent); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is saving" - + " the vote options content: " - + e.getMessage(),e); - } - } - - public VoteOptsContent getOptionContentByOptionText(final String option, final Long voteQueContentUid) - { - try - { - return voteOptionsContentDAO.getOptionContentByOptionText(option, voteQueContentUid); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is returning the" - + " option by option text: " - + e.getMessage(),e); - } - } - - - public void updateVoteOptionsContent(VoteOptsContent voteOptsContent) throws VoteApplicationException - { - try - { - voteOptionsContentDAO.updateVoteOptionsContent(voteOptsContent); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is updating" - + " the vote options content: " - + e.getMessage(),e); - } - } - public List getSessionsFromContent(VoteContent voteContent) throws VoteApplicationException { try @@ -869,67 +794,6 @@ } - public void deleteVoteOptionsContent(VoteOptsContent voteOptsContent) throws VoteApplicationException - { - try - { - voteOptionsContentDAO.removeVoteOptionsContent(voteOptsContent); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is removing" - + " the vote options content: " - + e.getMessage(),e); - } - } - - - public List findVoteOptionNamesByQueId(Long voteQueContentId) throws VoteApplicationException - { - try - { - return voteOptionsContentDAO.findVoteOptionNamesByQueId(voteQueContentId); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is finding" - + " the vote options name: " - + e.getMessage(),e); - } - - } - - - public void removeVoteOptionsContentByQueId(Long voteQueContentId) throws VoteApplicationException - { - try - { - voteOptionsContentDAO.removeVoteOptionsContentByQueId(voteQueContentId); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is removing by que id" - + " the vote options content: " - + e.getMessage(),e); - } - } - - - public void deleteVoteOptionsContentByUID(Long uid) throws VoteApplicationException - { - try - { - voteOptionsContentDAO.removeVoteOptionsContentByUID(uid); - } - catch (DataAccessException e) - { - throw new VoteApplicationException("Exception occured when lams is removing by uid" - + " the vote options content: " - + e.getMessage(),e); - } - } - - public int getTotalNumberOfUsers() throws VoteApplicationException { try @@ -2174,18 +2038,4 @@ public static void setLogger(Logger logger) { VoteServicePOJO.logger = logger; } - - /** - * @return Returns the voteOptionsContentDAO. - */ - public IVoteOptionsContentDAO getVoteOptionsContentDAO() { - return voteOptionsContentDAO; - } - /** - * @param voteOptionsContentDAO The voteOptionsContentDAO to set. - */ - public void setVoteOptionsContentDAO( - IVoteOptionsContentDAO voteOptionsContentDAO) { - this.voteOptionsContentDAO = voteOptionsContentDAO; - } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServiceProxy.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServiceProxy.java (.../VoteServiceProxy.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServiceProxy.java (.../VoteServiceProxy.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,8 +30,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils; - - /** * @author Ozgur Demirtas * @@ -44,10 +42,10 @@ public class VoteServiceProxy { /** - * Return the mc domain service object. It will delegate to the Spring + * Return the voting domain service object. It will delegate to the Spring * helper method to retrieve the proper bean from Spring bean factory. * @param servletContext the servletContext for current application - * @return mcq service object. + * @return voting service object. */ public static final IVoteService getVoteService(ServletContext servletContext) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,13 +1,11 @@ - - /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -33,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -65,61 +62,39 @@ public class AuthoringUtil implements VoteAppConstants { static Logger logger = Logger.getLogger(AuthoringUtil.class.getName()); - public static void readData(HttpServletRequest request, VoteAuthoringForm mcAuthoringForm) - { - /** define the next tab as Basic tab by default*/ - request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0)); - - VoteUtils.persistRichText(request); - AuthoringUtil.populateParameters(request, mcAuthoringForm); - } - - - protected static void populateParameters(HttpServletRequest request, VoteAuthoringForm mcAuthoringForm) - { - String selectedQuestion=request.getParameter(SELECTED_QUESTION); - - if ((selectedQuestion != null) && (selectedQuestion.length() > 0)) - { - request.getSession().setAttribute(SELECTED_QUESTION,selectedQuestion); - logger.debug("updated SELECTED_QUESTION"); - } - } - - - protected static void setRadioboxes(VoteContent mcContent, VoteAuthoringForm mcAuthoringForm) + protected static void setRadioboxes(VoteContent voteContent, VoteAuthoringForm voteAuthoringForm) { - if (mcContent.isQuestionsSequenced()) + if (voteContent.isQuestionsSequenced()) { - mcAuthoringForm.setQuestionsSequenced(ON); + voteAuthoringForm.setQuestionsSequenced(ON); logger.debug("setting questionsSequenced to true"); } else { - mcAuthoringForm.setQuestionsSequenced(OFF); + voteAuthoringForm.setQuestionsSequenced(OFF); logger.debug("setting questionsSequenced to false"); } - if (mcContent.isRetries()) + if (voteContent.isRetries()) { - mcAuthoringForm.setRetries(ON); + voteAuthoringForm.setRetries(ON); logger.debug("setting retries to true"); } else { - mcAuthoringForm.setRetries(OFF); + voteAuthoringForm.setRetries(OFF); logger.debug("setting retries to false"); } - if (mcContent.isShowReport()) + if (voteContent.isShowReport()) { - mcAuthoringForm.setSln(ON); + voteAuthoringForm.setSln(ON); logger.debug("setting sln to true"); } else { - mcAuthoringForm.setSln(OFF); + voteAuthoringForm.setSln(OFF); logger.debug("setting sln to false"); } } @@ -285,151 +260,6 @@ } - - public static VoteContent createContent(HttpServletRequest request, VoteAuthoringForm mcAuthoringForm) - { - logger.debug("doing createContent..."); - IVoteService mcService =VoteUtils.getToolService(request); - - /* the tool content id is passed from the container to the tool and placed into session in the VoteStarterAction */ - Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID); - if ((toolContentId != null) && (toolContentId.longValue() != 0)) - { - logger.debug("passed TOOL_CONTENT_ID : " + toolContentId); - /*delete the existing content in the database before applying new content*/ - mcService.deleteVoteById(toolContentId); - logger.debug("post-deletion existing content"); - } - - String title; - String instructions; - Long createdBy; - String monitoringReportTitle=""; - String reportTitle=""; - - String offlineInstructions=""; - String onlineInstructions=""; - String endLearningMessage=""; - Date creationDate=null; - int passmark=0; - - boolean isQuestionsSequenced=false; - boolean isSynchInMonitor=false; - boolean isUsernameVisible=false; - boolean isRunOffline=false; - boolean isDefineLater=false; - boolean isContentInUse=false; - boolean isRetries=false; - boolean isShowFeedback=false; - boolean isSln=false; - - logger.debug("isQuestionsSequenced: " + mcAuthoringForm.getQuestionsSequenced()); - if (mcAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON)) - isQuestionsSequenced=true; - - logger.debug("isSynchInMonitor: " + mcAuthoringForm.getSynchInMonitor()); - if (mcAuthoringForm.getSynchInMonitor().equalsIgnoreCase(ON)) - isSynchInMonitor=true; - - logger.debug("isUsernameVisible: " + mcAuthoringForm.getUsernameVisible()); - if (mcAuthoringForm.getUsernameVisible().equalsIgnoreCase(ON)) - isUsernameVisible=true; - - logger.debug("isRetries: " + mcAuthoringForm.getRetries()); - if (mcAuthoringForm.getRetries().equalsIgnoreCase(ON)) - isRetries=true; - - logger.debug("isSln" + mcAuthoringForm.getSln()); - if (mcAuthoringForm.getSln().equalsIgnoreCase(ON)) - isSln=true; - - logger.debug("passmark: " + mcAuthoringForm.getPassmark()); - if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0)) - passmark= new Integer(mcAuthoringForm.getPassmark()).intValue(); - - logger.debug("isShowFeedback: " + mcAuthoringForm.getShowFeedback()); - if (mcAuthoringForm.getShowFeedback().equalsIgnoreCase(ON)) - isShowFeedback=true; - - - String richTextTitle=""; - richTextTitle = (String)request.getSession().getAttribute(RICHTEXT_TITLE); - logger.debug("createContent richTextTitle from session: " + richTextTitle); - if (richTextTitle == null) richTextTitle=""; - - String richTextInstructions=""; - richTextInstructions = (String)request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS); - logger.debug("createContent richTextInstructions from session: " + richTextInstructions); - if (richTextInstructions == null) richTextInstructions=""; - - String richTextOfflineInstructions=""; - richTextOfflineInstructions = (String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS); - logger.debug("createContent richTextOfflineInstructions from session: " + richTextOfflineInstructions); - if (richTextOfflineInstructions == null) richTextOfflineInstructions=""; - - String richTextOnlineInstructions=""; - richTextOnlineInstructions = (String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS); - logger.debug("createContent richTextOnlineInstructions from session: " + richTextOnlineInstructions); - if (richTextOnlineInstructions == null) richTextOnlineInstructions=""; - - - String richTextReportTitle=(String)request.getSession().getAttribute(RICHTEXT_REPORT_TITLE); - logger.debug("richTextReportTitle: " + richTextReportTitle); - - String richTextEndLearningMessage=(String)request.getSession().getAttribute(RICHTEXT_END_LEARNING_MSG); - logger.debug("richTextEndLearningMessage: " + richTextEndLearningMessage); - - creationDate=(Date)request.getSession().getAttribute(CREATION_DATE); - if (creationDate == null) - creationDate=new Date(System.currentTimeMillis()); - - logger.debug("using creationDate: " + creationDate); - - /*obtain user object from the session*/ - HttpSession ss = SessionManager.getSession(); - /* get back login user DTO */ - UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); - logger.debug("retrieving toolUser: " + toolUser); - logger.debug("retrieving toolUser userId: " + toolUser.getUserID()); - String fullName= toolUser.getFirstName() + " " + toolUser.getLastName(); - logger.debug("retrieving toolUser fullname: " + fullName); - long userId=toolUser.getUserID().longValue(); - logger.debug("userId: " + userId); - - /* create a new qa content and leave the default content intact*/ - VoteContent mc = new VoteContent(); - mc.setVoteContentId(toolContentId); - mc.setTitle(richTextTitle); - mc.setInstructions(richTextInstructions); - mc.setCreationDate(creationDate); /*preserve this from the db*/ - mc.setUpdateDate(new Date(System.currentTimeMillis())); /* keep updating this one*/ - mc.setCreatedBy(userId); /* make sure we are setting the userId from the User object above*/ - mc.setUsernameVisible(isUsernameVisible); - mc.setQuestionsSequenced(isQuestionsSequenced); /* the default question listing in learner mode will be all in the same page*/ - mc.setOnlineInstructions(richTextOnlineInstructions); - mc.setOfflineInstructions(richTextOfflineInstructions); - mc.setRunOffline(false); - mc.setDefineLater(false); - mc.setContentInUse(isContentInUse); - mc.setEndLearningMessage("Thanks"); - mc.setRunOffline(isRunOffline); - mc.setReportTitle(richTextReportTitle); - mc.setMonitoringReportTitle(monitoringReportTitle); - mc.setEndLearningMessage(richTextEndLearningMessage); - mc.setRetries(isRetries); - mc.setShowReport(isSln); - mc.setVoteQueContents(new TreeSet()); - mc.setVoteSessions(new TreeSet()); - logger.debug("mc content :" + mc); - - /*create the content in the db*/ - mcService.createVote(mc); - logger.debug("mc created with content id: " + toolContentId); - - return mc; - } - - public static Map mergeMaps(Map map1, Map map2) { Map mapMergedMap= new TreeMap(new VoteComparator()); @@ -510,7 +340,7 @@ } - public static VoteAttachmentDTO uploadFile(HttpServletRequest request, VoteAuthoringForm mcAuthoringForm, boolean isOfflineFile) throws RepositoryCheckedException + public static VoteAttachmentDTO uploadFile(HttpServletRequest request, VoteAuthoringForm voteAuthoringForm, boolean isOfflineFile) throws RepositoryCheckedException { logger.debug("doing uploadFile..."); logger.debug("isOfflineFile:" + isOfflineFile); @@ -522,7 +352,7 @@ if (isOfflineFile) { - FormFile theOfflineFile = mcAuthoringForm.getTheOfflineFile(); + FormFile theOfflineFile = voteAuthoringForm.getTheOfflineFile(); logger.debug("retrieved theOfflineFile: " + theOfflineFile); try @@ -563,7 +393,7 @@ } else { - FormFile theOnlineFile = mcAuthoringForm.getTheOnlineFile(); + FormFile theOnlineFile = voteAuthoringForm.getTheOnlineFile(); logger.debug("retrieved theOnlineFile: " + theOnlineFile); try @@ -604,7 +434,7 @@ } } - IVoteService mcService =VoteUtils.getToolService(request); + IVoteService voteService =VoteUtils.getToolService(request); logger.debug("calling uploadFile with:"); logger.debug("istream:" + stream); logger.debug("filename:" + fileName); @@ -613,7 +443,7 @@ NodeKey nodeKey=null; try{ - nodeKey=mcService.uploadFile(stream, fileName, mimeType, fileProperty); + nodeKey=voteService.uploadFile(stream, fileName, mimeType, fileProperty); logger.debug("nodeKey:" + nodeKey); logger.debug("nodeKey uuid:" + nodeKey.getUuid()); } @@ -624,13 +454,13 @@ return null; } - VoteAttachmentDTO mcAttachmentDTO= new VoteAttachmentDTO(); - mcAttachmentDTO.setUid(null); - mcAttachmentDTO.setUuid(nodeKey.getUuid().toString()); - mcAttachmentDTO.setFilename(fileName); - mcAttachmentDTO.setOfflineFile(isOfflineFile); + VoteAttachmentDTO voteAttachmentDTO= new VoteAttachmentDTO(); + voteAttachmentDTO.setUid(null); + voteAttachmentDTO.setUuid(nodeKey.getUuid().toString()); + voteAttachmentDTO.setFilename(fileName); + voteAttachmentDTO.setOfflineFile(isOfflineFile); - return mcAttachmentDTO; + return voteAttachmentDTO; } @@ -641,20 +471,20 @@ Iterator itList = listOfflineFilesMetaData.iterator(); while (itList.hasNext()) { - VoteUploadedFile mcUploadedFile=(VoteUploadedFile)itList.next(); - logger.debug("mcUploadedFile:" + mcUploadedFile); - logger.debug("mcUploadedFile details, uid" + mcUploadedFile.getUid().toString()); - logger.debug("mcUploadedFile details, uuid" + mcUploadedFile.getUuid()); - logger.debug("mcUploadedFile details, filename" + mcUploadedFile.getFilename()); - logger.debug("mcUploadedFile details, isOfflineFile" + !mcUploadedFile.isFileOnline()); + VoteUploadedFile voteUploadedFile=(VoteUploadedFile)itList.next(); + logger.debug("voteUploadedFile:" + voteUploadedFile); + logger.debug("voteUploadedFile details, uid" + voteUploadedFile.getUid().toString()); + logger.debug("voteUploadedFile details, uuid" + voteUploadedFile.getUuid()); + logger.debug("voteUploadedFile details, filename" + voteUploadedFile.getFilename()); + logger.debug("voteUploadedFile details, isOfflineFile" + !voteUploadedFile.isFileOnline()); - VoteAttachmentDTO mcAttachmentDTO= new VoteAttachmentDTO(); - mcAttachmentDTO.setUid(mcUploadedFile.getUid().toString()); - mcAttachmentDTO.setUuid(mcUploadedFile.getUuid()); - mcAttachmentDTO.setFilename(mcUploadedFile.getFilename()); - mcAttachmentDTO.setOfflineFile(!mcUploadedFile.isFileOnline()); + VoteAttachmentDTO voteAttachmentDTO= new VoteAttachmentDTO(); + voteAttachmentDTO.setUid(voteUploadedFile.getUid().toString()); + voteAttachmentDTO.setUuid(voteUploadedFile.getUuid()); + voteAttachmentDTO.setFilename(voteUploadedFile.getFilename()); + voteAttachmentDTO.setOfflineFile(!voteUploadedFile.isFileOnline()); - listAttachments.add(mcAttachmentDTO); + listAttachments.add(voteAttachmentDTO); logger.debug("listAttachments after add" + listAttachments); } logger.debug("final listAttachments after populating all: " + listAttachments); @@ -669,9 +499,9 @@ Iterator itList = listFilesMetaData.iterator(); while (itList.hasNext()) { - VoteAttachmentDTO mcAttachmentDTO=(VoteAttachmentDTO)itList.next(); - logger.debug("current filename" + mcAttachmentDTO.getFilename()); - listFilenames.add(mcAttachmentDTO.getFilename()); + VoteAttachmentDTO voteAttachmentDTO=(VoteAttachmentDTO)itList.next(); + logger.debug("current filename" + voteAttachmentDTO.getFilename()); + listFilenames.add(voteAttachmentDTO.getFilename()); logger.debug("listFilenames after add" + listFilenames); } logger.debug("final listFilenames after populating all: " + listFilenames); @@ -773,9 +603,9 @@ } - public static void persistFilesMetaData(HttpServletRequest request, boolean isOfflineFile, VoteContent mcContent) + public static void persistFilesMetaData(HttpServletRequest request, boolean isOfflineFile, VoteContent voteContent) { - IVoteService mcService =VoteUtils.getToolService(request); + IVoteService voteService =VoteUtils.getToolService(request); List listFilesMetaData=null; logger.debug("doing persistFilesMetaData..."); @@ -794,21 +624,21 @@ Iterator itListFilesMetaData = listFilesMetaData.iterator(); while (itListFilesMetaData.hasNext()) { - VoteAttachmentDTO mcAttachmentDTO=(VoteAttachmentDTO)itListFilesMetaData.next(); - logger.debug("mcAttachmentDTO:" + mcAttachmentDTO); - String uid=mcAttachmentDTO.getUid(); + VoteAttachmentDTO voteAttachmentDTO=(VoteAttachmentDTO)itListFilesMetaData.next(); + logger.debug("voteAttachmentDTO:" + voteAttachmentDTO); + String uid=voteAttachmentDTO.getUid(); logger.debug("uid:" + uid); - String uuid=mcAttachmentDTO.getUuid(); - boolean isOnlineFile=!mcAttachmentDTO.isOfflineFile(); - String fileName=mcAttachmentDTO.getFilename(); + String uuid=voteAttachmentDTO.getUuid(); + boolean isOnlineFile=!voteAttachmentDTO.isOfflineFile(); + String fileName=voteAttachmentDTO.getFilename(); if (uid == null) { logger.debug("persisting files metadata..."); - if (!mcService.isUuidPersisted(uuid)) + if (!voteService.isUuidPersisted(uuid)) { - mcService.persistFile(uuid, isOnlineFile, fileName, mcContent); + voteService.persistFile(uuid, isOnlineFile, fileName, voteContent); } } } @@ -828,8 +658,8 @@ while (itList.hasNext()) { - VoteAttachmentDTO mcAttachmentDTO=(VoteAttachmentDTO)itList.next(); - String filename=mcAttachmentDTO.getFilename(); + VoteAttachmentDTO voteAttachmentDTO=(VoteAttachmentDTO)itList.next(); + String filename=voteAttachmentDTO.getFilename(); logger.debug("extracted filename: " + filename); listFilenames.add(filename); } @@ -838,11 +668,11 @@ } - public static void removeRedundantOfflineFileItems(HttpServletRequest request, VoteContent mcContent) + public static void removeRedundantOfflineFileItems(HttpServletRequest request, VoteContent voteContent) { - IVoteService mcService =VoteUtils.getToolService(request); + IVoteService voteService =VoteUtils.getToolService(request); - List allOfflineFilenames=mcService.retrieveVoteUploadedOfflineFilesName(mcContent.getUid()); + List allOfflineFilenames=voteService.retrieveVoteUploadedOfflineFilesName(voteContent.getUid()); logger.debug("allOfflineFilenames:" + allOfflineFilenames); List listOfflineFilesMetaData =(List)request.getSession().getAttribute(LIST_OFFLINEFILES_METADATA); @@ -878,18 +708,18 @@ if (matchFound == false) { logger.debug("matchFound is false for filename: " + filename); - mcService.removeOffLineFile(filename, mcContent.getUid()); + voteService.removeOffLineFile(filename, voteContent.getUid()); logger.debug("filename removed: " + filename); } } } - public static void removeRedundantOnlineFileItems(HttpServletRequest request, VoteContent mcContent) + public static void removeRedundantOnlineFileItems(HttpServletRequest request, VoteContent voteContent) { - IVoteService mcService =VoteUtils.getToolService(request); + IVoteService voteService =VoteUtils.getToolService(request); - List allOnlineFilenames=mcService.retrieveVoteUploadedOnlineFilesName(mcContent.getUid()); + List allOnlineFilenames=voteService.retrieveVoteUploadedOnlineFilesName(voteContent.getUid()); logger.debug("allOnlineFilenames:" + allOnlineFilenames); List listOnlineFilesMetaData =(List)request.getSession().getAttribute(LIST_ONLINEFILES_METADATA); @@ -926,7 +756,7 @@ if (matchFound == false) { logger.debug("matchFound is false for filename: " + filename); - mcService.removeOnLineFile(filename, mcContent.getUid()); + voteService.removeOnLineFile(filename, voteContent.getUid()); logger.debug("filename removed: " + filename); } } @@ -938,15 +768,15 @@ */ public void simulatePropertyInspector_RunOffline(HttpServletRequest request) { - IVoteService mcService =VoteUtils.getToolService(request); + IVoteService voteService =VoteUtils.getToolService(request); String toolContentId=(String)request.getSession().getAttribute(TOOL_CONTENT_ID); if ((toolContentId != null) && (!toolContentId.equals(""))) { logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentId)); try { - mcService.setAsRunOffline(new Long(toolContentId)); + voteService.setAsRunOffline(new Long(toolContentId)); } catch(ToolException e) { @@ -965,15 +795,15 @@ */ public void simulatePropertyInspector_setAsDefineLater(HttpServletRequest request) { - IVoteService mcService =VoteUtils.getToolService(request); + IVoteService voteService =VoteUtils.getToolService(request); String toolContentId=(String)request.getSession().getAttribute(TOOL_CONTENT_ID); if ((toolContentId != null) && (!toolContentId.equals(""))) { logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentId)); try { - mcService.setAsDefineLater(new Long(toolContentId)); + voteService.setAsDefineLater(new Long(toolContentId)); } catch(ToolException e) { @@ -1169,8 +999,7 @@ boolean isQuestionsSequenced=false; boolean isUsernameVisible=false; - String reportTitle = voteAuthoringForm.getReportTitle(); - //String richTextTitle = voteAuthoringForm.getTitle(); + //String reportTitle = voteAuthoringForm.getReportTitle(); String richTextTitle = request.getParameter("title"); String richTextInstructions = request.getParameter("instructions"); @@ -1183,22 +1012,38 @@ String monitoringReportTitle = voteAuthoringForm.getMonitoringReportTitle(); logger.debug("monitoringReportTitle: " + monitoringReportTitle); - String richTextOnlineInstructions = voteAuthoringForm.getOnlineInstructions(); - logger.debug("richTextOnlineInstructions: " + richTextOnlineInstructions); + //String richTextOnlineInstructions = voteAuthoringForm.getOnlineInstructions(); + //logger.debug("richTextOnlineInstructions: " + richTextOnlineInstructions); //String richTextInstructions = voteAuthoringForm.getInstructions(); - String richTextOfflineInstructions = voteAuthoringForm.getOfflineInstructions(); - logger.debug("richTextOfflineInstructions: " + richTextOfflineInstructions); + //String richTextOfflineInstructions = voteAuthoringForm.getOfflineInstructions(); + //logger.debug("richTextOfflineInstructions: " + richTextOfflineInstructions); - String endLearningMessage = voteAuthoringForm.getEndLearningMessage(); - logger.debug("endLearningMessage: " + endLearningMessage); + //String endLearningMessage = voteAuthoringForm.getEndLearningMessage(); + //logger.debug("endLearningMessage: " + endLearningMessage); String questionsSequenced = voteAuthoringForm.getQuestionsSequenced(); logger.debug("questionsSequenced: " + questionsSequenced); String usernameVisible = voteAuthoringForm.getUsernameVisible(); logger.debug("usernameVisible: " + usernameVisible); + String retries = voteAuthoringForm.getRetries(); + logger.debug("retries: " + retries); + + String richTextReportTitle= (String)request.getSession().getAttribute(RICHTEXT_REPORT_TITLE); + String richTextEndLearningMessage=(String)request.getSession().getAttribute(RICHTEXT_END_LEARNING_MSG); + logger.debug("richTextReportTitle: " + richTextReportTitle); + logger.debug("richTextEndLearningMessage: " + richTextEndLearningMessage); + + + String richTextOfflineInstructions=(String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS); + logger.debug("richTextOfflineInstructions: " + richTextOfflineInstructions); + String richTextOnlineInstructions=(String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS); + logger.debug("richTextOnlineInstructions: " + richTextOnlineInstructions); + + + boolean setCommonContent=true; if ((questionsSequenced == null) || (usernameVisible == null)) { @@ -1211,6 +1056,7 @@ boolean questionsSequencedBoolean=false; boolean synchInMonitorBoolean=false; + boolean retriesBoolean=false; boolean usernameVisibleBoolean=false; if (setCommonContent) { @@ -1219,6 +1065,9 @@ if (usernameVisible.equalsIgnoreCase(ON)) usernameVisibleBoolean=true; + + if (retries.equalsIgnoreCase(ON)) + retriesBoolean=true; } @@ -1278,19 +1127,16 @@ if ((!activeModule.equals(DEFINE_LATER)) && (setCommonContent)) { logger.debug("setting other content values..."); - voteContent.setUsernameVisible(isUsernameVisible); - voteContent.setQuestionsSequenced(isQuestionsSequenced); /**the default question listing in learner mode will be all in the same page*/ + voteContent.setUsernameVisible(usernameVisibleBoolean); + voteContent.setRetries(retriesBoolean); + voteContent.setQuestionsSequenced(questionsSequencedBoolean); /**the default question listing in learner mode will be all in the same page*/ voteContent.setOnlineInstructions(richTextOnlineInstructions); voteContent.setOfflineInstructions(richTextOfflineInstructions); - voteContent.setEndLearningMessage(endLearningMessage); - voteContent.setReportTitle(reportTitle); + voteContent.setEndLearningMessage(richTextEndLearningMessage); + voteContent.setReportTitle(richTextReportTitle); voteContent.setMonitoringReportTitle(monitoringReportTitle); - voteContent.setUsernameVisible(usernameVisibleBoolean); - voteContent.setQuestionsSequenced(questionsSequencedBoolean); - } - if (newContent) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,6 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ - package org.lamsfoundation.lams.tool.vote.web; import javax.servlet.http.HttpServletRequest; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import org.apache.log4j.Logger; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import java.io.IOException; @@ -37,8 +38,10 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; +import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; import org.lamsfoundation.lams.tool.vote.VoteApplicationException; +import org.lamsfoundation.lams.tool.vote.VoteAttachmentDTO; import org.lamsfoundation.lams.tool.vote.VoteComparator; import org.lamsfoundation.lams.tool.vote.VoteUtils; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; @@ -113,12 +116,11 @@ ServletException { VoteUtils.cleanUpUserExceptions(request); - VoteAuthoringForm mcAuthoringForm = (VoteAuthoringForm) form; - IVoteService mcService =VoteUtils.getToolService(request); - AuthoringUtil.readData(request, mcAuthoringForm); - mcAuthoringForm.resetUserAction(); + VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; + IVoteService voteService =VoteUtils.getToolService(request); + VoteUtils.persistRichText(request); + voteAuthoringForm.resetUserAction(); - request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); return null; } @@ -137,25 +139,8 @@ String richTextInstructions = request.getParameter("instructions"); String richTextPosting = request.getParameter("posting"); - logger.debug("richTextTitle: " + richTextTitle); - logger.debug("richTextInstructions: " + richTextInstructions); - logger.debug("richTextPosting: " + richTextPosting); + VoteUtils.persistRichText(request); - if (richTextTitle != null) - { - request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle); - } - - if (richTextInstructions != null) - { - request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, richTextInstructions); - } - - if (richTextPosting != null) - { - request.getSession().setAttribute(POSTING, richTextPosting); - } - //request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); authoringUtil.reconstructOptionContentMapForAdd(mapOptionsContent, request); @@ -173,31 +158,8 @@ logger.debug("doing removeOption "); request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); - String richTextTitle = request.getParameter("title"); - String richTextInstructions = request.getParameter("instructions"); - String richTextPosting = request.getParameter("posting"); + VoteUtils.persistRichText(request); - logger.debug("richTextTitle: " + richTextTitle); - logger.debug("richTextInstructions: " + richTextInstructions); - logger.debug("richTextPosting: " + richTextPosting); - - - if (richTextTitle != null) - { - request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle); - } - - if (richTextInstructions != null) - { - request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, richTextInstructions); - } - - if (richTextPosting != null) - { - request.getSession().setAttribute(POSTING, richTextPosting); - } - - AuthoringUtil authoringUtil= new AuthoringUtil(); VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); @@ -226,6 +188,7 @@ voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); logger.debug("voteService :" +voteService); + VoteUtils.persistRichText(request); AuthoringUtil authoringUtil= new AuthoringUtil(); Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); @@ -275,33 +238,20 @@ VoteContent voteContent=authoringUtil.saveOrUpdateVoteContent(mapOptionsContent, voteService, voteAuthoringForm, request); logger.debug("voteContent: " + voteContent); - String richTextTitle = request.getParameter("title"); - String richTextInstructions = request.getParameter("instructions"); - String richTextPosting = request.getParameter("posting"); - logger.debug("richTextTitle: " + richTextTitle); - logger.debug("richTextInstructions: " + richTextInstructions); - logger.debug("richTextPosting: " + richTextPosting); - - if (richTextTitle != null) - { - request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle); - } - if (richTextInstructions != null) - { - request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, richTextInstructions); - } + logger.debug("start persisting offline files metadata"); + AuthoringUtil.persistFilesMetaData(request, true, voteContent); + logger.debug("start persisting online files metadata"); + AuthoringUtil.persistFilesMetaData(request, false, voteContent); + + /* making sure only the filenames in the session cache are persisted and the others in the db are removed*/ + logger.debug("start removing redundant offline files metadata"); + AuthoringUtil.removeRedundantOfflineFileItems(request, voteContent); + + logger.debug("start removing redundant online files metadata"); + AuthoringUtil.removeRedundantOnlineFileItems(request, voteContent); + logger.debug("done removing redundant files"); - if (richTextPosting != null) - { - request.getSession().setAttribute(POSTING, richTextPosting); - } - - - //List attacments=saveAttachments(voteContent, attachmentList, deletedAttachmentList, mapping, request); - //logger.debug("attacments: " + attacments); - - errors.clear(); errors.add(Globals.ERROR_KEY, new ActionMessage("sbmt.successful")); request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(1)); @@ -374,7 +324,182 @@ return errors; } + + public ActionForward submitOfflineFiles(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, + RepositoryCheckedException + { + VoteUtils.cleanUpUserExceptions(request); + logger.debug("dispatching submitOfflineFile..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); + + VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; + IVoteService voteService =VoteUtils.getToolService(request); + /* determine whether the request is from Monitoring url Edit Activity*/ + String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER); + logger.debug("sourceVoteStarter: " + sourceVoteStarter); + String destination=VoteUtils.getDestination(sourceVoteStarter); + logger.debug("destination: " + destination); + + VoteUtils.persistRichText(request); + + logger.debug("will uploadFile for offline file:"); + VoteAttachmentDTO voteAttachmentDTO=AuthoringUtil.uploadFile(request, voteAuthoringForm, true); + logger.debug("returned voteAttachmentDTO:" + voteAttachmentDTO); + + if (voteAttachmentDTO == null) + { + ActionMessages errors= new ActionMessages(); + errors= new ActionMessages(); + request.getSession().setAttribute(USER_EXCEPTION_FILENAME_EMPTY, new Boolean(true).toString()); + errors.add(Globals.ERROR_KEY,new ActionMessage("error.fileName.empty")); + saveErrors(request,errors); + voteAuthoringForm.resetUserAction(); + persistError(request,"error.fileName.empty"); + + return (mapping.findForward(destination)); + } + + + List listOfflineFilesMetaData =(List)request.getSession().getAttribute(LIST_OFFLINEFILES_METADATA); + logger.debug("listOfflineFilesMetaData:" + listOfflineFilesMetaData); + listOfflineFilesMetaData.add(voteAttachmentDTO); + logger.debug("listOfflineFilesMetaData after add:" + listOfflineFilesMetaData); + request.getSession().setAttribute(LIST_OFFLINEFILES_METADATA, listOfflineFilesMetaData); + + voteAuthoringForm.resetUserAction(); + return (mapping.findForward(destination)); + } + + + public ActionForward submitOnlineFiles(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, + RepositoryCheckedException + { + VoteUtils.cleanUpUserExceptions(request); + logger.debug("dispatching submitOnlineFiles..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); + + VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; + IVoteService voteService =VoteUtils.getToolService(request); + + /* determine whether the request is from Monitoring url Edit Activity*/ + String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER); + logger.debug("sourceVoteStarter: " + sourceVoteStarter); + String destination=VoteUtils.getDestination(sourceVoteStarter); + logger.debug("destination: " + destination); + + VoteUtils.persistRichText(request); + + logger.debug("will uploadFile for online file:"); + VoteAttachmentDTO voteAttachmentDTO=AuthoringUtil.uploadFile(request, voteAuthoringForm, false); + logger.debug("returned voteAttachmentDTO:" + voteAttachmentDTO); + + if (voteAttachmentDTO == null) + { + ActionMessages errors= new ActionMessages(); + errors= new ActionMessages(); + request.getSession().setAttribute(USER_EXCEPTION_FILENAME_EMPTY, new Boolean(true).toString()); + errors.add(Globals.ERROR_KEY,new ActionMessage("error.fileName.empty")); + saveErrors(request,errors); + voteAuthoringForm.resetUserAction(); + persistError(request,"error.fileName.empty"); + + return (mapping.findForward(destination)); + } + + List listOnlineFilesMetaData =(List)request.getSession().getAttribute(LIST_ONLINEFILES_METADATA); + logger.debug("listOnlineFilesMetaData:" + listOnlineFilesMetaData); + listOnlineFilesMetaData.add(voteAttachmentDTO); + logger.debug("listOnlineFilesMetaData after add:" + listOnlineFilesMetaData); + request.getSession().setAttribute(LIST_ONLINEFILES_METADATA, listOnlineFilesMetaData); + + voteAuthoringForm.resetUserAction(); + return (mapping.findForward(destination)); + } + + + public ActionForward deleteOfflineFile(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + + { + VoteUtils.cleanUpUserExceptions(request); + logger.debug("dispatching deleteOfflineFile..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); + + VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; + IVoteService voteService =VoteUtils.getToolService(request); + + /* determine whether the request is from Monitoring url Edit Activity*/ + String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER); + logger.debug("sourceVoteStarter: " + sourceVoteStarter); + String destination=VoteUtils.getDestination(sourceVoteStarter); + logger.debug("destination: " + destination); + + VoteUtils.persistRichText(request); + + String uuid =voteAuthoringForm.getUuid(); + logger.debug("uuid:" + uuid); + + List listOfflineFilesMetaData =(List)request.getSession().getAttribute(LIST_OFFLINEFILES_METADATA); + logger.debug("listOfflineFilesMetaData:" + listOfflineFilesMetaData); + listOfflineFilesMetaData=AuthoringUtil.removeFileItem(listOfflineFilesMetaData, uuid); + logger.debug("listOfflineFilesMetaData after remove:" + listOfflineFilesMetaData); + request.getSession().setAttribute(LIST_OFFLINEFILES_METADATA, listOfflineFilesMetaData); + + voteAuthoringForm.resetUserAction(); + + return (mapping.findForward(destination)); + } + + + public ActionForward deleteOnlineFile(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + + { + VoteUtils.cleanUpUserExceptions(request); + logger.debug("dispatching deleteOnlineFile..."); + request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); + + VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; + IVoteService voteService =VoteUtils.getToolService(request); + + /* determine whether the request is from Monitoring url Edit Activity*/ + String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER); + logger.debug("sourceVoteStarter: " + sourceVoteStarter); + String destination=VoteUtils.getDestination(sourceVoteStarter); + logger.debug("destination: " + destination); + + VoteUtils.persistRichText(request); + + String uuid =voteAuthoringForm.getUuid(); + logger.debug("uuid:" + uuid); + + List listOnlineFilesMetaData =(List)request.getSession().getAttribute(LIST_ONLINEFILES_METADATA); + logger.debug("listOnlineFilesMetaData:" + listOnlineFilesMetaData); + listOnlineFilesMetaData=AuthoringUtil.removeFileItem(listOnlineFilesMetaData, uuid); + logger.debug("listOnlineFilesMetaData after remove:" + listOnlineFilesMetaData); + request.getSession().setAttribute(LIST_ONLINEFILES_METADATA, listOnlineFilesMetaData); + + voteAuthoringForm.resetUserAction(); + + return (mapping.findForward(destination)); + } + + /** * persists error messages to request scope Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java =================================================================== diff -u -r4355528fd4c5808b9b4d0eba2cbe68238560214e -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 4355528fd4c5808b9b4d0eba2cbe68238560214e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import org.apache.struts.upload.FormFile; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java (.../VoteDLStarterAction.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java (.../VoteDLStarterAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportAction.java =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportAction.java (.../VoteExportAction.java) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportAction.java (.../VoteExportAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import javax.servlet.http.HttpServletRequest; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportForm.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportForm.java (.../VoteExportForm.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportForm.java (.../VoteExportForm.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import org.apache.log4j.Logger; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportServlet.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportServlet.java (.../VoteExportServlet.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportServlet.java (.../VoteExportServlet.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import java.io.IOException; @@ -102,7 +103,7 @@ VoteUtils.cleanUpUserExceptions(request); VoteAuthoringForm mcAuthoringForm = (VoteAuthoringForm) form; IVoteService mcService =VoteUtils.getToolService(request); - AuthoringUtil.readData(request, mcAuthoringForm); + VoteUtils.persistRichText(request); mcAuthoringForm.resetUserAction(); return null; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import org.apache.struts.action.ActionForm; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -85,14 +85,11 @@ /** * - * Note: Because of MCQ's learning reporting structure, Show Learner Report is always ON even if in authoring it is set to false. + * Note: Because of Voting learning reporting structure, Show Learner Report is always ON even if in authoring it is set to false. */ public class VoteLearningStarterAction extends Action implements VoteAppConstants { static Logger logger = Logger.getLogger(VoteLearningStarterAction.class.getName()); - /* Since the toolSessionId is passed, we will derive toolContentId from the toolSessionId - * This class is used to load the default content and initialize the presentation Map for Learner mode - */ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, VoteApplicationException { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import java.io.IOException; @@ -97,7 +98,7 @@ VoteUtils.cleanUpUserExceptions(request); logger.debug("dispatching unspecified..."); request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); - VoteMonitoringForm mcMonitoringForm = (VoteMonitoringForm) form; + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; return null; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,7 @@ * * http://www.gnu.org/licenses/gpl.txt * ***********************************************************************/ + package org.lamsfoundation.lams.tool.vote.web; import java.io.IOException; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java (.../VoteStarterAction.java) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java (.../VoteStarterAction.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,11 +1,11 @@ /*************************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * * 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. + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of Fisheye: Tag 6cfdabe63a1d792f3135529031f9a969768a6b10 refers to a dead (removed) revision in file `lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/McDataAccessTestCase.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteDataAccessTestCase.java =================================================================== diff -u --- lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteDataAccessTestCase.java (revision 0) +++ lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteDataAccessTestCase.java (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -0,0 +1,81 @@ +/*************************************************************************** + * 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.vote; + +import org.lamsfoundation.lams.test.AbstractLamsTestCase; + +/** + * @author Ozgur Demirtas + */ +public class VoteDataAccessTestCase extends AbstractLamsTestCase +{ + //These both refer to the same entry in the db. + protected final Long DEFAULT_CONTENT_ID = new Long(10); + protected final Long TEST_CONTENT_ID = new Long(2); + protected final Long TEST_CONTENT_ID_OTHER = new Long(3); + + protected final Long TEST_SESSION_ID = new Long(20); + protected final Long TEST_SESSION_ID_OTHER = new Long(21); + + protected final Long TEST_QUE_ID1 = new Long(1); + protected final Long TEST_QUE_OPTION_ID1 = new Long(1); + protected final Long TEST_QUE_OPTION_ID2 = new Long(2); + protected final Long TEST_QUE_OPTION_ID3 = new Long(3); + + protected final Long TEST_NEW_USER_ID = new Long(100); + protected final Long TEST_MY_USER_ID = new Long(77); + + protected final long ONE_DAY = 60 * 60 * 1000 * 24; + + public final String NOT_ATTEMPTED = "NOT_ATTEMPTED"; + public final String INCOMPLETE = "INCOMPLETE"; + public static String COMPLETED = "COMPLETED"; + + + public VoteDataAccessTestCase(String name) + { + super(name); + } + + protected void setUp() throws Exception + { + super.setUp(); + } + + protected String[] getContextConfigLocation() + { + return new String[] {"/org/lamsfoundation/lams/tool/vote/testvoteApplicationContext.xml" }; + } + + protected String getHibernateSessionFactoryName() + { + return "mcSessionFactory"; + } + + protected void tearDown() throws Exception + { + super.tearDown(); + } + +} + Fisheye: Tag 6cfdabe63a1d792f3135529031f9a969768a6b10 refers to a dead (removed) revision in file `lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteOptsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/BaseContent.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/BaseContent.jsp (.../BaseContent.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/BaseContent.jsp (.../BaseContent.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/Footer.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/Footer.jsp (.../Footer.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/Footer.jsp (.../Footer.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/Header.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/Header.jsp (.../Header.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/Header.jsp (.../Header.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/SystemErrorContent.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/SystemErrorContent.jsp (.../SystemErrorContent.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/SystemErrorContent.jsp (.../SystemErrorContent.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,23 +1,24 @@ - + http://www.gnu.org/licenses/gpl.txt +--%> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> Index: lams_tool_vote/web/Template.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/Template.jsp (.../Template.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/Template.jsp (.../Template.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/VoteErrorBox.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/VoteErrorBox.jsp (.../VoteErrorBox.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/VoteErrorBox.jsp (.../VoteErrorBox.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/authoring/AdvancedContent.jsp =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,22 +1,22 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + http://www.gnu.org/licenses/gpl.txt --%> <%@ taglib uri="tags-bean" prefix="bean"%> @@ -31,46 +31,45 @@ - - - +
- - : - + + : + - - - - - - - - + + + + + + + +
- - : - + + + : + - - - - - - - - - + + + + + + + + +
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -r4355528fd4c5808b9b4d0eba2cbe68238560214e -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 4355528fd4c5808b9b4d0eba2cbe68238560214e) +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/authoring/Basic.jsp =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/authoring/Basic.jsp (.../Basic.jsp) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/web/authoring/Basic.jsp (.../Basic.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/authoring/BasicContent.jsp =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision b9472d342c6b0edd1c3e0df5ff2b7179051bb389) +++ lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/authoring/InstructionsContent.jsp =================================================================== diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d) +++ lams_tool_vote/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> @@ -33,7 +34,7 @@
- +
Index: lams_tool_vote/web/exportPortfolio.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/index.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/index.jsp (.../index.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/index.jsp (.../index.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,22 +1,22 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + http://www.gnu.org/licenses/gpl.txt --%> <%@ taglib uri="tags-bean" prefix="bean"%> Index: lams_tool_vote/web/learningIndex.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/learningIndex.jsp (.../learningIndex.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/learningIndex.jsp (.../learningIndex.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %> Index: lams_tool_vote/web/monitoringIndex.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r6cfdabe63a1d792f3135529031f9a969768a6b10 --- lams_tool_vote/web/monitoringIndex.jsp (.../monitoringIndex.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/monitoringIndex.jsp (.../monitoringIndex.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) @@ -1,24 +1,25 @@ -<%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -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 free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. -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. + 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 + 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 + 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" %>