Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java =================================================================== diff -u -r046d789cf4472c7f0a8b38702ebef2e243efb157 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java (.../QaCondition.java) (revision 046d789cf4472c7f0a8b38702ebef2e243efb157) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java (.../QaCondition.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -27,7 +27,6 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.BranchCondition; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.TextSearchCondition; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java =================================================================== diff -u -rcd0b7b82232971e95d54348b03049beb1dfe0ecb -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java (.../QaContent.java) (revision cd0b7b82232971e95d54348b03049beb1dfe0ecb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java (.../QaContent.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -33,7 +33,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; @@ -55,7 +54,6 @@ * to the tool by the database. */ public class QaContent implements Serializable { - static Logger logger = Logger.getLogger(QaContent.class.getName()); /** identifier field */ private Long uid; @@ -173,7 +171,6 @@ this.qaUploadedFiles = qaUploadedFiles; this.conditions = conditions; this.allowRichEditor = allowRichEditor; - QaContent.logger.debug(QaContent.logger + " " + this.getClass().getName() + "in full constructor: QaContent()"); } /** @@ -595,21 +592,6 @@ } /** - * @return Returns the logger. - */ - public static Logger getLogger() { - return QaContent.logger; - } - - /** - * @param logger - * The logger to set. - */ - public static void setLogger(Logger logger) { - QaContent.logger = logger; - } - - /** * @return Returns the creationDate. */ public Date getCreationDate() { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java =================================================================== diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java (.../QaQueUsr.java) (revision 91f0740e75daa643981b757e49d1ed2ed7f0a528) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java (.../QaQueUsr.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -30,7 +30,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.log4j.Logger; /** * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java =================================================================== diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java (.../QaSession.java) (revision 91f0740e75daa643981b757e49d1ed2ed7f0a528) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java (.../QaSession.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -32,7 +32,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.log4j.Logger; /** * @@ -45,7 +44,6 @@ * Holds tool sessions */ public class QaSession implements Serializable, Comparable, Nullable { - static Logger logger = Logger.getLogger(QaSession.class.getName()); public final static String INCOMPLETE = "INCOMPLETE"; @@ -96,7 +94,6 @@ this.session_name = session_name; this.qaContent = qaContent; this.qaQueUsers = qaQueUsers; - logger.debug(logger + " " + this.getClass().getName() + "in full constructor: QaSession()"); } public Long getQaSessionId() { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java =================================================================== diff -u -r046d789cf4472c7f0a8b38702ebef2e243efb157 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java (.../QaUploadedFile.java) (revision 046d789cf4472c7f0a8b38702ebef2e243efb157) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java (.../QaUploadedFile.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -29,7 +29,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; @@ -38,11 +37,6 @@ * * @author Ozgur Demirtas * - * TODO To change the template for this generated type comment go to Window - - * Preferences - Java - Code Style - Code Templates - */ - -/** * QaQueContent Value Object The value object that maps to our model database * table: tl_laqa11_que_content The relevant hibernate mapping resides in: * QaQueContent.hbm.xml Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java (.../IQaQuestionDAO.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java (.../IQaQuestionDAO.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -25,7 +25,6 @@ import java.util.List; -import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== diff -u -r9be291d1878efbbb000f693ab38d1ee6407dfffb -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 9be291d1878efbbb000f693ab38d1ee6407dfffb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -26,7 +26,6 @@ import java.util.List; import java.util.Set; -import org.apache.log4j.Logger; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.Session; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -26,9 +26,7 @@ import java.util.List; -import org.apache.log4j.Logger; import org.hibernate.FlushMode; -import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO; import org.springframework.orm.hibernate3.HibernateTemplate; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java =================================================================== diff -u -r2a3012f2276337d5f3b2e7eb2a30acc2d4af4176 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java (.../ResponseRatingDAO.java) (revision 2a3012f2276337d5f3b2e7eb2a30acc2d4af4176) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java (.../ResponseRatingDAO.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -23,14 +23,12 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.qa.dao.hibernate; -import java.io.Serializable; import java.text.NumberFormat; import java.util.List; import java.util.Locale; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.qa.ResponseRating; -import org.lamsfoundation.lams.tool.qa.dao.IQaConfigItemDAO; import org.lamsfoundation.lams.tool.qa.dao.IResponseRatingDAO; import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/AverageRatingDTO.java =================================================================== diff -u -r2a3012f2276337d5f3b2e7eb2a30acc2d4af4176 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/AverageRatingDTO.java (.../AverageRatingDTO.java) (revision 2a3012f2276337d5f3b2e7eb2a30acc2d4af4176) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/AverageRatingDTO.java (.../AverageRatingDTO.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -23,7 +23,6 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.qa.dto; -import java.util.List; public class AverageRatingDTO { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -36,8 +36,8 @@ import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUploadedFile; import org.lamsfoundation.lams.tool.qa.QaUsrResp; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java (.../QaOutputFactory.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java (.../QaOutputFactory.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -41,8 +41,8 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -71,8 +71,8 @@ import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUploadedFile; import org.lamsfoundation.lams.tool.qa.QaUsrResp; @@ -523,42 +523,34 @@ public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { - QaServicePOJO.logger.debug("start of copyToolContent with ids: " + fromContentId + " and " + toContentId); long defaultContentId = 0; if (fromContentId == null) { - QaServicePOJO.logger.debug("fromContentId is null."); - QaServicePOJO.logger.debug("attempt retrieving tool's default content id with signatute : " - + QaAppConstants.MY_SIGNATURE); try { defaultContentId = getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); fromContentId = new Long(defaultContentId); } catch (Exception e) { - QaServicePOJO.logger.debug("default content id has not been setup for signature: " + QaServicePOJO.logger.error("default content id has not been setup for signature: " + QaAppConstants.MY_SIGNATURE); throw new ToolException("WARNING! default content has not been setup for signature" + QaAppConstants.MY_SIGNATURE + " Can't continue!"); } } if (toContentId == null) { - QaServicePOJO.logger.debug("throwing ToolException: toContentId is null"); + QaServicePOJO.logger.error("throwing ToolException: toContentId is null"); throw new ToolException("toContentId is missing"); } - QaServicePOJO.logger.debug("final - copyToolContent using ids: " + fromContentId + " and " + toContentId); try { QaContent fromContent = qaDAO.getQaByContentId(fromContentId.longValue()); if (fromContent == null) { - QaServicePOJO.logger.debug("fromContent is null."); - QaServicePOJO.logger.debug("attempt retrieving tool's default content id with signatute : " - + QaAppConstants.MY_SIGNATURE); try { defaultContentId = getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); fromContentId = new Long(defaultContentId); } catch (Exception e) { - QaServicePOJO.logger.debug("default content id has not been setup for signature: " + QaServicePOJO.logger.error("default content id has not been setup for signature: " + QaAppConstants.MY_SIGNATURE); throw new ToolException("WARNING! default content has not been setup for signature" + QaAppConstants.MY_SIGNATURE + " Can't continue!"); @@ -572,15 +564,14 @@ } QaContent toContent = QaContent.newInstance(qaToolContentHandler, fromContent, toContentId); if (toContent == null) { - QaServicePOJO.logger.debug("throwing ToolException: WARNING!, retrieved toContent is null."); + QaServicePOJO.logger.error("throwing ToolException: WARNING!, retrieved toContent is null."); throw new ToolException("WARNING! Fail to create toContent. Can't continue!"); } else { qaDAO.saveQa(toContent); } - QaServicePOJO.logger.debug("end of copyToolContent with ids: " + fromContentId + " and " + toContentId); } catch (DataAccessException e) { QaServicePOJO.logger - .debug("throwing ToolException: Exception occured when lams is copying content between content ids."); + .error("throwing ToolException: Exception occured when lams is copying content between content ids."); throw new ToolException("Exception occured when lams is copying content between content ids."); } catch (ItemNotFoundException e) { throw new ToolException("Exception occured when lams is copying content between content ids."); @@ -598,14 +589,13 @@ * return void */ public void setAsDefineLater(Long toolContentID, boolean value) throws DataMissingException, ToolException { - QaServicePOJO.logger.debug("request for setAsDefineLater with toolContentID: " + toolContentID); if (toolContentID == null) { - QaServicePOJO.logger.debug("throwing DataMissingException: WARNING!: retrieved toolContentID is null."); + QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentID is null."); throw new DataMissingException("toolContentID is missing"); } QaContent qaContent = qaDAO.getQaByContentId(toolContentID.longValue()); if (qaContent == null) { - QaServicePOJO.logger.debug("throwing DataMissingException: WARNING!: retrieved qaContent is null."); + QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved qaContent is null."); throw new DataMissingException("qaContent is missing"); } qaContent.setDefineLater(value); @@ -620,14 +610,13 @@ * return void */ public void setAsRunOffline(Long toolContentID, boolean value) throws DataMissingException, ToolException { - QaServicePOJO.logger.debug("request for setAsRunOffline with toolContentID:" + toolContentID); if (toolContentID == null) { - QaServicePOJO.logger.debug("throwing DataMissingException: WARNING!: retrieved toolContentID is null."); + QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentID is null."); throw new DataMissingException("toolContentID is missing"); } QaContent qaContent = qaDAO.getQaByContentId(toolContentID.longValue()); if (qaContent == null) { - QaServicePOJO.logger.debug("throwing DataMissingException: WARNING!: retrieved qaContent is null."); + QaServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved qaContent is null."); throw new DataMissingException("qaContent is missing"); } qaContent.setRunOffline(value); @@ -652,7 +641,7 @@ Iterator sessionIterator = qaContent.getQaSessions().iterator(); while (sessionIterator.hasNext()) { if (removeSessionData == false) { - QaServicePOJO.logger.debug("removeSessionData is false, throwing SessionDataExistsException."); + QaServicePOJO.logger.error("removeSessionData is false, throwing SessionDataExistsException."); throw new SessionDataExistsException(); } @@ -673,7 +662,7 @@ //removed all existing responses of toolContent with toolContentID qaDAO.removeQa(toolContentID); } else { - QaServicePOJO.logger.debug("Warning!!!, We should have not come here. qaContent is null."); + QaServicePOJO.logger.error("Warning!!!, We should have not come here. qaContent is null."); throw new ToolException("toolContentID is missing"); } } @@ -822,15 +811,10 @@ * @return boolean */ protected boolean existsSession(long toolSessionId) { - QaServicePOJO.logger.debug("toolSessionId: " + toolSessionId); QaSession qaSession = getSessionById(toolSessionId); - QaServicePOJO.logger.debug("qaSession: " + qaSession); if (qaSession == null) { - QaServicePOJO.logger.debug("qaSession does not exist yet: " + toolSessionId); return false; - } else { - QaServicePOJO.logger.debug("Retrieving an existing qaSession: " + toolSessionId); } return true; } @@ -843,46 +827,35 @@ * */ public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentID) throws ToolException { - QaServicePOJO.logger.debug("start of createToolSession with ids: " + toolSessionId + " and " + toolContentID); - QaServicePOJO.logger.debug("toolSessionName: " + toolSessionName); if (toolSessionId == null) { - QaServicePOJO.logger.debug("toolSessionId is null"); + QaServicePOJO.logger.error("toolSessionId is null"); throw new ToolException("toolSessionId is missing"); } long defaultContentId = 0; if (toolContentID == null) { - QaServicePOJO.logger.debug("toolContentID is null."); - QaServicePOJO.logger.debug("attempt retrieving tool's default content id with signatute : " - + QaAppConstants.MY_SIGNATURE); try { defaultContentId = getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); toolContentID = new Long(defaultContentId); - QaServicePOJO.logger.debug("updated toolContentID to: " + toolContentID); } catch (Exception e) { - QaServicePOJO.logger.debug("default content id has not been setup for signature: " + QaServicePOJO.logger.error("default content id has not been setup for signature: " + QaAppConstants.MY_SIGNATURE); throw new ToolException("WARNING! default content has not been setup for signature" + QaAppConstants.MY_SIGNATURE + " Can't continue!"); } } - QaServicePOJO.logger.debug("final toolSessionId and toolContentID: " + toolSessionId + " " + toolContentID); QaContent qaContent = qaDAO.getQaByContentId(toolContentID.longValue()); if (qaContent == null) { - QaServicePOJO.logger.debug("qaContent is null."); - QaServicePOJO.logger.debug("attempt retrieving tool's default content id with signatute : " - + QaAppConstants.MY_SIGNATURE); try { defaultContentId = getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); toolContentID = new Long(defaultContentId); - QaServicePOJO.logger.debug("updated toolContentID to: " + toolContentID); } catch (Exception e) { - QaServicePOJO.logger.debug("default content id has not been setup for signature: " + QaServicePOJO.logger.error("default content id has not been setup for signature: " + QaAppConstants.MY_SIGNATURE); throw new ToolException("WARNING! default content has not been setup for signature" + QaAppConstants.MY_SIGNATURE + " Can't continue!"); @@ -903,16 +876,15 @@ QaSession.INCOMPLETE, toolSessionName, qaContent, new TreeSet()); qaSessionDAO.CreateQaSession(qaSession); } catch (Exception e) { - QaServicePOJO.logger.debug("Error creating new toolsession in the db"); + QaServicePOJO.logger.error("Error creating new toolsession in the db"); throw new ToolException("Error creating new toolsession in the db: " + e); } } } public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { - QaServicePOJO.logger.debug("start of removeToolSession with id: " + toolSessionId); if (toolSessionId == null) { - QaServicePOJO.logger.debug("toolSessionId is null"); + QaServicePOJO.logger.error("toolSessionId is null"); throw new DataMissingException("toolSessionId is missing"); } @@ -926,13 +898,12 @@ } if (qaSession == null) { - QaServicePOJO.logger.debug("qaSession is null"); + QaServicePOJO.logger.error("qaSession is null"); throw new DataMissingException("qaSession is missing"); } try { qaSessionDAO.deleteQaSession(qaSession); - QaServicePOJO.logger.debug("qaSession " + qaSession.getQaSessionId() + " has been deleted successfully."); } catch (QaApplicationException e) { throw new ToolException("error deleting qaSession:" + e); } @@ -946,29 +917,24 @@ * */ public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { - QaServicePOJO.logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId); - QaServicePOJO.logger.debug("start of leaveToolSession with learnerId:" + learnerId); if (toolSessionId == null) { - QaServicePOJO.logger.debug("toolSessionId is null"); + QaServicePOJO.logger.error("toolSessionId is null"); throw new DataMissingException("toolSessionId is missing"); } if (learnerId == null) { - QaServicePOJO.logger.debug("learnerId is null"); + QaServicePOJO.logger.error("learnerId is null"); throw new DataMissingException("learnerId is missing"); } QaSession qaSession = getSessionById(toolSessionId.longValue()); qaSession.setSession_end_date(new Date(System.currentTimeMillis())); qaSession.setSession_status(QaAppConstants.COMPLETED); updateQaSession(qaSession); - QaServicePOJO.logger.debug("tool session has been marked COMPLETE: " + qaSession.getQaSessionId()); try { String nextUrl = learnerService.completeToolSession(toolSessionId, learnerId); - QaServicePOJO.logger.debug(QaServicePOJO.logger + " " + this.getClass().getName() + " " + "nextUrl: " - + nextUrl); return nextUrl; } catch (DataAccessException e) { throw new ToolException("Exception occured when user is leaving tool session: " + e); @@ -1015,16 +981,13 @@ } public IToolVO getToolBySignature(String toolSignature) throws QaApplicationException { - QaServicePOJO.logger.debug("attempt retrieving tool with signature : " + toolSignature); IToolVO tool = toolService.getToolBySignature(toolSignature); return tool; } public long getToolDefaultContentIdBySignature(String toolSignature) throws QaApplicationException { long contentId = 0; - QaServicePOJO.logger.debug("before attempting retrieving tool with signature : " + toolSignature); contentId = toolService.getToolDefaultContentIdBySignature(toolSignature); - QaServicePOJO.logger.debug("tool default contentId : " + contentId); return contentId; } @@ -1095,7 +1058,6 @@ throws QaApplicationException { QaUploadedFile qaUploadedFile = new QaUploadedFile(uuid, isOnlineFile, fileName, qaContent); qaUploadedFileDAO.saveUploadFile(qaUploadedFile); - QaServicePOJO.logger.debug("persisted qaUploadedFile: " + qaUploadedFile.getUuid()); } /** @@ -1105,15 +1067,13 @@ content.getQaUploadedFiles().add(file); file.setQaContent(content); qaDAO.saveOrUpdateQa(content); - QaServicePOJO.logger.debug("persisted qaUploadedFile: " + file.getUuid()); } /** * removes an entry from the uploaded files table */ public void removeFile(Long submissionId) throws QaApplicationException { qaUploadedFileDAO.removeUploadFile(submissionId); - QaServicePOJO.logger.debug("removed qaUploadedFile: " + submissionId); } public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaBundler.java =================================================================== diff -u -r89a85171e802234252d2af19613d53b76cadb1ec -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaBundler.java (.../QaBundler.java) (revision 89a85171e802234252d2af19613d53b76cadb1ec) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaBundler.java (.../QaBundler.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest; import org.lamsfoundation.lams.learning.export.web.action.Bundler; -import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HttpUrlConnectionUtil; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java =================================================================== diff -u -rf9d720029dc327101f4678b7964d7b2f89cf7c34 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java (.../QaComparator.java) (revision f9d720029dc327101f4678b7964d7b2f89cf7c34) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java (.../QaComparator.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -27,8 +27,6 @@ import java.io.Serializable; import java.util.Comparator; -import org.apache.log4j.Logger; - /** * @author Ozgur Demirtas * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaStringComparator.java =================================================================== diff -u -rf9d720029dc327101f4678b7964d7b2f89cf7c34 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaStringComparator.java (.../QaStringComparator.java) (revision f9d720029dc327101f4678b7964d7b2f89cf7c34) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaStringComparator.java (.../QaStringComparator.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -26,8 +26,6 @@ import java.io.Serializable; import java.util.Comparator; -import org.apache.log4j.Logger; - /** * @author Ozgur Demirtas * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java =================================================================== diff -u -rf9d720029dc327101f4678b7964d7b2f89cf7c34 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java (.../QaUtils.java) (revision f9d720029dc327101f4678b7964d7b2f89cf7c34) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java (.../QaUtils.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaSession; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -62,27 +62,22 @@ * */ public class AuthoringUtil implements QaAppConstants { - static Logger logger = Logger.getLogger(AuthoringUtil.class.getName()); protected static List swapNodes(List listQuestionContentDTO, String questionIndex, String direction, Set conditions) { - AuthoringUtil.logger.debug("swapNodes:"); int intQuestionIndex = new Integer(questionIndex).intValue(); int intOriginalQuestionIndex = intQuestionIndex; - AuthoringUtil.logger.debug("intQuestionIndex:" + intQuestionIndex); int replacedNodeIndex = 0; if (direction.equals("down")) { - AuthoringUtil.logger.debug("direction down:"); + //direction down replacedNodeIndex = ++intQuestionIndex; } else { - AuthoringUtil.logger.debug("direction up:"); + //direction up replacedNodeIndex = --intQuestionIndex; } - AuthoringUtil.logger.debug("replacedNodeIndex:" + replacedNodeIndex); - AuthoringUtil.logger.debug("replacing nodes:" + intOriginalQuestionIndex + " and " + replacedNodeIndex); QaQuestionDTO mainNode = extractNodeAtDisplayOrder(listQuestionContentDTO, intOriginalQuestionIndex); @@ -99,7 +94,6 @@ protected static List reorderSwappedListQuestionContentDTO(List listQuestionContentDTO, int intOriginalQuestionIndex, int replacedNodeIndex, QaQuestionDTO mainNode, QaQuestionDTO replacedNode, Set conditions) { - AuthoringUtil.logger.debug("reorderSwappedListQuestionContentDTO:"); List listFinalQuestionContentDTO = new LinkedList(); @@ -112,15 +106,15 @@ if (!qaQuestionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString()) && !qaQuestionDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) { - AuthoringUtil.logger.debug("normal copy "); + //normal copy tempNode = new QaQuestionDTO(qaQuestionDTO.getQuestion(), qaQuestionDTO.getDisplayOrder(), qaQuestionDTO.getFeedback(), qaQuestionDTO.isRequired()); } else if (qaQuestionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) { - AuthoringUtil.logger.debug("move type 1 "); + //move type 1 tempNode = new QaQuestionDTO(replacedNode.getQuestion(), replacedNode.getDisplayOrder(),replacedNode.getFeedback(), replacedNode.isRequired()); } else if (qaQuestionDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) { - AuthoringUtil.logger.debug("move type 1 "); + //move type 1 tempNode = new QaQuestionDTO(mainNode.getQuestion(), mainNode.getDisplayOrder(), mainNode.getFeedback(), mainNode.isRequired()); } @@ -145,14 +139,10 @@ protected static QaQuestionDTO extractNodeAtDisplayOrder(List listQuestionContentDTO, int intOriginalQuestionIndex) { - AuthoringUtil.logger.debug("intOriginalQuestionIndex:" + intOriginalQuestionIndex); Iterator listIterator = listQuestionContentDTO.iterator(); while (listIterator.hasNext()) { QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next(); - AuthoringUtil.logger.debug("intOriginalQuestionIndex versus displayOrder:" - + new Integer(intOriginalQuestionIndex).toString() + " versus " - + qaQuestionDTO.getDisplayOrder()); if (new Integer(intOriginalQuestionIndex).toString().equals(qaQuestionDTO.getDisplayOrder())) { return qaQuestionDTO; } @@ -169,7 +159,6 @@ Map.Entry pairs = (Map.Entry) itMap.next(); if (pairs.getValue() != null && !pairs.getValue().equals("")) { ++queIndex; - AuthoringUtil.logger.debug("using queIndex:" + queIndex); mapFinalQuestionContent.put(new Integer(queIndex).toString(), pairs.getValue()); } @@ -178,8 +167,6 @@ } protected static List reorderListQuestionContentDTO(List listQuestionContentDTO, String excludeQuestionIndex) { - AuthoringUtil.logger.debug("reorderListQuestionContentDTO"); - AuthoringUtil.logger.debug("excludeQuestionIndex:" + excludeQuestionIndex); List listFinalQuestionContentDTO = new LinkedList(); @@ -191,14 +178,10 @@ String question = qaQuestionDTO.getQuestion(); String displayOrder = qaQuestionDTO.getDisplayOrder(); - AuthoringUtil.logger.debug("displayOrder:" + displayOrder); String feedback = qaQuestionDTO.getFeedback(); boolean required = qaQuestionDTO.isRequired(); - AuthoringUtil.logger.debug("displayOrder versus excludeQuestionIndex :" + displayOrder + " versus " - + excludeQuestionIndex); - if (question != null && !question.equals("")) { if (!displayOrder.equals(excludeQuestionIndex)) { ++queIndex; @@ -216,7 +199,6 @@ } protected static List reorderSimpleListQuestionContentDTO(List listQuestionContentDTO) { - AuthoringUtil.logger.debug("reorderListQuestionContentDTO"); List listFinalQuestionContentDTO = new LinkedList(); int queIndex = 0; @@ -245,8 +227,6 @@ protected static List reorderUpdateListQuestionContentDTO(List listQuestionContentDTO, QaQuestionDTO qaQuestionContentDTONew, String editableQuestionIndex) { - AuthoringUtil.logger.debug("reorderUpdateListQuestionContentDTO"); - AuthoringUtil.logger.debug("editableQuestionIndex:" + editableQuestionIndex); List listFinalQuestionContentDTO = new LinkedList(); @@ -287,9 +267,7 @@ * return void repopulates the user entries into the Map */ protected void repopulateMap(Map mapQuestionContent, HttpServletRequest request) { - AuthoringUtil.logger.debug("starting repopulateMap"); int intQuestionIndex = mapQuestionContent.size(); - AuthoringUtil.logger.debug("intQuestionIndex: " + intQuestionIndex); /* * if there is data in the Map remaining from previous session remove those @@ -337,12 +315,6 @@ String activeModule = request.getParameter(QaAppConstants.ACTIVE_MODULE); - boolean setCommonContent = true; - if (questionsSequenced == null || synchInMonitor == null || lockWhenFinished == null || usernameVisible == null - || reflect == null || showOtherAnswers == null) { - setCommonContent = false; - } - boolean questionsSequencedBoolean = false; boolean synchInMonitorBoolean = false; boolean lockWhenFinishedBoolean = false; @@ -467,18 +439,14 @@ List allQuestions = qaService.getAllQuestionEntries(qaContent.getUid()); Iterator listIterator = allQuestions.iterator(); - int mapIndex = 0; boolean entryUsed = false; while (listIterator.hasNext()) { - ++mapIndex; QaQueContent queContent = (QaQueContent) listIterator.next(); //Checking whether to remove question with id queContent.getUid() entryUsed = false; - int displayOrder = 0; for ( QaQuestionDTO questionDTO : listQuestionContentDTO ) { - ++displayOrder; if (StringUtils.equals(queContent.getQuestion(), questionDTO.getQuestion())) { entryUsed = true; break; @@ -518,7 +486,6 @@ // Overriding the displayOrder with a new displayOrder. String questionText = questionContentDTO.getQuestion(); if (StringUtils.isNotBlank(questionText)) { - AuthoringUtil.logger.info("Persisting question with key=" + questionText); ++displayOrder; @@ -529,15 +496,13 @@ qaContent.getQaQueContents().add(queContent); queContent.setQaContent(qaContent); - AuthoringUtil.logger.info("Creating new question with question=" + queContent.getQuestion() + ", displayOrder=" + queContent.getDisplayOrder()); qaService.createQaQue(queContent); } else { existingQaQueContent.setQuestion(questionText); existingQaQueContent.setFeedback(questionContentDTO.getFeedback()); existingQaQueContent.setDisplayOrder(displayOrder); existingQaQueContent.setRequired(questionContentDTO.isRequired()); - AuthoringUtil.logger.info("Updating question with id=" + existingQaQueContent.getUid() + ", question=" + existingQaQueContent.getQuestion() + ", displayOrder=" + existingQaQueContent.getDisplayOrder()); qaService.saveOrUpdateQaQueContent(existingQaQueContent); } } @@ -547,7 +512,6 @@ } public static boolean checkDuplicateQuestions(List listQuestionContentDTO, String newQuestion) { - AuthoringUtil.logger.debug("checkDuplicateQuestions: "); for (QaQuestionDTO questionDTO : listQuestionContentDTO ) { if ( questionDTO.getQuestion() != null && questionDTO.getQuestion().equals(newQuestion) ) { return true; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -23,30 +23,22 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.qa.web; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.Map; -import java.util.Set; import java.util.TreeMap; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; -import org.lamsfoundation.lams.tool.qa.QaSession; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; import org.lamsfoundation.lams.tool.qa.service.IQaService; import org.lamsfoundation.lams.tool.qa.util.QaComparator; import org.lamsfoundation.lams.tool.qa.web.form.QaLearningForm; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; /** @@ -57,7 +49,6 @@ * */ public class LearningUtil implements QaAppConstants { - static Logger logger = Logger.getLogger(LearningUtil.class.getName()); public static void saveFormRequestData(HttpServletRequest request, QaLearningForm qaLearningForm) { String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); @@ -107,61 +98,6 @@ return generalLearnerFlowDTO; } -// /** -// * Create users of the responses -// * -// * @param mapAnswers -// * -// */ -// public static void storeResponses(Map mapAnswers, IQaService qaService, Long toolContentID, Long toolSessionID) { -// -// // get back login user DTO -// HttpSession ss = SessionManager.getSession(); -// UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); -// Long userId = new Long(toolUser.getUserID().longValue()); -// -// // obtain QaContent to be used in creating QaQueUsr -// QaContent qaContent = qaService.getQa(toolContentID.longValue()); -// -// QaQueUsr user = qaService.getUserByIdAndSession(userId, toolSessionID); -// -// // check if Attempt to Entry is allowed, if so create the responses -// if (!user.isResponseFinalized() || !qaContent.isLockWhenFinished()) { -// -// Set questionsToStore; -// if (qaContent.isQuestionsSequenced()) { -// String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex(); -// QaQueContent currentQuestion = qaService.getQuestionContentByDisplayOrder(new Long(currentQuestionIndex), qaContent.getQaContentId()); -// questionsToStore = new LinkedHashSet(); -// questionsToStore.add(currentQuestion); -// -// } else { -// questionsToStore = qaContent.getQaQuestions(); -// } -// -// for (QaQueContent question : questionsToStore) { -// -// String displayOrder = new Long(question.getDisplayOrder()).toString(); -// String answer = (String) mapAnswers.get(displayOrder); -// -// QaUsrResp response = qaService.getResponseByUserAndQuestion(user.getQueUsrId(), question.getUid()); -// // if response doesn't exist -// if (response == null) { -// response = new QaUsrResp(answer, new Date(System.currentTimeMillis()), "", question, user, true); -// qaService.createQaUsrResp(response); -// -// //if answer has changed -// } else if (! answer.equals(response.getAnswer())) { -// response.setAnswer(answer); -// response.setAttemptTime(new Date(System.currentTimeMillis())); -// response.setTimezone(""); -// qaService.updateUserResponse(response); -// } -// } -// -// } -// } - public static String getRemainingQuestionCount(int currentQuestionIndex, String totalQuestionCount) { int remainingQuestionCount = new Long(totalQuestionCount).intValue() - currentQuestionIndex + 1; return new Integer(remainingQuestionCount).toString(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -r046d789cf4472c7f0a8b38702ebef2e243efb157 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 046d789cf4472c7f0a8b38702ebef2e243efb157) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -32,17 +32,15 @@ import java.util.TimeZone; import java.util.TreeMap; - import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java =================================================================== diff -u -r046d789cf4472c7f0a8b38702ebef2e243efb157 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java (.../QaAction.java) (revision 046d789cf4472c7f0a8b38702ebef2e243efb157) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java (.../QaAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -137,44 +137,13 @@ private QaToolContentHandler toolContentHandler; - /** - *

- * Struts dispatch method. - *

- * - *

- * It is assuming that progress engine should pass in the tool access mode - * and the tool session id as http parameters. - *

- * - * @param mapping - * An ActionMapping class that will be used by the Action - * class to tell the ActionServlet where to send the - * end-user. - * - * @param form - * The ActionForm class that will contain any data submitted - * by the end-user via a form. - * @param request - * A standard Servlet HttpServletRequest class. - * @param response - * A standard Servlet HttpServletResponse class. - * @return An ActionForward class that will be returned to the ActionServlet - * indicating where the user is to go next. - * @throws IOException - * @throws ServletException - * @throws QaApplicationException - * the known runtime exception - * - */ - @Override public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { return mapping.findForward(QaAppConstants.LOAD_QUESTIONS); } /** - * submits content into the tool database ActionForward + * submits content into the tool database * * @param mapping * @param form @@ -222,13 +191,8 @@ QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO(); if (activeModule.equals(QaAppConstants.AUTHORING)) { - List attachmentListBackup = new ArrayList(); List attachmentList = (List) sessionMap.get(QaAppConstants.ATTACHMENT_LIST_KEY); - attachmentListBackup = attachmentList; - - List deletedAttachmentListBackup = new ArrayList(); List deletedAttachmentList = (List) sessionMap.get(QaAppConstants.DELETED_ATTACHMENT_LIST_KEY); - deletedAttachmentListBackup = deletedAttachmentList; String onlineInstructions = (String) sessionMap.get(QaAppConstants.ONLINE_INSTRUCTIONS_KEY); qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions); @@ -391,16 +355,12 @@ String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest"); - QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue()); - QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO(); qaGeneralAuthoringDTO.setContentFolderID(contentFolderID); qaGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString()); - AuthoringUtil authoringUtil = new AuthoringUtil(); - List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY); String newQuestion = request.getParameter("newQuestion"); @@ -455,7 +415,6 @@ while (listIterator.hasNext()) { qaQuestionDTO = (QaQuestionDTO) listIterator.next(); - String question = qaQuestionDTO.getQuestion(); String displayOrder = qaQuestionDTO.getDisplayOrder(); if (displayOrder != null && !displayOrder.equals("")) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java =================================================================== diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java (.../QaAdminAction.java) (revision 91f0740e75daa643981b757e49d1ed2ed7f0a528) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java (.../QaAdminAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -79,7 +79,7 @@ public static final String NULL = "null"; public static final String FILE_EXPORT = "qa-wizard.xml"; - IQaService qaService; + private IQaService qaService; /** * Sets up the admin page Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java =================================================================== diff -u -r046d789cf4472c7f0a8b38702ebef2e243efb157 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java (.../QaDLStarterAction.java) (revision 046d789cf4472c7f0a8b38702ebef2e243efb157) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java (.../QaDLStarterAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -62,7 +62,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -121,10 +121,9 @@ import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; -import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO; import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; @@ -530,7 +529,6 @@ request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); - logger.debug("fwd'ing to INDIVIDUAL_LEARNER_REPORT: " + INDIVIDUAL_LEARNER_REPORT); return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT)); } @@ -775,7 +773,6 @@ qaService.updateQaSession(qaSession); String httpSessionID = qaLearningForm.getHttpSessionID(); - logger.debug("removing map with httpSessionID: " + httpSessionID); //request.getSession().removeAttribute(httpSessionID); qaLearningForm.setHttpSessionID(httpSessionID); @@ -840,7 +837,7 @@ } if (sessionUserCount > 1) { - logger.debug("there are multiple user responses"); + //there are multiple user responses generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); } @@ -866,7 +863,6 @@ request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); - logger.debug("fwd'ing to." + REVISITED_LEARNER_REP); return (mapping.findForward(REVISITED_LEARNER_REP)); } @@ -934,7 +930,6 @@ QaContent qaContent = qaSession.getQaContent(); String userID = request.getParameter("userID"); - logger.debug("userID: " + userID); qaLearningForm.setUserID(userID); return forwardtoReflection(mapping, request, qaContent, toolSessionID, userID, qaLearningForm); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 8aded0b18a5a7712622ae56f38923fa297449977) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -52,8 +52,8 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; @@ -74,12 +74,6 @@ * * @author Ozgur Demirtas * - * /&userId=&toolSessionId=123&mode=teacher - * - * 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 * @@ -90,51 +84,6 @@ * */ -/** - * Tool Session: - * - * A tool session is the concept by which which the tool and the LAMS core - * manage a set of learners interacting with the tool. The tool session id - * (toolSessionId) is generated by the LAMS core and given to the tool. A tool - * session represents the use of a tool for a particulate activity for a group - * of learners. So if an activity is ungrouped, then one tool session exist for - * for a tool activity in a learning design. - * - * More details on the tool session id are covered under monitoring. When - * thinking about the tool content id and the tool session id, it might be - * helpful to think about the tool content id relating to the definition of an - * activity, whereas the tool session id relates to the runtime participation in - * the activity. - * - */ - -/** - * - * Learner URL: The learner url display the screen(s) that the learner uses to - * participate in the activity. When the learner accessed this user, it will - * have a tool access mode ToolAccessMode.LEARNER. - * - * It is the responsibility of the tool to record the progress of the user. If - * the tool is a multistage tool, for example asking a series of questions, the - * tool must keep track of what the learner has already done. If the user logs - * out and comes back to the tool later, then the tool should resume from where - * the learner stopped. When the user is completed with tool, then the tool - * notifies the progress engine by calling - * org.lamsfoundation.lams.learning.service.completeToolSession(Long - * toolSessionId, User learner). - * - * If the tool's content DefineLater flag is set to true, then the learner - * should see a "Please wait for the teacher to define this part...." style - * message. If the tool's content RunOffline flag is set to true, then the - * learner should see a "This activity is not being done on the computer. Please - * see your instructor for details." - * ?? Would it be better to define a run offline message in the tool? We have - * instructions for the teacher but not the learner. ?? If the tool has a - * LockOnFinish flag, then the tool should lock learner's entries once they have - * completed the activity. If they return to the activity (e.g. via the progress - * bar) then the entries should be read only. - */ - public class QaLearningStarterAction extends Action implements QaAppConstants { static Logger logger = Logger.getLogger(QaLearningStarterAction.class.getName()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -rfa87cd6cdce23fbd03bfae75849a10277fc961a0 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision fa87cd6cdce23fbd03bfae75849a10277fc961a0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -122,8 +122,8 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; import org.lamsfoundation.lams.tool.qa.QaContent; -import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaQueContent; +import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO; @@ -1877,7 +1877,6 @@ public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - QaMonitoringAction.logger.debug("dispatching proxy submitAllContent..."); /* start authoring code */ QaAuthoringForm qaAuthoringForm = (QaMonitoringForm) form; @@ -2732,10 +2731,8 @@ GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO(); if (qaService.isStudentActivityOccurredGlobal(qaContent)) { - QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false"); qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString()); } else { - QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true"); qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -r046d789cf4472c7f0a8b38702ebef2e243efb157 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 046d789cf4472c7f0a8b38702ebef2e243efb157) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -64,21 +64,10 @@ /** * - * @author Ozgur Demirtas starts up the monitoring module + * @author Ozgur Demirtas * - * - * - * - * - * - * - * + * starts up the monitoring module */ - public class QaMonitoringStarterAction extends Action implements QaAppConstants { static Logger logger = Logger.getLogger(QaMonitoringStarterAction.class.getName()); @@ -264,7 +253,7 @@ qaMonitoringForm.setToolContentID(new Long(toolContentId).toString()); } catch (NumberFormatException e) { - logger.debug("add error.contentId.numberFormatException to ActionMessages."); + logger.error("add error.contentId.numberFormatException to ActionMessages."); QaUtils.cleanUpSessionAbsolute(request); return (mapping.findForward(ERROR_LIST)); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java (.../QaPedagogicalPlannerAction.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java (.../QaPedagogicalPlannerAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -49,8 +49,6 @@ public class QaPedagogicalPlannerAction extends LamsDispatchAction { - private static Logger logger = Logger.getLogger(QaPedagogicalPlannerAction.class); - @Override protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r629b2631320321b57015e15be850e7c6b747225f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 501ddb69e1c739b90388262f41b4927356cb0449) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 629b2631320321b57015e15be850e7c6b747225f) @@ -162,11 +162,6 @@ /** * * @author Ozgur Demirtas - * - * TODO To change the template for this generated type comment go to Window - - * Preferences - Java - Code Style - Code Templates - * - * A Map data structure is used to present the UI. */ public class QaStarterAction extends Action implements QaAppConstants { static Logger logger = Logger.getLogger(QaStarterAction.class.getName()); @@ -176,12 +171,10 @@ HttpServletResponse response) throws IOException, ServletException, QaApplicationException { QaUtils.cleanUpSessionAbsolute(request); - QaStarterAction.logger.debug("init authoring mode."); QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - QaStarterAction.logger.debug("contentFolderID: " + contentFolderID); qaAuthoringForm.setContentFolderID(contentFolderID); QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO(); @@ -191,56 +184,44 @@ IQaService qaService = null; if (getServlet() == null || getServlet().getServletContext() == null) { - QaStarterAction.logger.debug("obtaining qaService from the form"); qaService = qaAuthoringForm.getQaService(); } else { - QaStarterAction.logger.debug("obtaining qaService via proxy"); qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); } qaGeneralAuthoringDTO.setCurrentTab("1"); - QaStarterAction.logger.debug("setting currrent tab to 1:"); qaGeneralAuthoringDTO.setMonitoringOriginatedDefineLater(new Boolean(false).toString()); String servletPath = request.getServletPath(); - QaStarterAction.logger.debug("getServletPath: " + servletPath); String requestedModule = null; if (servletPath.indexOf("authoringStarter") > 0) { - QaStarterAction.logger.debug("request is for authoring module"); qaGeneralAuthoringDTO.setActiveModule(QaAppConstants.AUTHORING); qaGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString()); qaGeneralAuthoringDTO.setShowAuthoringTabs(new Boolean(true).toString()); qaAuthoringForm.setActiveModule(QaAppConstants.AUTHORING); requestedModule = QaAppConstants.AUTHORING; } else { - QaStarterAction.logger - .debug("request is for define later module either direcly from define later url or monitoring url"); + //request is for define later module either direcly from define later url or monitoring url qaGeneralAuthoringDTO.setActiveModule(QaAppConstants.DEFINE_LATER); qaGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString()); qaGeneralAuthoringDTO.setShowAuthoringTabs(new Boolean(false).toString()); qaAuthoringForm.setActiveModule(QaAppConstants.DEFINE_LATER); requestedModule = QaAppConstants.DEFINE_LATER; if (servletPath.indexOf("monitoring") > 0) { - QaStarterAction.logger.debug("request is from monitoring url."); + //request is from monitoring url qaGeneralAuthoringDTO.setMonitoringOriginatedDefineLater(new Boolean(true).toString()); } } - QaStarterAction.logger.debug("requestedModule: " + requestedModule); qaGeneralAuthoringDTO.setRequestedModule(requestedModule); /* in development this needs to be called only once. */ /* QaUtils.configureContentRepository(request); */ String sourceMcStarter = (String) request.getAttribute(QaAppConstants.SOURCE_MC_STARTER); - QaStarterAction.logger.debug("sourceMcStarter: " + sourceMcStarter); boolean validateSignature = readSignature(request, mapping, qaService, qaGeneralAuthoringDTO, qaAuthoringForm); - QaStarterAction.logger.debug("validateSignature: " + validateSignature); - if (validateSignature == false) { - QaStarterAction.logger.debug("error during validation"); - } /* mark the http session as an authoring activity */ qaGeneralAuthoringDTO.setTargetMode(QaAppConstants.TARGET_MODE_AUTHORING); @@ -249,11 +230,10 @@ * find out whether the request is coming from monitoring module for EditActivity tab or from authoring * environment url */ - QaStarterAction.logger.debug("no problems getting the default content, will render authoring screen"); + //no problems getting the default content, will render authoring screen String strToolContentID = ""; /* the authoring url must be passed a tool content id */ strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); - QaStarterAction.logger.debug("strToolContentID: " + strToolContentID); qaGeneralAuthoringDTO.setToolContentID(strToolContentID); SessionMap sessionMap = new SessionMap(); @@ -273,27 +253,21 @@ * it is possible that the original request for authoring module is coming from monitoring url which keeps * the TOOL_CONTENT_ID in the session */ - QaStarterAction.logger.debug("strToolContentID is null, handle this"); + //strToolContentID is null, handle this Long toolContentID = (Long) request.getSession().getAttribute(QaAppConstants.TOOL_CONTENT_ID); - QaStarterAction.logger.debug("toolContentID: " + toolContentID); if (toolContentID != null) { strToolContentID = toolContentID.toString(); - QaStarterAction.logger.debug("cached strToolContentID from the session: " + strToolContentID); } else { - QaStarterAction.logger - .debug("we should IDEALLY not arrive here. The TOOL_CONTENT_ID is NOT available from the url or the session."); + //we should IDEALLY not arrive here. The TOOL_CONTENT_ID is NOT available from the url or the session /* use default content instead of giving a warning */ defaultContentId = qaAuthoringForm.getDefaultContentIdStr(); - QaStarterAction.logger.debug("using MCQ defaultContentId: " + defaultContentId); strToolContentID = defaultContentId; } } - QaStarterAction.logger.debug("final strToolContentID: " + strToolContentID); if (strToolContentID == null || strToolContentID.equals("")) { QaUtils.cleanUpSessionAbsolute(request); - QaStarterAction.logger.debug("forwarding to: " + QaAppConstants.ERROR_LIST); return mapping.findForward(QaAppConstants.ERROR_LIST); } @@ -310,17 +284,12 @@ String defaultContentIdStr = null; QaContent qaContent = null; if (!existsContent(new Long(strToolContentID).longValue(), qaService)) { - QaStarterAction.logger.debug("getting default content"); /* fetch default content */ defaultContentIdStr = qaAuthoringForm.getDefaultContentIdStr(); - QaStarterAction.logger.debug("defaultContentIdStr:" + defaultContentIdStr); qaContent = retrieveContent(request, mapping, qaAuthoringForm, new Long( defaultContentIdStr).longValue(), true, qaService, qaGeneralAuthoringDTO, sessionMap); - QaStarterAction.logger.debug("post retrive content :" + sessionMap); - } else { - QaStarterAction.logger.debug("getting existing content"); /* it is possible that the content is in use by learners. */ qaContent = qaService.getQa(new Long(strToolContentID).longValue()); @@ -333,8 +302,6 @@ } qaContent = retrieveContent(request, mapping, qaAuthoringForm, new Long( strToolContentID).longValue(), false, qaService, qaGeneralAuthoringDTO, sessionMap); - - QaStarterAction.logger.debug("post retrive content :" + sessionMap); } if (qaGeneralAuthoringDTO.getOnlineInstructions() == null @@ -359,12 +326,8 @@ qaAuthoringForm.setAllowRichEditor(qaContent.isAllowRichEditor()); sessionMap.put(QaAppConstants.ATTR_QA_AUTHORING_FORM, qaAuthoringForm); - - QaStarterAction.logger.debug("will return to jsp with: " + sourceMcStarter); String destination = QaUtils.getDestination(sourceMcStarter, requestedModule); - QaStarterAction.logger.debug("destination: " + destination); - QaStarterAction.logger.debug("persisting sessionMap into session: " + sessionMap); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(QaAppConstants.QA_GENERAL_AUTHORING_DTO, qaGeneralAuthoringDTO); @@ -389,11 +352,6 @@ protected QaContent retrieveContent(HttpServletRequest request, ActionMapping mapping, QaAuthoringForm qaAuthoringForm, long toolContentID, boolean isDefaultContent, IQaService qaService, QaGeneralAuthoringDTO qaGeneralAuthoringDTO, SessionMap sessionMap) { - - QaStarterAction.logger.debug("toolContentID: " + toolContentID); - QaStarterAction.logger.debug("isDefaultContent: " + isDefaultContent); - - QaStarterAction.logger.debug("getting content with id:" + toolContentID); QaContent qaContent = qaService.getQa(toolContentID); if (isDefaultContent && qaContent.getConditions().isEmpty()) { qaContent.getConditions().add(qaService.createDefaultComplexCondition(qaContent)); @@ -411,7 +369,6 @@ qaGeneralAuthoringDTO.setReflect(qaContent.isReflect() ? "1" : "0"); - QaStarterAction.logger.debug("QaContent isReflect: " + qaContent.isReflect()); qaAuthoringForm.setReflect(qaContent.isReflect() ? "1" : "0"); qaAuthoringForm.setReflectionSubject(qaContent.getReflectionSubject()); @@ -477,7 +434,6 @@ sessionMap.put(QaAppConstants.ATTR_CONDITION_SET, conditionSet); if (isDefaultContent) { - QaStarterAction.logger.debug("overwriting default question."); qaGeneralAuthoringDTO.setDefaultQuestionContent("Sample Question 1?"); } @@ -490,8 +446,6 @@ sessionMap.put(QaAppConstants.ONLINE_INSTRUCTIONS_KEY, qaContent.getOnlineInstructions()); sessionMap.put(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY, qaContent.getOfflineInstructions()); - QaStarterAction.logger.debug("ACTIVITY_TITLE_KEY set to:" + sessionMap.get(QaAppConstants.ACTIVITY_TITLE_KEY)); - qaAuthoringForm.resetUserAction(); return qaContent; @@ -517,15 +471,13 @@ */ long defaultContentID = 0; try { - QaStarterAction.logger.debug("attempt retrieving tool with signatute : " + QaAppConstants.MY_SIGNATURE); defaultContentID = qaService.getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); - QaStarterAction.logger.debug("retrieved tool default contentId: " + defaultContentID); if (defaultContentID == 0) { QaStarterAction.logger.debug("default content id has not been setup"); return false; } } catch (Exception e) { - QaStarterAction.logger.debug("error getting the default content id: " + e.getMessage()); + QaStarterAction.logger.error("error getting the default content id: " + e.getMessage()); persistError(request, "error.defaultContent.notSetup"); return false; } @@ -537,18 +489,17 @@ //retrieve uid of the content based on default content id determined above QaContent qaContent = qaService.getQa(defaultContentID); if (qaContent == null) { - QaStarterAction.logger.debug("Exception occured: No default content"); + QaStarterAction.logger.error("Exception occured: No default content"); persistError(request, "error.defaultContent.notSetup"); return false; } } catch (Exception e) { - QaStarterAction.logger.debug("Exception occured: No default question content"); + QaStarterAction.logger.error("Exception occured: No default question content"); persistError(request, "error.defaultContent.notSetup"); return false; } - QaStarterAction.logger.debug("QA tool has the default content id: " + defaultContentID); qaGeneralAuthoringDTO.setDefaultContentIdStr(new Long(defaultContentID).toString()); qaAuthoringForm.setDefaultContentIdStr(new Long(defaultContentID).toString()); @@ -592,7 +543,6 @@ public ActionForward executeDefineLater(ActionMapping mapping, QaAuthoringForm qaAuthoringForm, HttpServletRequest request, HttpServletResponse response, IQaService qaService) throws IOException, ServletException, QaApplicationException { - QaStarterAction.logger.debug("calling execute..., qaService will be needed next."); return execute(mapping, qaAuthoringForm, request, response); } @@ -605,7 +555,6 @@ public void persistError(HttpServletRequest request, String message) { ActionMessages errors = new ActionMessages(); errors.add(Globals.ERROR_KEY, new ActionMessage(message)); - QaStarterAction.logger.debug("add " + message + " to ActionMessages:"); saveErrors(request, errors); }