Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -36,39 +36,6 @@
 			<forward name="author" path="/pages/authoring/authoring.jsp" />
 			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
 		</action>
-		<!-- ==========  Instrcutions File: online/offline ========== -->
-		<action path="/authoring/uploadOnlineFile"
-			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOnlineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/uploadOfflineFile"
-			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOfflineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/deleteOnlineFile"
-			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOnlineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
-		<action path="/authoring/deleteOfflineFile"
-			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
 		<!-- ==========  Survey Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
@@ -188,7 +155,7 @@
 			parameter="start" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="definelater" path="/pages/learning/definelater.jsp" />
-			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />	
+			<forward name="submissionDeadline" path="/pages/learning/submissionDeadline.jsp" />	
 			<forward name="result" path="/pages/learning/result.jsp" />	
 		</action>
 		
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -44,8 +44,6 @@
 
     public static final String DEFINE_LATER = "definelater";
 
-    public static final String RUN_OFFLINE = "runOffline";
-
     public static final String FORWARD_RESULT = "result";
     
     // for submission deadline
@@ -61,8 +59,6 @@
 
     public static final String PARAM_ITEM_INDEX = "itemIndex";
 
-    public static final String PARAM_RUN_OFFLINE = "runOffline";
-
     public static final String PARAM_TITLE = "title";
 
     public static final String ATTR_USER_UID = "userUid";
@@ -118,10 +114,6 @@
 
     public static final String ATTR_INSTRUCTION_LIST = "instructionList";
 
-    public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
-
-    public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
-
     public static final String ATTR_QUESTION_LIST = "questionList";
 
     public static final String ATTR_ANSWER_LIST = "answerList";
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAttachmentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20140102.sql
===================================================================
diff -u
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20140102.sql	(revision 0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20140102.sql	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,19 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
+ALTER TABLE tl_lasurv11_survey DROP COLUMN online_instructions;
+ALTER TABLE tl_lasurv11_survey DROP COLUMN offline_instructions;
+ALTER TABLE tl_lasurv11_survey DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lasurv11_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lasurv11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java
===================================================================
diff -u -rda3ab23df4afd600475db0e6f4886a0358f849aa -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision da3ab23df4afd600475db0e6f4886a0358f849aa)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -65,14 +65,9 @@
     private String reflectInstructions;
 
     private boolean defineLater;
-    private boolean runOffline;
     private boolean contentInUse;
 
     private boolean notifyTeachersOnAnswerSumbit;
-    // instructions
-    private String onlineInstructions;
-    private String offlineInstructions;
-    private Set<SurveyAttachment> attachments;
 
     // general infomation
     private Date created;
@@ -86,28 +81,19 @@
     // conditions
     private Set<SurveyCondition> conditions = new TreeSet<SurveyCondition>(new TextSearchConditionComparator());
 
-    // *************** NON Persist Fields ********************
-    private IToolContentHandler toolContentHandler;
-
-    private List<SurveyAttachment> onlineFileList;
-    private List<SurveyAttachment> offlineFileList;
-
     /**
      * Default contruction method.
      * 
      */
     public Survey() {
-	attachments = new HashSet<SurveyAttachment>();
 	questions = new HashSet<SurveyQuestion>();
     }
 
     // **********************************************************
     // Function method for Survey
     // **********************************************************
-    public static Survey newInstance(Survey defaultContent, Long contentId,
-	    SurveyToolContentHandler surveyToolContentHandler) {
+    public static Survey newInstance(Survey defaultContent, Long contentId) {
 	Survey toContent = new Survey();
-	defaultContent.toolContentHandler = surveyToolContentHandler;
 	toContent = (Survey) defaultContent.clone();
 	toContent.setContentId(contentId);
 
@@ -147,19 +133,6 @@
 		survey.setConditions(set);
 	    }
 
-	    // clone attachment
-	    if (attachments != null) {
-		Iterator iter = attachments.iterator();
-		Set set = new HashSet();
-		while (iter.hasNext()) {
-		    SurveyAttachment file = (SurveyAttachment) iter.next();
-		    SurveyAttachment newFile = (SurveyAttachment) file.clone();
-		    // clone old file without duplicate it in repository
-
-		    set.add(newFile);
-		}
-		survey.attachments = set;
-	    }
 	    // clone ReourceUser as well
 	    if (createdBy != null) {
 		survey.setCreatedBy((SurveyUser) createdBy.clone());
@@ -183,15 +156,13 @@
 	final Survey genericEntity = (Survey) o;
 
 	return new EqualsBuilder().append(uid, genericEntity.uid).append(title, genericEntity.title).append(
-		instructions, genericEntity.instructions).append(onlineInstructions, genericEntity.onlineInstructions)
-		.append(offlineInstructions, genericEntity.offlineInstructions).append(created, genericEntity.created)
+		instructions, genericEntity.instructions).append(created, genericEntity.created)
 		.append(updated, genericEntity.updated).append(createdBy, genericEntity.createdBy).isEquals();
     }
 
     @Override
     public int hashCode() {
-	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(onlineInstructions).append(
-		offlineInstructions).append(created).append(updated).append(createdBy).toHashCode();
+	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(created).append(updated).append(createdBy).toHashCode();
     }
 
     /**
@@ -206,21 +177,6 @@
 	this.setUpdated(new Date(now));
     }
 
-    public void toDTO() {
-	onlineFileList = new ArrayList<SurveyAttachment>();
-	offlineFileList = new ArrayList<SurveyAttachment>();
-	Set<SurveyAttachment> fileSet = this.getAttachments();
-	if (fileSet != null) {
-	    for (SurveyAttachment file : fileSet) {
-		if (StringUtils.equalsIgnoreCase(file.getFileType(), IToolContentHandler.TYPE_OFFLINE)) {
-		    offlineFileList.add(file);
-		} else {
-		    onlineFileList.add(file);
-		}
-	    }
-	}
-    }
-
     // **********************************************************
     // get/set methods
     // **********************************************************
@@ -310,26 +266,6 @@
     }
 
     /**
-     * @return Returns the runOffline.
-     * 
-     * @hibernate.property column="run_offline"
-     * 
-     */
-    public boolean getRunOffline() {
-	return runOffline;
-    }
-
-    /**
-     * @param runOffline
-     *                The forceOffLine to set.
-     * 
-     * 
-     */
-    public void setRunOffline(boolean forceOffline) {
-	runOffline = forceOffline;
-    }
-
-    /**
      * @return Returns the lockWhenFinish.
      * 
      * @hibernate.property column="lock_on_finished"
@@ -361,53 +297,8 @@
     }
 
     /**
-     * @return Returns the onlineInstructions set by the teacher.
      * 
-     * @hibernate.property column="online_instructions" type="text"
-     */
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    /**
-     * @return Returns the onlineInstructions set by the teacher.
      * 
-     * @hibernate.property column="offline_instructions" type="text"
-     */
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    /**
-     * 
-     * @hibernate.set lazy="true" cascade="all" inverse="false" order-by="create_date desc"
-     * @hibernate.collection-key column="survey_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.survey.model.SurveyAttachment"
-     * 
-     * @return a set of Attachments to this Message.
-     */
-    public Set getAttachments() {
-	return attachments;
-    }
-
-    /*
-     * @param attachments The attachments to set.
-     */
-    public void setAttachments(Set attachments) {
-	this.attachments = attachments;
-    }
-
-    /**
-     * 
-     * 
      * @hibernate.set lazy="true" inverse="false" cascade="all" order-by="sequence_id asc"
      * @hibernate.collection-key column="survey_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.survey.model.SurveyQuestion"
@@ -458,26 +349,6 @@
 	this.contentId = contentId;
     }
 
-    public List<SurveyAttachment> getOfflineFileList() {
-	return offlineFileList;
-    }
-
-    public void setOfflineFileList(List<SurveyAttachment> offlineFileList) {
-	this.offlineFileList = offlineFileList;
-    }
-
-    public List<SurveyAttachment> getOnlineFileList() {
-	return onlineFileList;
-    }
-
-    public void setOnlineFileList(List<SurveyAttachment> onlineFileList) {
-	this.onlineFileList = onlineFileList;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-
     /**
      * @hibernate.property column="reflect_instructions"
      * @return
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -67,7 +67,7 @@
     	SurveyQuestion obj = null;
 		try {
 			obj = (SurveyQuestion) super.clone();
-//			clone attachment
+//			clone options
   			if(options != null){
   				Iterator iter = options.iterator();
   				Set set = new HashSet();
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
diff -u -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision f0450cb2776a8eba5e274ec3e72f83a333f5d229)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -36,7 +36,6 @@
 import org.lamsfoundation.lams.tool.survey.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
 import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
-import org.lamsfoundation.lams.tool.survey.model.SurveyAttachment;
 import org.lamsfoundation.lams.tool.survey.model.SurveyCondition;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 import org.lamsfoundation.lams.tool.survey.model.SurveySession;
@@ -89,24 +88,7 @@
     // ******************************************************************************************
     // *************** Instruction file methods **********************
     // ******************************************************************************************
-    /**
-     * Upload instruciton file into repository.
-     * 
-     * @param file
-     * @param type
-     * @return
-     * @throws UploadSurveyFileException
-     */
-    SurveyAttachment uploadInstructionFile(FormFile file, String type) throws UploadSurveyFileException;
 
-    /**
-     * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not delete the
-     * file from repository.
-     * 
-     * @param attachmentUid
-     */
-    void deleteSurveyAttachment(Long attachmentUid);
-
     // ******************************************************************************************
     // *************** Questions and Answers methods **********************
     // ******************************************************************************************
@@ -186,14 +168,6 @@
     List<SurveyUser> getSessionUsers(Long sessionId);
 
     // ******************************************************************************************
-    // ********** Repository methods ***********************
-    // ******************************************************************************************
-    /**
-     * Delete file from repository.
-     */
-    void deleteFromRepository(Long fileUuid, Long fileVersionId) throws SurveyApplicationException;
-
-    // ******************************************************************************************
     // ********** Session methods ***********************
     // ******************************************************************************************
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyImportContentVersionFilter.java
===================================================================
diff -u
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyImportContentVersionFilter.java	(revision 0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyImportContentVersionFilter.java	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,43 @@
+/**************************************************************** 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.survey.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.survey.model.Survey;
+
+/**
+ * Import filter class for different version of Survey content.
+ */
+public class SurveyImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20110406 version content to 20140102 version tool server.
+     */
+    public void up20110406To20140102() {
+	this.removeField(Survey.class, "runOffline");
+	this.removeField(Survey.class, "onlineInstructions");
+	this.removeField(Survey.class, "offlineInstructions");
+	this.removeField(Survey.class, "attachments");
+    }
+}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -r33da76d05725a84e191a5f6dca50b394cca3c1ee -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 33da76d05725a84e191a5f6dca50b394cca3c1ee)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -76,7 +76,6 @@
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.dao.SurveyAnswerDAO;
-import org.lamsfoundation.lams.tool.survey.dao.SurveyAttachmentDAO;
 import org.lamsfoundation.lams.tool.survey.dao.SurveyDAO;
 import org.lamsfoundation.lams.tool.survey.dao.SurveyQuestionDAO;
 import org.lamsfoundation.lams.tool.survey.dao.SurveySessionDAO;
@@ -85,7 +84,6 @@
 import org.lamsfoundation.lams.tool.survey.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
 import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
-import org.lamsfoundation.lams.tool.survey.model.SurveyAttachment;
 import org.lamsfoundation.lams.tool.survey.model.SurveyCondition;
 import org.lamsfoundation.lams.tool.survey.model.SurveyOption;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
@@ -123,8 +121,6 @@
 
     private SurveyAnswerDAO surveyAnswerDao;
 
-    private SurveyAttachmentDAO surveyAttachmentDao;
-
     private SurveyUserDAO surveyUserDao;
 
     private SurveySessionDAO surveySessionDao;
@@ -135,14 +131,11 @@
     private MessageService messageService;
 
     // system services
-    private IRepositoryService repositoryService;
 
     private ILamsToolService toolService;
 
     private ILearnerService learnerService;
 
-    private IAuditService auditService;
-
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
@@ -182,31 +175,10 @@
 	}
 	// save default content by given ID.
 	Survey content = new Survey();
-	content = Survey.newInstance(defaultContent, contentId, surveyToolContentHandler);
+	content = Survey.newInstance(defaultContent, contentId);
 	return content;
     }
 
-    public SurveyAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
-	    throws UploadSurveyFileException {
-	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadSurveyFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
-
-	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	// create new attachement
-	SurveyAttachment file = new SurveyAttachment();
-	file.setFileType(fileType);
-	file.setFileUuid(nodeKey.getUuid());
-	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getFileName());
-	file.setCreated(new Date());
-
-	return file;
-    }
-
     public void createUser(SurveyUser surveyUser) {
 	surveyUserDao.saveObject(surveyUser);
     }
@@ -223,25 +195,10 @@
 
     }
 
-    public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws SurveyApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, fileUuid, fileVersionId);
-	} catch (Exception e) {
-	    throw new SurveyApplicationException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
     public void saveOrUpdateSurvey(Survey survey) {
 	surveyDao.saveObject(survey);
     }
 
-    public void deleteSurveyAttachment(Long attachmentUid) {
-	surveyAttachmentDao.removeObject(SurveyAttachment.class, attachmentUid);
-
-    }
-
     public Survey getSurveyBySessionId(Long sessionId) {
 	SurveySession session = surveySessionDao.getSessionBySessionId(sessionId);
 	// to skip CGLib problem
@@ -608,61 +565,6 @@
 	return contentId;
     }
 
-    /**
-     * Process an uploaded file.
-     * 
-     * @throws SurveyApplicationException
-     * @throws FileNotFoundException
-     * @throws IOException
-     * @throws RepositoryCheckedException
-     * @throws InvalidParameterException
-     */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadSurveyFileException {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = surveyToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			fileType);
-	    } catch (InvalidParameterException e) {
-		throw new UploadSurveyFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	    } catch (FileNotFoundException e) {
-		throw new UploadSurveyFileException(messageService.getMessage("error.msg.file.not.found"));
-	    } catch (RepositoryCheckedException e) {
-		throw new UploadSurveyFileException(messageService.getMessage("error.msg.repository"));
-	    } catch (IOException e) {
-		throw new UploadSurveyFileException(messageService.getMessage("error.msg.io.exception"));
-	    }
-	}
-	return node;
-    }
-
-    /**
-     * This method verifies the credentials of the Share Survey Tool and gives it the <code>Ticket</code> to login and
-     * access the Content Repository.
-     * 
-     * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
-     * the tool needs to upload/download files from the content repository.
-     * 
-     * @return ITicket The ticket for repostory access
-     * @throws SurveyApplicationException
-     */
-    private ITicket getRepositoryLoginTicket() throws SurveyApplicationException {
-	ICredentials credentials = new SimpleCredentials(surveyToolContentHandler.getRepositoryUser(),
-		surveyToolContentHandler.getRepositoryId());
-	try {
-	    ITicket ticket = repositoryService
-		    .login(credentials, surveyToolContentHandler.getRepositoryWorkspaceName());
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new SurveyApplicationException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new SurveyApplicationException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new SurveyApplicationException("Login failed." + e.getMessage());
-	}
-    }
-
     // *******************************************************************************
     // ToolContentManager, ToolSessionManager methods
     // *******************************************************************************
@@ -681,13 +583,8 @@
 	}
 
 	// set SurveyToolContentHandler as null to avoid copy file node in repository again.
-	toolContentObj = Survey.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
-	toolContentObj.setOfflineFileList(null);
-	toolContentObj.setOnlineFileList(null);
+	toolContentObj = Survey.newInstance(toolContentObj, toolContentId);
 	try {
-	    exportContentService.registerFileClassForExport(SurveyAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, surveyToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -698,9 +595,9 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(SurveyAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(SurveyImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, surveyToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Survey)) {
@@ -773,7 +670,7 @@
 	    }
 	}
 
-	Survey toContent = Survey.newInstance(survey, toContentId, surveyToolContentHandler);
+	Survey toContent = Survey.newInstance(survey, toContentId);
 	surveyDao.saveObject(toContent);
 
 	// save survey items as well
@@ -790,23 +687,7 @@
     public String getToolContentTitle(Long toolContentId) {
 	return getSurveyByContentId(toolContentId).getTitle();
     }
-    
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Survey survey = surveyDao.getByContentId(toolContentId);
-	if (survey == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	survey.setDefineLater(value);
-    }
 
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Survey survey = surveyDao.getByContentId(toolContentId);
-	if (survey == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	survey.setRunOffline(value);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	Survey survey = surveyDao.getByContentId(toolContentId);
@@ -920,9 +801,6 @@
 	    toolContentObj.setDefineLater(Boolean.FALSE);
 	    toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues
 		    .get(ToolContentImport102Manager.CONTENT_BODY)));
-	    toolContentObj.setOfflineInstructions(null);
-	    toolContentObj.setOnlineInstructions(null);
-	    toolContentObj.setRunOffline(Boolean.FALSE);
 	    toolContentObj.setUpdated(now);
 
 	    Boolean isReusable = WDDXProcessor.convertToBoolean(importValues,
@@ -1037,9 +915,6 @@
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
 
     public void setLearnerService(ILearnerService learnerService) {
 	this.learnerService = learnerService;
@@ -1049,14 +924,6 @@
 	this.messageService = messageService;
     }
 
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
-    public void setSurveyAttachmentDao(SurveyAttachmentDAO surveyAttachmentDao) {
-	this.surveyAttachmentDao = surveyAttachmentDao;
-    }
-
     public void setSurveyDao(SurveyDAO surveyDao) {
 	this.surveyDao = surveyDao;
     }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -32,12 +32,6 @@
         </property>
     </bean>
 
-   <bean id="lasurvSurveyAttachmentDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyAttachmentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>
-
    <bean id="lasurvSurveyUserDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyUserDAOHibernate">
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
@@ -66,9 +60,6 @@
         <property name="surveyAnswerDao">
             <ref local="lasurvSurveyAnswerDao"/>
         </property>
-        <property name="surveyAttachmentDao">
-            <ref local="lasurvSurveyAttachmentDao"/>
-        </property>
         <property name="surveyUserDao">
             <ref local="lasurvSurveyUserDao"/>
         </property>
@@ -78,18 +69,12 @@
         <property name="surveyToolContentHandler">
             <ref local="lasurvSurveyToolContentHandler"/>
         </property>
-        <property name="repositoryService">
-            <ref bean="repositoryService"/>
-        </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
@@ -122,9 +107,6 @@
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="update*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                
-                <prop key="setAsDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="setAsRunOffline">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="finishToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -37,6 +37,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -60,7 +61,6 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
-import org.lamsfoundation.lams.tool.survey.model.SurveyAttachment;
 import org.lamsfoundation.lams.tool.survey.model.SurveyCondition;
 import org.lamsfoundation.lams.tool.survey.model.SurveyOption;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
@@ -136,18 +136,6 @@
 	if (param.equals("updateContent")) {
 	    return updateContent(mapping, form, request, response);
 	}
-	if (param.equals("uploadOnlineFile")) {
-	    return uploadOnline(mapping, form, request, response);
-	}
-	if (param.equals("uploadOfflineFile")) {
-	    return uploadOffline(mapping, form, request, response);
-	}
-	if (param.equals("deleteOnlineFile")) {
-	    return deleteOnlineFile(mapping, form, request, response);
-	}
-	if (param.equals("deleteOfflineFile")) {
-	    return deleteOfflineFile(mapping, form, request, response);
-	}
 	// ----------------------- Add survey item function ---------------------------
 	if (param.equals("newItemInit")) {
 	    return newItemlInit(mapping, form, request, response);
@@ -461,11 +449,6 @@
 
 	surveyForm.setSurvey(survey);
 
-	// initialize instruction attachment list
-	List attachmentList = getAttachmentList(sessionMap);
-	attachmentList.clear();
-	attachmentList.addAll(survey.getAttachments());
-
 	// init it to avoid null exception in following handling
 	if (questions == null) {
 	    questions = new ArrayList();
@@ -598,51 +581,11 @@
 	}
 
 	surveyPO.setCreatedBy(surveyUser);
-
-	// **********************************Handle Authoring Instruction Attachement *********************
-	// merge attachment info
-	// so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
-	Set attPOSet = surveyPO.getAttachments();
-	if (attPOSet == null) {
-	    attPOSet = new HashSet();
-	}
-	List attachmentList = getAttachmentList(sessionMap);
-	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-
-	// current attachemnt in authoring instruction tab.
-	Iterator iter = attachmentList.iterator();
-	while (iter.hasNext()) {
-	    SurveyAttachment newAtt = (SurveyAttachment) iter.next();
-	    attPOSet.add(newAtt);
-	}
-	attachmentList.clear();
-
-	// deleted attachment. 2 possible types: one is persist another is non-persist before.
-	iter = deleteAttachmentList.iterator();
-	while (iter.hasNext()) {
-	    SurveyAttachment delAtt = (SurveyAttachment) iter.next();
-	    iter.remove();
-	    // it is an existed att, then delete it from current attachmentPO
-	    if (delAtt.getUid() != null) {
-		Iterator attIter = attPOSet.iterator();
-		while (attIter.hasNext()) {
-		    SurveyAttachment att = (SurveyAttachment) attIter.next();
-		    if (delAtt.getUid().equals(att.getUid())) {
-			attIter.remove();
-			break;
-		    }
-		}
-		service.deleteSurveyAttachment(delAtt.getUid());
-	    }// end remove from persist value
-	}
-
-	// copy back
-	surveyPO.setAttachments(attPOSet);
 	
 	// ************************* Handle survey questions *******************
 	Set questionList = new LinkedHashSet();
 	SortedSet topics = getSurveyItemList(sessionMap);
-	iter = topics.iterator();
+	Iterator iter = topics.iterator();
 	while (iter.hasNext()) {
 	    SurveyQuestion item = (SurveyQuestion) iter.next();
 	    if (item != null) {
@@ -696,9 +639,6 @@
 	// finally persist surveyPO again
 	service.saveOrUpdateSurvey(surveyPO);
 
-	// initialize attachmentList again
-	attachmentList = getAttachmentList(sessionMap);
-	attachmentList.addAll(survey.getAttachments());
 	surveyForm.setSurvey(surveyPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
@@ -709,165 +649,6 @@
 	}
     }
 
-    /**
-     * Handle upload online instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadSurveyFileException
-     */
-    public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadSurveyFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    /**
-     * Handle upload offline instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadSurveyFileException
-     */
-    public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadSurveyFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    /**
-     * Common method to upload online or offline instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param type
-     * @param request
-     * @return
-     * @throws UploadSurveyFileException
-     */
-    private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request)
-	    throws UploadSurveyFileException {
-
-	SurveyForm surveyForm = (SurveyForm) form;
-	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(surveyForm.getSessionMapID());
-
-	FormFile file;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = surveyForm.getOfflineFile();
-	} else {
-	    file = surveyForm.getOnlineFile();
-	}
-
-	if (file == null || StringUtils.isBlank(file.getFileName())) {
-	    return mapping.findForward(SurveyConstants.SUCCESS);
-	}
-
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	ISurveyService service = getSurveyService();
-	// upload to repository
-	SurveyAttachment att = service.uploadInstructionFile(file, type);
-	// handle session value
-	List attachmentList = getAttachmentList(sessionMap);
-	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-	// first check exist attachment and delete old one (if exist) to deletedAttachmentList
-	Iterator iter = attachmentList.iterator();
-	SurveyAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (SurveyAttachment) iter.next();
-	    if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
-		    && StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
-		// if there is same name attachment, delete old one
-		deleteAttachmentList.add(existAtt);
-		iter.remove();
-		break;
-	    }
-	}
-	// add to attachmentList
-	attachmentList.add(att);
-
-	return mapping.findForward(SurveyConstants.SUCCESS);
-
-    }
-
-    /**
-     * Delete offline instruction file from current Survey authoring page.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, request, response, form, IToolContentHandler.TYPE_OFFLINE);
-    }
-
-    /**
-     * Delete online instruction file from current Survey authoring page.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, request, response, form, IToolContentHandler.TYPE_ONLINE);
-    }
-
-    /**
-     * General method to delete file (online or offline)
-     * 
-     * @param mapping
-     * @param request
-     * @param response
-     * @param form
-     * @param type
-     * @return
-     */
-    private ActionForward deleteFile(ActionMapping mapping, HttpServletRequest request, HttpServletResponse response,
-	    ActionForm form, String type) {
-	Long versionID = new Long(WebUtil.readLongParam(request, SurveyConstants.PARAM_FILE_VERSION_ID));
-	Long uuID = new Long(WebUtil.readLongParam(request, SurveyConstants.PARAM_FILE_UUID));
-
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-
-	// handle session value
-	List attachmentList = getAttachmentList(sessionMap);
-	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-	// first check exist attachment and delete old one (if exist) to deletedAttachmentList
-	Iterator iter = attachmentList.iterator();
-	SurveyAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (SurveyAttachment) iter.next();
-	    if (existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)) {
-		// if there is same name attachment, delete old one
-		deleteAttachmentList.add(existAtt);
-		iter.remove();
-	    }
-	}
-
-	request.setAttribute(SurveyConstants.ATTR_FILE_TYPE_FLAG, type);
-	request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(SurveyConstants.SUCCESS);
-
-    }
-
     // *************************************************************************************
     // Private method
     // *************************************************************************************
@@ -881,22 +662,6 @@
     }
 
     /**
-     * @param request
-     * @return
-     */
-    private List getAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, SurveyConstants.ATT_ATTACHMENT_LIST);
-    }
-
-    /**
-     * @param request
-     * @return
-     */
-    private List getDeletedAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, SurveyConstants.ATTR_DELETED_ATTACHMENT_LIST);
-    }
-
-    /**
      * List save current survey items.
      * 
      * @param request
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -144,7 +144,7 @@
 	// save toolContentID into HTTPSession
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 	Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
-	// it will be use when runOffline or lock on finish page.
+	// it will be use when submissionDeadline or lock on finish page.
 	request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	// get back the survey and question list and display them on page
@@ -205,14 +205,6 @@
 	survey.setDefineLater(false);
 	service.saveOrUpdateSurvey(survey);
 
-	// add run offline support
-	if (survey.getRunOffline()) {
-	    sessionMap.put(SurveyConstants.PARAM_RUN_OFFLINE, true);
-	    return mapping.findForward(SurveyConstants.RUN_OFFLINE);
-	} else {
-	    sessionMap.put(SurveyConstants.PARAM_RUN_OFFLINE, false);
-	}
-
 	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
 		request, getServlet().getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
@@ -228,9 +220,9 @@
 	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
 	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
 
-	    // calculate whether submission deadline has passed, and if so forward to "runOffline"
+	    // calculate whether submission deadline has passed, and if so forward to "submissionDeadline"
 	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
-		return mapping.findForward(SurveyConstants.RUN_OFFLINE);
+		return mapping.findForward("submissionDeadline");
 	    }
 	}
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -148,7 +148,6 @@
 
 	// get survey
 	Survey survey = service.getSurveyByContentId(contentId);
-	survey.toDTO();
 
 	// get statistic
 	SortedMap<SurveySession, Integer> statis = service.getStatistic(contentId);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java	(.../SurveyForm.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java	(.../SurveyForm.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -73,7 +73,6 @@
     	if(!StringUtils.equals(param,"start") && !StringUtils.equals(param,"initPage")){
 	    	survey.setLockWhenFinished(false);
 	    	survey.setDefineLater(false);
-	    	survey.setRunOffline(false);
 	    	survey.setReflectOnActivity(false);
 	    	survey.setShowOnePage(false);
 	    	
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java
===================================================================
diff -u -rb33e717f9a734d318eefab07a17234f07c770c92 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -107,26 +107,6 @@
 		return FILENAME;
 	}
 
-	protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
-        if (toolContentID == null && toolSessionID == null) {
-            logger.error("Tool content Id or and session Id are null. Unable to activity title");
-        } else {
-        	
-        	Survey content = null;
-            if ( toolContentID != null ) {
-            	content = service.getSurveyByContentId(toolContentID);
-            } else {
-            	SurveySession session=service.getSurveySessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getSurvey();
-            }
-            if ( content != null ) {
-            	activityTitle = content.getTitle();
-            }
-        }
-        return super.doOfflineExport(request, response, directoryName, cookies);
-	}
-
 	public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap)
 			throws SurveyApplicationException {
 
Index: lams_tool_survey/web/includes/javascript/surveyitem.js
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/web/includes/javascript/surveyitem.js	(.../surveyitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_survey/web/includes/javascript/surveyitem.js	(.../surveyitem.js)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -2,7 +2,6 @@
 	 This is Survey Item instrcution area.
 	 */
     var instructionTargetDiv = "instructionArea";
-    var itemAttachmentTargetDiv = "itemAttachmentArea";
 // Please set these 2 variables in JSP file for using tag reason:
 //    var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
 //    var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rd4749f70eef0ca437b7d9040576e3f8152b6b4e9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d4749f70eef0ca437b7d9040576e3f8152b6b4e9)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -27,20 +27,8 @@
 	    	tag.value = tabId;
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
-        } 
-
-        function doUploadOnline() {
-        	var myForm = $("authoringForm");
-        	myForm.action = "<c:url value='/authoring/uploadOnlineFile.do'/>";
-        	myForm.submit();
         }
-        function doUploadOffline() {
-        	var myForm = $("authoringForm");
-        	myForm.action = "<c:url value='/authoring/uploadOfflineFile.do'/>";
-        	myForm.submit();
-        }
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
 
 </lams:head>
 <body class="stripes" onLoad="init()">
@@ -52,8 +40,7 @@
 		<lams:Tabs useKey="true" control="true">
 			<lams:Tab id="1" key="label.authoring.heading.basic" />
 			<lams:Tab id="2" key="label.authoring.heading.advance" />
-			<lams:Tab id="3" key="label.authoring.heading.instructions" />
-			<lams:Tab id="4" key="label.authoring.heading.conditions" />
+			<lams:Tab id="3" key="label.authoring.heading.conditions" />
 		</lams:Tabs>
 </div>
 		<!-- start tabs -->
@@ -76,22 +63,12 @@
 			<!-- tab content 2 (Advanced) -->
 			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
 			<!-- end of content (Advanced) -->
-
-			<!-- tab content 3 (Instructions) -->
-			<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
-			<!-- end of content (Instructions) -->
 			
 			<!-- tab content 4 (Conditions) -->
-			<lams:TabBody id="4" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
+			<lams:TabBody id="3" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
 			<!-- end of content (Conditions) -->
 
 			<!-- Button Row -->
-			<%--  Default value 
-				cancelButtonLabelKey="label.authoring.cancel.button"
-				saveButtonLabelKey="label.authoring.save.button"
-				cancelConfirmMsgKey="authoring.msg.cancel.save"
-				accessMode="author"
-			--%>
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 				toolSignature="<%=SurveyConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.survey.contentId}" 
 				 customiseSessionID="${formBean.sessionMapID}"
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/instructionfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learning/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u
--- lams_tool_survey/web/pages/learning/submissionDeadline.jsp	(revision 0)
+++ lams_tool_survey/web/pages/learning/submissionDeadline.jsp	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<lams:html>
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+
+	<script type="text/javascript">
+	<!--
+		function finishSession(){
+			document.getElementById("finishButton").disabled = true;
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
+			return false;
+		}
+		function continueReflect(){
+			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+		}
+		
+	-->        
+    </script>
+</lams:head>
+
+<body class="stripes">
+	<div id="content">
+
+		<h1>
+			${sessionMap.title}
+		</h1>
+		
+		<div class="warning">
+			<fmt:message key="authoring.info.teacher.set.restriction" >
+				<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+			</fmt:message>
+		</div>
+
+		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+			<div class="small-space-top">
+				<h2>
+					${sessionMap.reflectInstructions}
+				</h2>
+
+				<c:choose>
+					<c:when test="${empty sessionMap.reflectEntry}">
+						<p>
+							<em> <fmt:message key="message.no.reflection.available" />
+							</em>
+						</p>
+					</c:when>
+					<c:otherwise>
+						<p>
+							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+						</p>
+					</c:otherwise>
+				</c:choose>
+
+				<html:button property="ContinueButton"
+					onclick="return continueReflect()" styleClass="button">
+					<fmt:message key="label.edit" />
+				</html:button>
+			</div>
+		</c:if>
+
+
+		<div class="space-bottom-top align-right">
+			<c:choose>
+				<c:when
+					test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+					<html:link href="#nogo" property="FinishButton"
+						onclick="return continueReflect()" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:link>
+				</c:when>
+				<c:otherwise>
+					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
+						onclick="return finishSession()" styleClass="button">
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
+					</html:link>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	<!--closes footer-->
+</body>
+</lams:html>
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_survey/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -ree0e5932cc01fa7dca855f20f19e8feaad60e418 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision ee0e5932cc01fa7dca855f20f19e8feaad60e418)
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -37,18 +37,16 @@
 	<div id="header">
 		<lams:Tabs>
 			<lams:Tab id="1" key="monitoring.tab.summary" />
-			<lams:Tab id="2" key="monitoring.tab.instructions" />
-			<lams:Tab id="3" key="monitoring.tab.edit.activity" />			
-			<lams:Tab id="4" key="monitoring.tab.statistics" />
+			<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
+			<lams:Tab id="3" key="monitoring.tab.statistics" />
 		</lams:Tabs>
 	</div>
 	<div id="content">
 			<lams:help toolSignature="<%= SurveyConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 	
 			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
-			<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
+			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
 	</div>
 	<div id="footer"></div>
 	
Index: lams_tool_task/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rc142236c124ecebfa9f29ea91c71759c579e1c61 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
+++ lams_tool_task/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -38,41 +38,6 @@
 			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
 		</action>
 		
-		<!-- ==========  Authoring Definitions: Instructions Files ========== -->
-		
-		<action path="/authoring/uploadOnlineFile"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
-			name="taskListForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOnlineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/uploadOfflineFile"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
-			name="taskListForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadOfflineFile">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
-		</action>
-		<action path="/authoring/deleteOnlineFile"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
-			name="taskListForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOnlineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
-		<action path="/authoring/deleteOfflineFile"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
-			name="taskListForm" 
-			scope="request" 
-			validate="false"
-			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
-		</action>
-		
 		<!-- ==========  Authoring Definitions: Add taskListItem methods ========== -->
 		
 		<action path="/authoring/newItemInit"
@@ -203,7 +168,7 @@
 			validate="false">
 			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
-			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
+			<forward name="submissionDeadline" path="/pages/learning/submissionDeadline.jsp" />			
 		</action>
 		<action path="/learning/completeItem"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
===================================================================
diff -u -rc142236c124ecebfa9f29ea91c71759c579e1c61 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -44,7 +44,6 @@
 	public static final String PARAM_SEQUENCE_ID = "sequenceId";
 	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
 	public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx";
-	public static final String PARAM_RUN_OFFLINE = "runOffline";
 	public static final String PARAM_OPEN_URL_POPUP = "popupUrl";
 	public static final String PARAM_TITLE = "title";
 	
@@ -53,11 +52,8 @@
 	public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; 
 	public static final String ATTR_RESOURCE_ITEM_LIST = "taskListList";
 	public static final String ATTR_CONDITION_LIST = "conditionList";
-	public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
 	public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteTaskListList";
 	public static final String ATTR_DELETED_CONDITION_LIST = "deleteConditionList";
-	public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
-	public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST =  "deletedItemAttachmmentList";;
 	public static final String ATT_LEARNING_OBJECT = "cpPackage";
 	public static final String ATTR_RESOURCE_REVIEW_URL = "taskListItemReviewUrl";
 	public static final String ATTR_RESOURCE = "taskList";
@@ -87,7 +83,7 @@
 	public static final String ATTR_TASK_LIST_ITEM_DTOS = "itemDTOs";
 	public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
 	
-	//  for submission deadline LDEV-2657
+	//  for submission deadline
 	public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
 	public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
 	
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java
===================================================================
diff -u -r12a0e5152335f664f19ad5b1449633f7fec6b8a9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java	(.../TaskListItemVisitDAO.java)	(revision 12a0e5152335f664f19ad5b1449633f7fec6b8a9)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java	(.../TaskListItemVisitDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.taskList.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog;
 
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListAttachmentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java
===================================================================
diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java	(.../TaskListConditionDAOHibernate.java)	(revision 0e7e464ded505f35e6ade3811f3f74658668e13a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java	(.../TaskListConditionDAOHibernate.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,7 +23,6 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.taskList.dao.hibernate;  
 
-import org.lamsfoundation.lams.tool.taskList.dao.TaskListAttachmentDAO;
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO;
  
 /**
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java
===================================================================
diff -u -r12a0e5152335f664f19ad5b1449633f7fec6b8a9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java	(.../TaskListItemVisitDAOHibernate.java)	(revision 12a0e5152335f664f19ad5b1449633f7fec6b8a9)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java	(.../TaskListItemVisitDAOHibernate.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,14 +23,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.taskList.dao.hibernate;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO;
-import org.lamsfoundation.lams.tool.taskList.model.TaskList;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 
 /**
  * Hibernate implementation of <code>TaskListItemVisitDAO</code>.
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,19 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
+ALTER TABLE tl_latask10_taskList DROP COLUMN online_instructions;
+ALTER TABLE tl_latask10_taskList DROP COLUMN offline_instructions;
+ALTER TABLE tl_latask10_taskList DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_latask10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='latask10';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java
===================================================================
diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java	(.../GroupSummary.java)	(revision 3f118a66718ff89ec94041602e7e60db6ee06722)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java	(.../GroupSummary.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,8 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
-
 /**
  * DTO object used in a monitoring. Contains information for group.
  * 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java
===================================================================
diff -u -r5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java	(.../TasListItemDTO.java)	(revision 5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java	(.../TasListItemDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,16 +23,12 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.taskList.dto;  
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemComment;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 
 /**
  * DTO object which contains data for displaying learning stuff. 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -rc142236c124ecebfa9f29ea91c71759c579e1c61 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,21 +23,15 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.taskList.model;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.taskList.util.TaskListToolContentHandler;
 
 /**
  * The main entity class of TaskList tool. Contains all the data related to the whole tool.
@@ -65,17 +59,10 @@
 	private boolean allowContributeTasks;
 	private boolean monitorVerificationRequired;
 
-	private boolean runOffline;
 	private boolean defineLater;
 	private boolean contentInUse;
-	
-	// LDEV-2657
 	private Date submissionDeadline;
 	
-	//instructions
-	private String onlineInstructions;
-	private String offlineInstructions;
-	private Set attachments;
 	//conditions
 	private Set conditions;
 	
@@ -91,17 +78,12 @@
 	private String reflectInstructions;
 	
 	//*************** NON Persist Fields ********************
-	private IToolContentHandler toolContentHandler;
-
-	private List<TaskListAttachment> onlineFileList;
-	private List<TaskListAttachment> offlineFileList;
 	private String minimumNumberTasksErrorStr; 
 	
 	/**
 	 * Default contructor. 
 	 */
   	public TaskList(){
-  		attachments = new HashSet();
   		conditions = new HashSet();
   		taskListItems = new HashSet();
   	}
@@ -110,9 +92,8 @@
   	//		Function method for TaskList
   	//  **********************************************************
   	
-	public static TaskList newInstance(TaskList defaultContent, Long contentId, TaskListToolContentHandler taskListToolContentHandler) {
+	public static TaskList newInstance(TaskList defaultContent, Long contentId) {
 		TaskList toContent = new TaskList();
-		defaultContent.toolContentHandler = taskListToolContentHandler;
 		toContent = (TaskList) defaultContent.clone();
 		toContent.setContentId(contentId);
 		
@@ -147,20 +128,6 @@
   				taskList.taskListItems = set;
   			}
   			
-  			//clone attachment
-  			if(attachments != null){
-  				Iterator iter = attachments.iterator();
-  				Set set = new HashSet();
-  				while(iter.hasNext()){
-  					TaskListAttachment file = (TaskListAttachment)iter.next(); 
-  					TaskListAttachment newFile = (TaskListAttachment) file.clone();
-  					//just clone old file without duplicate it in repository
-  					
-					set.add(newFile);
-  				}
-  				taskList.attachments = set;
-  			}
-  			
   			//clone conditions
   			if(conditions != null){
   				
@@ -219,8 +186,6 @@
       	.append(this.uid,genericEntity.uid)
       	.append(this.title,genericEntity.title)
       	.append(this.instructions,genericEntity.instructions)
-      	.append(this.onlineInstructions,genericEntity.onlineInstructions)
-      	.append(this.offlineInstructions,genericEntity.offlineInstructions)
       	.append(this.created,genericEntity.created)
       	.append(this.updated,genericEntity.updated)
       	.append(this.createdBy,genericEntity.createdBy)
@@ -229,8 +194,7 @@
 
 	public int hashCode() {
 		return new HashCodeBuilder().append(uid).append(title)
-		.append(instructions).append(onlineInstructions)
-		.append(offlineInstructions).append(created)
+		.append(instructions).append(created)
 		.append(updated).append(createdBy)
 		.toHashCode();
 	}
@@ -246,23 +210,6 @@
 		}
 		this.setUpdated(new Date(now));
 	}
-
-	/**
-	 * Method to support exporting.
-	 */
-	public void toDTO(){
-		onlineFileList = new ArrayList<TaskListAttachment>();
-		offlineFileList = new ArrayList<TaskListAttachment>();
-		Set<TaskListAttachment> fileSet = this.getAttachments();
-		if(fileSet != null){
-			for(TaskListAttachment file:fileSet){
-				if(StringUtils.equalsIgnoreCase(file.getFileType(),IToolContentHandler.TYPE_OFFLINE))
-					offlineFileList.add(file);
-				else
-					onlineFileList.add(file);
-			}
-		}
-	}
 	
 	//**********************************************************
 	// Get/set methods
@@ -366,26 +313,6 @@
 		this.title = title;
 	}
 
-	/**
-	 *  Returns either the tasklist should run offline.
-	 * 
-	 * @return runOffline flag
-	 *
-	 * @hibernate.property 
-	 * 		column="run_offline"
-	 */
-	public boolean getRunOffline() {
-		return runOffline;
-	}
-	/**
-	 * Sets if the tasklist should run offline.
-	 * 
-	 * @param runOffline The forceOffLine to set.
-	 */
-	public void setRunOffline(boolean forceOffline) {
-		this.runOffline = forceOffline;
-	}
-
     /**
      * Returns tasklist instructions set by teacher.
      * 
@@ -406,73 +333,6 @@
     public void setInstructions(String instructions) {
         this.instructions = instructions;
     }
-
-    /**
-     * Returns tasklist onlineInstructions set by teacher.
-     * 
-     * @return tasklist onlineInstructions set by teacher
-     *
-     * @hibernate.property
-     * 		column="online_instructions"
-     *      type="text"
-     */
-    public String getOnlineInstructions() {
-        return onlineInstructions;
-    }
-    /**
-     * Sets tasklist instructions. Usually done by teacher.
-     * 
-     * @param onlineInstructions tasklist onlineInstructions
-     */
-    public void setOnlineInstructions(String onlineInstructions) {
-        this.onlineInstructions = onlineInstructions;
-    }
-
-    /**
-     * Returns tasklist offlineInstructions set by teacher.
-     * 
-     * @return tasklist offlineInstructions set by teacher
-     *
-     * @hibernate.property
-     * 		column="offline_instructions"
-     *      type="text"
-     */
-    public String getOfflineInstructions() {
-        return offlineInstructions;
-    }
-    /**
-     * Sets tasklist offlineInstructions. Usually done by teacher.
-     * 
-     * @param instructions tasklist offlineInstructions
-     */
-    public void setOfflineInstructions(String offlineInstructions) {
-        this.offlineInstructions = offlineInstructions;
-    }
-
-	/**
-	 * Returns a set of Attachments belong to this tasklist.
-     *
-     * @return a set of Attachments belong to this tasklist.
-     *
-     * @hibernate.set   lazy="true"
-     * 					cascade="all"
-     * 					inverse="false"
-     * 					order-by="create_date desc"
-     * @hibernate.collection-key column="taskList_uid"
-     * @hibernate.collection-one-to-many
-     * 			class="org.lamsfoundation.lams.tool.taskList.model.TaskListAttachment"
-     */
-	public Set getAttachments() {
-		return attachments;
-	}
-    /**
-     * Sets a set of Attachments belong to this tasklist
-     * 
-     * @param attachments The attachments to set
-     */
-    public void setAttachments(Set attachments) {
-		this.attachments = attachments;
-	}
     
 	/**
 	 * Returns a set of conditions belong to this tasklist.
@@ -708,29 +568,7 @@
 	public void setSubmissionDeadline(Date submissionDeadline) {
 		this.submissionDeadline = submissionDeadline;
 	}
-
-	/**
-	 * For display use
-	 * @return
-	 */
-	public List<TaskListAttachment> getOfflineFileList() {
-		return offlineFileList;
-	}
-	public void setOfflineFileList(List<TaskListAttachment> offlineFileList) {
-		this.offlineFileList = offlineFileList;
-	}
 	
-	public List<TaskListAttachment> getOnlineFileList() {
-		return onlineFileList;
-	}
-	public void setOnlineFileList(List<TaskListAttachment> onlineFileList) {
-		this.onlineFileList = onlineFileList;
-	}
-	
-	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
-	}
-	
 	/**
 	 * Returns the number of tasks needed to be completed to finish this activity.
 	 * 
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java
===================================================================
diff -u -r721fa349b42e0b7e2ae19d60756fea47146bfdd4 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	(.../TaskListCondition.java)	(revision 721fa349b42e0b7e2ae19d60756fea47146bfdd4)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	(.../TaskListCondition.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,19 +23,10 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.taskList.model;  
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.taskList.util.TaskListToolContentHandler;
  
 /**
  * The main entity class of TaskList tool. Contains all the data related to the whole tool.
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
===================================================================
diff -u -r0d23815a0217cc440544b56c2a964cef24d7de50 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 0d23815a0217cc440544b56c2a964cef24d7de50)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -24,24 +24,13 @@
 package org.lamsfoundation.lams.tool.taskList.service;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
 
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.tool.ToolOutputDefinition;
-import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
-import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.taskList.dto.TaskListItemVisitLogSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListAttachment;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListCondition;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
@@ -105,27 +94,16 @@
 	 */
 	List getAuthoredItems(Long taskListUid);
 	
-	/**
-	 * Upload instruciton file into repository.
-	 * 
-	 * @param file
-	 * @param type
-	 * @return
-	 * @throws UploadTaskListFileException
-	 */
-	TaskListAttachment uploadInstructionFile(FormFile file, String type) throws UploadTaskListFileException;
 	
-	
 	/**
 	 * Upload tasklistItem file to repository.
 	 * 
 	 * @param uploadFile
-	 * @param fileType
 	 * @param userLogin
 	 * @return
 	 * @throws UploadTaskListFileException
 	 */
-	TaskListItemAttachment uploadTaskListItemFile(FormFile uploadFile, String fileType, TaskListUser user) throws UploadTaskListFileException; 
+	TaskListItemAttachment uploadTaskListItemFile(FormFile uploadFile, TaskListUser user) throws UploadTaskListFileException; 
 	
 	/**
 	 * Returns Message service. It makes available to have access to message resources files. 
@@ -183,14 +161,6 @@
 	TaskListUser getUser(Long uid);
 
 	//********** Repository methods ***********************
-	/**
-	 * Delete file from the repository.
-	 * 
-	 * @param fileUuid
-	 * @param fileVersionId
-	 * @throws TaskListException
-	 */
-	void deleteFromRepository(Long fileUuid, Long fileVersionId) throws TaskListException ;
 
 	/**
 	 * Save or update taskList into database.
@@ -200,14 +170,6 @@
 	void saveOrUpdateTaskList(TaskList TaskList);
 	
 	/**
-	 * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not
-	 * delete the file from repository.
-	 * 
-	 * @param attachmentUid
-	 */
-	void deleteTaskListAttachment(Long attachmentUid);
-	
-	/**
 	 * Delete resoruce item from database.
 	 * 
 	 * @param uid
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListImportContentVersionFilter.java
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListImportContentVersionFilter.java	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListImportContentVersionFilter.java	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,43 @@
+/**************************************************************** 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.taskList.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.taskList.model.TaskList;
+
+/**
+ * Import filter class for different version of TaskList content.
+ */
+public class TaskListImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20110510 version content to 20140102 version tool server.
+     */
+    public void up20110510To20140102() {
+	this.removeField(TaskList.class, "runOffline");
+	this.removeField(TaskList.class, "onlineInstructions");
+	this.removeField(TaskList.class, "offlineInstructions");
+	this.removeField(TaskList.class, "attachments");
+    }
+}
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -r33da76d05725a84e191a5f6dca50b394cca3c1ee -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 33da76d05725a84e191a5f6dca50b394cca3c1ee)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,13 +23,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.taskList.service;
 
-import java.io.File;
-import java.io.FileFilter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -40,17 +37,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
-import org.lamsfoundation.lams.contentrepository.ICredentials;
-import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
-import org.lamsfoundation.lams.contentrepository.LoginException;
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
-import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -69,7 +58,6 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
-import org.lamsfoundation.lams.tool.taskList.dao.TaskListAttachmentDAO;
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO;
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListDAO;
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemAttachmentDAO;
@@ -84,7 +72,6 @@
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
 import org.lamsfoundation.lams.tool.taskList.dto.TaskListItemVisitLogSummary;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListAttachment;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListCondition;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment;
@@ -97,7 +84,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * Class implements <code>org.lamsfoundation.lams.tool.taskList.service.ITaskListService</code>.
@@ -111,7 +97,6 @@
     static Logger log = Logger.getLogger(TaskListServiceImpl.class.getName());
     private TaskListDAO taskListDao;
     private TaskListItemDAO taskListItemDao;
-    private TaskListAttachmentDAO taskListAttachmentDao;
     private TaskListConditionDAO taskListConditionDAO;
     private TaskListUserDAO taskListUserDao;
     private TaskListSessionDAO taskListSessionDao;
@@ -123,10 +108,8 @@
     private MessageService messageService;
     private TaskListOutputFactory taskListOutputFactory;
     // system services
-    private IRepositoryService repositoryService;
     private ILamsToolService toolService;
     private ILearnerService learnerService;
-    private IAuditService auditService;
     private IUserManagementService userManagementService;
     private IExportToolContentService exportContentService;
     private ICoreNotebookService coreNotebookService;
@@ -159,7 +142,7 @@
 	TaskList defaultContent = getDefaultTaskList();
 	// save default content by given ID.
 	TaskList content = new TaskList();
-	content = TaskList.newInstance(defaultContent, contentId, taskListToolContentHandler);
+	content = TaskList.newInstance(defaultContent, contentId);
 	return content;
     }
 
@@ -173,43 +156,18 @@
     /**
      * {@inheritDoc}
      */
-    public TaskListAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
+    public TaskListItemAttachment uploadTaskListItemFile(FormFile uploadFile, TaskListUser user)
 	    throws UploadTaskListFileException {
 	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
 	    throw new UploadTaskListFileException(messageService.getMessage("error.msg.upload.file.not.found",
 		    new Object[] { uploadFile }));
 	}
 
 	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
+	NodeKey nodeKey = processFile(uploadFile);
 
 	// create new attachement
-	TaskListAttachment file = new TaskListAttachment();
-	file.setFileType(fileType);
-	file.setFileUuid(nodeKey.getUuid());
-	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getFileName());
-	file.setCreated(new Date());
-
-	return file;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public TaskListItemAttachment uploadTaskListItemFile(FormFile uploadFile, String fileType, TaskListUser user)
-	    throws UploadTaskListFileException {
-	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadTaskListFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
-
-	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
-
-	// create new attachement
 	TaskListItemAttachment file = new TaskListItemAttachment();
-	file.setFileType(fileType);
 	file.setFileUuid(nodeKey.getUuid());
 	file.setFileVersionId(nodeKey.getVersion());
 	file.setFileName(uploadFile.getFileName());
@@ -250,33 +208,13 @@
     /**
      * {@inheritDoc}
      */
-    public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws TaskListException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, fileUuid, fileVersionId);
-	} catch (Exception e) {
-	    throw new TaskListException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public void saveOrUpdateTaskList(TaskList taskList) {
 	taskListDao.saveObject(taskList);
     }
 
     /**
      * {@inheritDoc}
      */
-    public void deleteTaskListAttachment(Long attachmentUid) {
-	taskListAttachmentDao.removeObject(TaskListAttachment.class, attachmentUid);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public void deleteTaskListCondition(Long conditionUid) {
 	taskListConditionDAO.removeObject(TaskListCondition.class, conditionUid);
     }
@@ -710,10 +648,6 @@
     // Set methods for Spring Bean
     // *****************************************************************************
 
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
-
     public void setLearnerService(ILearnerService learnerService) {
 	this.learnerService = learnerService;
     }
@@ -730,14 +664,10 @@
 	this.taskListOutputFactory = taskListOutputFactory;
     }
 
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
+    public void setTaskListAttachmentDao(TaskListItemAttachmentDAO taskListItemAttachmentDao) {
+	this.taskListItemAttachmentDao = taskListItemAttachmentDao;
     }
 
-    public void setTaskListAttachmentDao(TaskListAttachmentDAO taskListAttachmentDao) {
-	this.taskListAttachmentDao = taskListAttachmentDao;
-    }
-
     public void setTaskListConditionDao(TaskListConditionDAO taskListConditionDAO) {
 	this.taskListConditionDAO = taskListConditionDAO;
     }
@@ -822,19 +752,14 @@
 	}
 
 	// set TaskListToolContentHandler as null to avoid copy file node in repository again.
-	toolContentObj = TaskList.newInstance(toolContentObj, toolContentId, null);
-	toolContentObj.setToolContentHandler(null);
-	toolContentObj.setOfflineFileList(null);
-	toolContentObj.setOnlineFileList(null);
+	toolContentObj = TaskList.newInstance(toolContentObj, toolContentId);
 	Set<TaskListItem> taskListItems = toolContentObj.getTaskListItems();
 	for (TaskListItem taskListItem : taskListItems) {
 	    taskListItem.setComments(null);
 	    taskListItem.setAttachments(null);
 	}
 
 	try {
-	    exportContentService.registerFileClassForExport(TaskListAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, taskListToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -848,9 +773,9 @@
 	    String toVersion) throws ToolException {
 
 	try {
-	    exportContentService.registerFileClassForImport(TaskListAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(TaskListImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, taskListToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof TaskList)) {
@@ -927,7 +852,7 @@
 	    }
 	}
 
-	TaskList toContent = TaskList.newInstance(taskList, toContentId, taskListToolContentHandler);
+	TaskList toContent = TaskList.newInstance(taskList, toContentId);
 	taskListDao.saveObject(toContent);
 
 	// save taskList items as well
@@ -944,28 +869,6 @@
     /**
      * {@inheritDoc}
      */
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	TaskList taskList = taskListDao.getByContentId(toolContentId);
-	if (taskList == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	taskList.setDefineLater(value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	TaskList taskList = taskListDao.getByContentId(toolContentId);
-	if (taskList == null) {
-	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
-	}
-	taskList.setRunOffline(value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	TaskList taskList = taskListDao.getByContentId(toolContentId);
@@ -1166,13 +1069,12 @@
      * @throws RepositoryCheckedException
      * @throws InvalidParameterException
      */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadTaskListFileException {
+    private NodeKey processFile(FormFile file) throws UploadTaskListFileException {
 	NodeKey node = null;
 	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
 	    String fileName = file.getFileName();
 	    try {
-		node = taskListToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			fileType);
+		node = taskListToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType());
 	    } catch (InvalidParameterException e) {
 		throw new UploadTaskListFileException(messageService.getMessage("error.msg.invaid.param.upload"));
 	    } catch (FileNotFoundException e) {
@@ -1186,128 +1088,10 @@
 	return node;
     }
 
-    private NodeKey processPackage(String packageDirectory, String initFile) throws UploadTaskListFileException {
-	NodeKey node = null;
-	try {
-	    node = taskListToolContentHandler.uploadPackage(packageDirectory, initFile);
-	} catch (InvalidParameterException e) {
-	    throw new UploadTaskListFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	} catch (RepositoryCheckedException e) {
-	    throw new UploadTaskListFileException(messageService.getMessage("error.msg.repository"));
-	}
-	return node;
-    }
-
-    /**
-     * Find out default.htm/html or index.htm/html in the given directory folder
-     * 
-     * @param packageDirectory
-     * @return
-     */
-    private String findWebsiteInitialItem(String packageDirectory) {
-	File file = new File(packageDirectory);
-	if (!file.isDirectory()) {
-	    return null;
-	}
-
-	File[] initFiles = file.listFiles(new FileFilter() {
-	    public boolean accept(File pathname) {
-		if (pathname == null || pathname.getName() == null) {
-		    return false;
-		}
-		String name = pathname.getName();
-		if (name.endsWith("default.html") || name.endsWith("default.htm") || name.endsWith("index.html")
-			|| name.endsWith("index.htm")) {
-		    return true;
-		}
-		return false;
-	    }
-	});
-	if (initFiles != null && initFiles.length > 0) {
-	    return initFiles[0].getName();
-	} else {
-	    return null;
-	}
-    }
-
-    private class ReflectDTOComparator implements Comparator<ReflectDTO> {
-	public int compare(ReflectDTO o1, ReflectDTO o2) {
-
-	    if (o1 != null && o2 != null) {
-		return o1.getFullName().compareTo(o2.getFullName());
-	    } else if (o1 != null) {
-		return 1;
-	    } else {
-		return -1;
-	    }
-	}
-    }
-
     // *******************************************************************************
     // Service method
     // *******************************************************************************
-    /**
-     * Try to get the file. If forceLogin = false and an access denied exception occurs, call this method again to get a
-     * new ticket and retry file lookup. If forceLogin = true and it then fails then throw exception.
-     * 
-     * @param uuid
-     * @param versionId
-     * @param relativePath
-     * @param attemptCount
-     * @return file node
-     * @throws ImscpApplicationException
-     */
-    private IVersionedNode getFile(Long uuid, Long versionId, String relativePath) throws TaskListException {
 
-	ITicket tic = getRepositoryLoginTicket();
-
-	try {
-	    return repositoryService.getFileItem(tic, uuid, versionId, relativePath);
-	} catch (AccessDeniedException e) {
-
-	    String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId
-		    + " path " + relativePath + ".";
-
-	    error = error + "AccessDeniedException: " + e.getMessage() + " Unable to retry further.";
-	    TaskListServiceImpl.log.error(error);
-	    throw new TaskListException(error, e);
-
-	} catch (Exception e) {
-
-	    String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId
-		    + " path " + relativePath + "." + " Exception: " + e.getMessage();
-	    TaskListServiceImpl.log.error(error);
-	    throw new TaskListException(error, e);
-
-	}
-    }
-
-    /**
-     * This method verifies the credentials of the TaskList Tool and gives it the <code>Ticket</code> to login and
-     * access the Content Repository.
-     * 
-     * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
-     * the tool needs to upload/download files from the content repository.
-     * 
-     * @return ITicket The ticket for repostory access
-     * @throws TaskListException
-     */
-    private ITicket getRepositoryLoginTicket() throws TaskListException {
-	ICredentials credentials = new SimpleCredentials(taskListToolContentHandler.getRepositoryUser(),
-		taskListToolContentHandler.getRepositoryId());
-	try {
-	    ITicket ticket = repositoryService.login(credentials, taskListToolContentHandler
-		    .getRepositoryWorkspaceName());
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new TaskListException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new TaskListException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new TaskListException("Login failed." + e.getMessage());
-	}
-    }
-
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getTaskListOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -32,12 +32,6 @@
             <ref bean="coreSessionFactory"/>
         </property>
     </bean>
-
-   <bean id="lataskTaskListAttachmentDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListAttachmentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>
     
     <bean id="lataskTaskListConditionDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListConditionDAOHibernate">
         <property name="sessionFactory">
@@ -73,9 +67,6 @@
         <property name="taskListItemVisitDao">
             <ref local="lataskTaskListItemVisitDao"/>
         </property>
-        <property name="taskListAttachmentDao">
-            <ref local="lataskTaskListAttachmentDao"/>
-        </property>
         <property name="taskListConditionDao">
             <ref local="lataskTaskListConditionDao"/>
         </property>
@@ -88,18 +79,12 @@
         <property name="taskListToolContentHandler">
             <ref local="lataskTaskListToolContentHandler"/>
         </property>
-        <property name="repositoryService">
-            <ref bean="repositoryService"/>
-        </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
@@ -125,9 +110,7 @@
                 <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-				<prop key="get*">PROPAGATION_REQUIRED, -java.lang.Exception</prop>                
-                <prop key="setAsDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="setAsRunOffline">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+				<prop key="get*">PROPAGATION_REQUIRED, -java.lang.Exception</prop>
                 <prop key="setItemComplete">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setItemVisible">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setItemAccess">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -27,7 +27,6 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -52,26 +51,21 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListAttachment;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListCondition;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
 import org.lamsfoundation.lams.tool.taskList.service.TaskListException;
-import org.lamsfoundation.lams.tool.taskList.service.UploadTaskListFileException;
 import org.lamsfoundation.lams.tool.taskList.util.TaskListConditionComparator;
 import org.lamsfoundation.lams.tool.taskList.util.TaskListItemComparator;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListForm;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListItemForm;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListPedagogicalPlannerForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -126,18 +120,6 @@
 	if (param.equals("updateContent")) {
 	    return updateContent(mapping, form, request, response);
 	}
-	if (param.equals("uploadOnlineFile")) {
-	    return uploadOnline(mapping, form, request, response);
-	}
-	if (param.equals("uploadOfflineFile")) {
-	    return uploadOffline(mapping, form, request, response);
-	}
-	if (param.equals("deleteOnlineFile")) {
-	    return deleteOnlineFile(mapping, form, request, response);
-	}
-	if (param.equals("deleteOfflineFile")) {
-	    return deleteOfflineFile(mapping, form, request, response);
-	}
 
 	// ----------------------- Add taskListItem methods ---------------------------
 	if (param.equals("newItemInit")) {
@@ -220,11 +202,6 @@
 	    }
 
 	    taskListForm.setTaskList(taskList);
-
-	    // initialize instruction attachment list
-	    List attachmentList = getAttachmentList(sessionMap);
-	    attachmentList.clear();
-	    attachmentList.addAll(taskList.getAttachments());
 	} catch (Exception e) {
 	    AuthoringAction.log.error(e);
 	    throw new ServletException(e);
@@ -361,45 +338,6 @@
 	}
 
 	taskListPO.setCreatedBy(taskListUser);
-
-	// **********************************Handle Authoring Instruction Attachement *********************
-	// merge attachment info
-	// so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
-	Set attPOSet = taskListPO.getAttachments();
-	if (attPOSet == null) {
-	    attPOSet = new HashSet();
-	}
-	List attachmentList = getAttachmentList(sessionMap);
-	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-
-	// current attachemnt in authoring instruction tab.
-	Iterator iter = attachmentList.iterator();
-	while (iter.hasNext()) {
-	    TaskListAttachment newAtt = (TaskListAttachment) iter.next();
-	    attPOSet.add(newAtt);
-	}
-	attachmentList.clear();
-
-	// deleted attachment. 2 possible types: one is persist another is non-persist before.
-	iter = deleteAttachmentList.iterator();
-	while (iter.hasNext()) {
-	    TaskListAttachment delAtt = (TaskListAttachment) iter.next();
-	    iter.remove();
-	    // it is an existed att, then delete it from current attachmentPO
-	    if (delAtt.getUid() != null) {
-		Iterator attIter = attPOSet.iterator();
-		while (attIter.hasNext()) {
-		    TaskListAttachment att = (TaskListAttachment) attIter.next();
-		    if (delAtt.getUid().equals(att.getUid())) {
-			attIter.remove();
-			break;
-		    }
-		}
-		service.deleteTaskListAttachment(delAtt.getUid());
-	    }// end remove from persist value
-	}
-	// copy back
-	taskListPO.setAttachments(attPOSet);
 	
 	// ************************* Handle taskList items *******************
 	Set itemList = new LinkedHashSet();
@@ -436,7 +374,7 @@
 	taskListPO.setConditions(conditions);
 
 	// delete TaskListConditions from database.
-	iter = delConditions.iterator();
+	Iterator iter = delConditions.iterator();
 	while (iter.hasNext()) {
 	    TaskListCondition condition = (TaskListCondition) iter.next();
 	    iter.remove();
@@ -470,9 +408,6 @@
 
 	service.getTaskListByContentId(taskListPO.getContentId());
 
-	// initialize attachmentList again
-	attachmentList = getAttachmentList(sessionMap);
-	attachmentList.addAll(taskList.getAttachments());
 	taskListForm.setTaskList(taskListPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
@@ -483,166 +418,6 @@
 	}
     }
 
-    /**
-     * Handle upload online instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadTaskListFileException
-     */
-    private ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadTaskListFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    /**
-     * Handle upload offline instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws UploadTaskListFileException
-     */
-    private ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws UploadTaskListFileException {
-	return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    /**
-     * Common method to upload online or offline instruction files request.
-     * 
-     * @param mapping
-     * @param form
-     * @param type
-     * @param request
-     * @return
-     * @throws UploadTaskListFileException
-     */
-    private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request)
-	    throws UploadTaskListFileException {
-
-	TaskListForm taskListForm = (TaskListForm) form;
-	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(taskListForm.getSessionMapID());
-
-	FormFile file;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = taskListForm.getOfflineFile();
-	} else {
-	    file = taskListForm.getOnlineFile();
-	}
-
-	if (file == null || StringUtils.isBlank(file.getFileName())) {
-	    return mapping.findForward(TaskListConstants.SUCCESS);
-	}
-
-	// validate file size
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    this.saveErrors(request, errors);
-	    return mapping.findForward(TaskListConstants.SUCCESS);
-	}
-
-	ITaskListService service = getTaskListService();
-	// upload to repository
-	TaskListAttachment att = service.uploadInstructionFile(file, type);
-	// handle session value
-	List attachmentList = getAttachmentList(sessionMap);
-	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-	// first check exist attachment and delete old one (if exist) to deletedAttachmentList
-	Iterator iter = attachmentList.iterator();
-	TaskListAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (TaskListAttachment) iter.next();
-	    if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
-		    && StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
-		// if there is same name attachment, delete old one
-		deleteAttachmentList.add(existAtt);
-		iter.remove();
-		break;
-	    }
-	}
-	// add to attachmentList
-	attachmentList.add(att);
-
-	return mapping.findForward(TaskListConstants.SUCCESS);
-
-    }
-
-    /**
-     * Delete offline instruction file from current TaskList authoring page.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, request, response, form, IToolContentHandler.TYPE_OFFLINE);
-    }
-
-    /**
-     * Delete online instruction file from current TaskList authoring page.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, request, response, form, IToolContentHandler.TYPE_ONLINE);
-    }
-
-    /**
-     * General method to delete file (online or offline)
-     * 
-     * @param mapping
-     * @param request
-     * @param response
-     * @param form
-     * @param type
-     * @return
-     */
-    private ActionForward deleteFile(ActionMapping mapping, HttpServletRequest request, HttpServletResponse response,
-	    ActionForm form, String type) {
-	Long versionID = new Long(WebUtil.readLongParam(request, TaskListConstants.PARAM_FILE_VERSION_ID));
-	Long uuID = new Long(WebUtil.readLongParam(request, TaskListConstants.PARAM_FILE_UUID));
-
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-
-	// handle session value
-	List attachmentList = getAttachmentList(sessionMap);
-	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-	// first check exist attachment and delete old one (if exist) to deletedAttachmentList
-	Iterator iter = attachmentList.iterator();
-	TaskListAttachment existAtt;
-	while (iter.hasNext()) {
-	    existAtt = (TaskListAttachment) iter.next();
-	    if (existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)) {
-		// if there is same name attachment, delete old one
-		deleteAttachmentList.add(existAtt);
-		iter.remove();
-	    }
-	}
-
-	request.setAttribute(TaskListConstants.ATTR_FILE_TYPE_FLAG, type);
-	request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(TaskListConstants.SUCCESS);
-
-    }
-
     // **********************************************************
     // Add taskListItem methods
     // **********************************************************
@@ -848,22 +623,6 @@
     }
 
     /**
-     * @param request
-     * @return
-     */
-    private List getAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, TaskListConstants.ATT_ATTACHMENT_LIST);
-    }
-
-    /**
-     * @param request
-     * @return
-     */
-    private List getDeletedAttachmentList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, TaskListConstants.ATTR_DELETED_ATTACHMENT_LIST);
-    }
-
-    /**
      * List save current taskList items.
      * 
      * @param request
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,14 +26,12 @@
 
 import java.io.IOException;
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.TimeZone;
+import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -51,7 +49,6 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionRedirect;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -63,7 +60,6 @@
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemComment;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
@@ -328,15 +324,8 @@
         	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
         		request, getServlet().getServletContext());
         	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
-
-		//add run offline support
-		if(taskList.getRunOffline()){
-			sessionMap.put(TaskListConstants.PARAM_RUN_OFFLINE, true);
-			return mapping.findForward("runOffline");
-		}else
-			sessionMap.put(TaskListConstants.PARAM_RUN_OFFLINE, false);
 		
-		//  check if there is submission deadline LDEV-2657
+		//  check if there is submission deadline
 		Date submissionDeadline = taskList.getSubmissionDeadline();
 		if (submissionDeadline != null) {
 			HttpSession ss = SessionManager.getSession();
@@ -346,9 +335,9 @@
 			Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
 			sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline);
 			
-			//calculate whether deadline has passed, and if so forward to "runOffline"
+			//calculate whether deadline has passed, and if so forward to "submissionDeadline"
 			if (currentLearnerDate.after(tzSubmissionDeadline)) {
-				return mapping.findForward("runOffline");
+				return mapping.findForward("submissionDeadline");
 			}
 			
 		}
@@ -574,7 +563,7 @@
 		ITaskListService service = getTaskListService();
 		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 		TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),sessionId);
-		TaskListItemAttachment  att = service.uploadTaskListItemFile(file, IToolContentHandler.TYPE_ONLINE, taskListUser);
+		TaskListItemAttachment  att = service.uploadTaskListItemFile(file, taskListUser);
 		
 		//persist TaskListItem changes in DB 
 		Long itemUid =  new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
@@ -727,9 +716,7 @@
 		int numberCompletedTasks = service.getNumTasksCompletedByUser(sessionId, userID);
 		int minimumNumberTasks = service.getTaskListBySessionId(sessionId).getMinimumNumberTasks();
 		//if current user view less than reqired view count number, then just return error message.
-		//if it is runOffline content, then need not check minimum view count
-		Boolean runOffline = (Boolean) sessionMap.get(TaskListConstants.PARAM_RUN_OFFLINE);
-		if((minimumNumberTasks - numberCompletedTasks) > 0 && !runOffline){
+		if((minimumNumberTasks - numberCompletedTasks) > 0){
 			ActionErrors errors = new ActionErrors();
 			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("lable.learning.minimum.view.number",minimumNumberTasks, numberCompletedTasks));
 			this.addErrors(request,errors);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
diff -u -rb9713d8a49fcc108d3835a3d675c490f9e687287 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision b9713d8a49fcc108d3835a3d675c490f9e687287)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -25,8 +25,8 @@
 package org.lamsfoundation.lams.tool.taskList.web.action;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 import java.util.TimeZone;
 
 import javax.servlet.ServletException;
@@ -43,21 +43,19 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
-import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.taskList.dto.TaskListItemVisitLogSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
-import org.lamsfoundation.lams.web.session.SessionManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -103,7 +101,6 @@
 
 		ITaskListService service = getTaskListService();
 		TaskList taskList = service.getTaskListByContentId(contentId);
-		taskList.toDTO();
 		
 		List<Summary> summaryList = service.getSummary(contentId);
 		
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListConditionForm.java
===================================================================
diff -u -rfe31f08d68bebdde45fb5597de931d532ce7aace -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListConditionForm.java	(.../TaskListConditionForm.java)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListConditionForm.java	(.../TaskListConditionForm.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.taskList.web.form;  
  
 import org.apache.struts.action.ActionForm;
-import org.apache.struts.upload.FormFile;
 import org.apache.struts.util.LabelValueBean;
 
 /**
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListForm.java
===================================================================
diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListForm.java	(.../TaskListForm.java)	(revision ac170eba5ee70135e473b3a5525d1743d0098bc8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListForm.java	(.../TaskListForm.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -77,7 +77,6 @@
 	    	taskList.setAllowContributeTasks(false);
 	    	taskList.setMonitorVerificationRequired(false);
 	    	taskList.setDefineLater(false);
-	    	taskList.setRunOffline(false);
 	    	taskList.setReflectOnActivity(false);
     	}
     }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
===================================================================
diff -u -rb33e717f9a734d318eefab07a17234f07c770c92 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -25,12 +25,8 @@
 
 package org.lamsfoundation.lams.tool.taskList.web.servlet;
 
-import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.List;
 
@@ -40,21 +36,13 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
 import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
-import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.taskList.dto.Summary;
 import org.lamsfoundation.lams.tool.taskList.dto.TaskListItemVisitLogSummary;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
 import org.lamsfoundation.lams.tool.taskList.service.TaskListException;
@@ -112,29 +100,6 @@
 
 		return FILENAME;
 	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
-        if (toolContentID == null && toolSessionID == null) {
-            logger.error("Tool content Id or and session Id are null. Unable to activity title");
-        } else {
-        	ITaskListService service = TaskListServiceProxy.getTaskListService(getServletContext());
-        	TaskList content = null;
-            if ( toolContentID != null ) {
-            	content = service.getTaskListByContentId(toolContentID);
-            } else {
-            	TaskListSession session=service.getTaskListSessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getTaskList();
-            }
-            if ( content != null ) {
-            	activityTitle = content.getTitle();
-            }
-        }
-        return super.doOfflineExport(request, response, directoryName, cookies);
-	}
 
 	/**
 	 * Internal method to make an export for specified learner.
Index: lams_tool_task/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rd4749f70eef0ca437b7d9040576e3f8152b6b4e9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d4749f70eef0ca437b7d9040576e3f8152b6b4e9)
+++ lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -29,27 +29,15 @@
 	    	// end optional tab controller stuff
 	    	
 	    	//if we're leaving Condition tab its addCondition area should be closed
-	    	if (tabId != 4)	window.parent.hideConditionMessage();
+	    	if (tabId != 3)	window.parent.hideConditionMessage();
 	    	
 	    	selectTab(tabId);
 	    	
 	    	//for advanceTab
 	    	if(tabId == 2)
 	    		changeMinTasks(-1);
-        } 
-
-        function doUploadOnline() {
-        	var myForm = $("authoringForm");
-        	myForm.action = "<c:url value='/authoring/uploadOnlineFile.do'/>";
-        	myForm.submit();
         }
         
-        function doUploadOffline() {
-        	var myForm = $("authoringForm");
-        	myForm.action = "<c:url value='/authoring/uploadOfflineFile.do'/>";
-        	myForm.submit();
-        }
-        
         function changeMinTasks(initVal){
 			var tb = document.getElementById("itemTable");
 			var num = tb.getElementsByTagName("tr");
@@ -94,8 +82,7 @@
 		<lams:Tabs useKey="true" control="true">
 			<lams:Tab id="1" key="label.authoring.heading.basic" />
 			<lams:Tab id="2" key="label.authoring.heading.advance" />
-			<lams:Tab id="3" key="label.authoring.heading.instructions" />
-			<lams:Tab id="4" key="label.authoring.heading.conditions" />
+			<lams:Tab id="3" key="label.authoring.heading.conditions" />
 		</lams:Tabs></div>
 		<!-- start tabs -->
 <div id="content">
@@ -120,14 +107,10 @@
 			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
 			<!-- end of content (Advanced) -->
 
-			<!-- tab content 3 (Instructions) -->
-			<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
+			<!-- tab content 3 (Conditions) -->
+			<lams:TabBody id="3" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
 			<!-- end of content (Instructions) -->
 
-			<!-- tab content 4 (Conditions) -->
-			<lams:TabBody id="4" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
-			<!-- end of content (Instructions) -->
-
 			<!-- Button Row -->
 			<%--  Default value 
 				cancelButtonLabelKey="label.authoring.cancel.button"
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/web/pages/learning/runoffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u
--- lams_tool_task/web/pages/learning/submissionDeadline.jsp	(revision 0)
+++ lams_tool_task/web/pages/learning/submissionDeadline.jsp	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,93 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<lams:html>
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+
+	<script type="text/javascript">
+	<!--
+		function finishSession(){
+			document.getElementById("finishButton").disabled = true;
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
+			return false;
+		}
+		function continueReflect(){
+			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+		}
+		
+	-->        
+    </script>
+</lams:head>
+
+<body class="stripes">
+	<div id="content">
+		<h1>
+			${sessionMap.title}
+		</h1>
+
+		<div class="warning">
+			<fmt:message key="authoring.info.teacher.set.restriction" >
+				<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+			</fmt:message>
+		</div>	
+		
+		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+			<div class="small-space-top">
+				<h2>${sessionMap.reflectInstructions}</h2>
+			
+				<c:choose>
+					<c:when test="${empty sessionMap.reflectEntry}">
+						<p>
+							<em>
+								<fmt:message key="message.no.reflection.available" />
+							</em>
+						</p>
+					</c:when>
+					<c:otherwise>
+						<p> <lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />  </p>				
+					</c:otherwise>
+				</c:choose>
+				
+				<html:button property="FinishButton"
+					onclick="return continueReflect()" styleClass="button">
+					<fmt:message key="label.edit" />
+				</html:button>											
+			</div>
+		</c:if>
+
+		<div class="space-bottom-top align-right">
+			<c:choose>
+				<c:when
+					test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+					<html:link href="#nogo" property="FinishButton"
+						onclick="return continueReflect()" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:link>
+				</c:when>
+				<c:otherwise>
+					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
+						onclick="return finishSession()" styleClass="button">
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${sessionMap.activityPosition.last}">
+									<fmt:message key="label.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.finished" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</html:link>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	<div id="footer">
+	</div>
+	<!--closes footer-->
+
+</body>
+</lams:html>
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r341a816804f6b2b61a5f180479b56d8fd0d1ea29 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 341a816804f6b2b61a5f180479b56d8fd0d1ea29)
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -33,18 +33,16 @@
 	<div id="header">
 		<lams:Tabs>
 			<lams:Tab id="1" key="monitoring.tab.summary" />
-			<lams:Tab id="2" key="monitoring.tab.instructions" />
-			<lams:Tab id="3" key="monitoring.tab.edit.activity" />			
-			<lams:Tab id="4" key="monitoring.tab.statistics" />
+			<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
+			<lams:Tab id="3" key="monitoring.tab.statistics" />
 		</lams:Tabs>
 	</div>
 	<div id="content">
 			<lams:help toolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 	
 			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
-			<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
-			<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-			<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
+			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
 	</div>
 	<div id="footer"></div>
 	
Index: lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties	(.../lams_tool_lavideoRecorder11-prefs.properties)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties	(.../lams_tool_lavideoRecorder11-prefs.properties)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -44,8 +44,6 @@
 hibernate.tables.tl_lavidr10_videoRecorder.columns.offline_instructions.java-type=java.lang.String
 hibernate.tables.tl_lavidr10_videoRecorder.columns.online_instructions.java-name=onlineInstructions
 hibernate.tables.tl_lavidr10_videoRecorder.columns.online_instructions.java-type=java.lang.String
-hibernate.tables.tl_lavidr10_videoRecorder.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lavidr10_videoRecorder.columns.run_offline.java-type=java.lang.Boolean
 hibernate.tables.tl_lavidr10_videoRecorder.columns.title.inctostring=true
 hibernate.tables.tl_lavidr10_videoRecorder.columns.title.java-name=title
 hibernate.tables.tl_lavidr10_videoRecorder.columns.title.java-type=java.lang.String
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderDAO.java
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderDAO.java	(.../IVideoRecorderDAO.java)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderDAO.java	(.../IVideoRecorderDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -37,8 +37,6 @@
 
     void saveOrUpdate(VideoRecorder toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
     void releaseFromCache(Object o);
 
 }
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java	(.../VideoRecorderDAO.java)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java	(.../VideoRecorderDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,12 +26,9 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * DAO for accessing the VideoRecorder objects - Hibernate specific code.
@@ -40,9 +37,6 @@
 
     private static final String FIND_FORUM_BY_CONTENTID = "from VideoRecorder videoRecorder where videoRecorder.toolContentId=?";
 
-    private static final String FIND_INSTRUCTION_FILE = "from " + VideoRecorderAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
     public VideoRecorder getByContentId(Long toolContentId) {
 	List list = getHibernateTemplate().find(VideoRecorderDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
@@ -57,22 +51,6 @@
 	this.getHibernateTemplate().flush();
     }
 
-    public void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	if (toolContentId != null && uuid != null && versionId != null) {
-	    List list = getSession().createQuery(VideoRecorderDAO.FIND_INSTRUCTION_FILE).setLong(0,
-		    toolContentId.longValue()).setLong(1, uuid.longValue()).setLong(2, versionId.longValue())
-		    .setString(3, type).list();
-	    if (list != null && list.size() > 0) {
-		VideoRecorderAttachment file = (VideoRecorderAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public void releaseFromCache(Object o) {
 	getSession().evict(o);
 
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql
===================================================================
diff -u
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql	(revision 0)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,19 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
+ALTER TABLE tl_lavidr10_videoRecorder DROP COLUMN online_instructions;
+ALTER TABLE tl_lavidr10_videoRecorder DROP COLUMN offline_instructions;
+ALTER TABLE tl_lavidr10_videoRecorder DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lavidr10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lavidr10';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	(.../VideoRecorderDTO.java)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	(.../VideoRecorderDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -32,8 +32,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
 
 public class VideoRecorderDTO {
 
@@ -44,10 +42,6 @@
 	public String title;
 
 	public String instructions;
-
-	public String onlineInstructions;
-
-	public String offlineInstructions;
 	
 	public boolean reflectOnActivity;
 	
@@ -72,11 +66,7 @@
     public boolean exportOffline;
     
     public boolean exportAll;
-	
-	public Set<VideoRecorderAttachmentDTO> onlineInstructionsFiles;
 
-	public Set<VideoRecorderAttachmentDTO> offlineInstructionsFiles;
-
 	public Set<VideoRecorderSessionDTO> sessionDTOs = new TreeSet<VideoRecorderSessionDTO>();
 	
 	public VideoRecorderRecordingDTO authorRecording;
@@ -90,8 +80,6 @@
 		toolContentId = videoRecorder.getToolContentId();
 		title = videoRecorder.getTitle();
 		instructions = videoRecorder.getInstructions();
-		onlineInstructions = videoRecorder.getOnlineInstructions();
-		offlineInstructions = videoRecorder.getOfflineInstructions();
 		contentInUse = videoRecorder.isContentInUse();
 		lockOnFinish = videoRecorder.isLockOnFinished();
 		allowUseVoice = videoRecorder.isAllowUseVoice();
@@ -103,28 +91,10 @@
 		exportOffline = videoRecorder.isExportOffline();
 		reflectOnActivity = videoRecorder.isReflectOnActivity();
 		reflectInstructions = videoRecorder.getReflectInstructions();
-		onlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
-		offlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
 
 		if(videoRecorder.getAuthorRecording() != null){
 			authorRecording = new VideoRecorderRecordingDTO();
 		}
-		
-		for (Iterator i = videoRecorder.getVideoRecorderAttachments().iterator(); i.hasNext();) {
-			VideoRecorderAttachment att = (VideoRecorderAttachment) i.next();
-			if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-				VideoRecorderAttachmentDTO attDTO = new VideoRecorderAttachmentDTO(att);
-				offlineInstructionsFiles.add(attDTO);
-			} else if (att.getFileType()
-					.equals(IToolContentHandler.TYPE_ONLINE)) {
-				VideoRecorderAttachmentDTO attDTO = new VideoRecorderAttachmentDTO(att);
-				onlineInstructionsFiles.add(attDTO);
-			} else {
-				// something is wrong. Ignore file, log error
-				logger.error("File with uid " + att.getFileUuid()
-						+ " contains invalid fileType: " + att.getFileType());
-			}
-		}
 	}
 
 	/* Getters / Setters */
@@ -144,48 +114,14 @@
 		this.instructions = instructions;
 	}
 
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
-
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
-
-	public Set<VideoRecorderAttachmentDTO> getOfflineInstructionsFiles() {
-		return offlineInstructionsFiles;
-	}
-
 	public VideoRecorderRecordingDTO getAuthorRecording() {
 		return authorRecording;
 	}
 
 	public void setAuthorRecording(VideoRecorderRecordingDTO authorRecording) {
 		this.authorRecording = authorRecording;
 	}
-	
-	public void setOfflineInstructionsFiles(
-			Set<VideoRecorderAttachmentDTO> offlineInstructionsFiles) {
-		this.offlineInstructionsFiles = offlineInstructionsFiles;
-	}
 
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
-
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
-
-	public Set<VideoRecorderAttachmentDTO> getOnlineInstructionsFiles() {
-		return onlineInstructionsFiles;
-	}
-
-	public void setOnlineInstructionsFiles(
-			Set<VideoRecorderAttachmentDTO> onlineInstructionsFiles) {
-		this.onlineInstructionsFiles = onlineInstructionsFiles;
-	}
-
 	public boolean isReflectOnActivity() {
 		return reflectOnActivity;
 	}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java	(.../VideoRecorderRecordingDTO.java)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java	(.../VideoRecorderRecordingDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,18 +26,12 @@
 package org.lamsfoundation.lams.tool.videoRecorder.dto;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
-import java.util.Date;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java
===================================================================
diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	(.../VideoRecorder.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	(.../VideoRecorder.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -68,8 +68,6 @@
 	
 	String reflectInstructions;
 
-    private boolean runOffline;
-
     private boolean lockOnFinished;
 
     private boolean allowUseVoice;
@@ -85,65 +83,19 @@
     private boolean exportOffline;
     
     private boolean exportAll;
-    
-    private String onlineInstructions;
 
-    private String offlineInstructions;
-
     private boolean contentInUse;
 
     private boolean defineLater;
 
     private Long toolContentId;
 
-    private Set videoRecorderAttachments;
-
     private Set videoRecorderSessions;
 
     private VideoRecorderRecording authorRecording;
     
     private Set<VideoRecorderCondition> conditions = new TreeSet<VideoRecorderCondition>(new TextSearchConditionComparator());
 
-    // *********** NON Persisit fields
-    private IToolContentHandler toolContentHandler;
-
-    // Constructors
-
-    /** default constructor */
-    public VideoRecorder() {
-    }
-
-    /** full constructor */
-    public VideoRecorder(Date createDate, Date updateDate, Long createBy, String title, String instructions,
-	    boolean runOffline, boolean lockOnFinished, boolean filteringEnabled, String filterKeywords,
-	    String onlineInstructions, String offlineInstructions, boolean contentInUse, boolean defineLater,
-	    boolean allowUseVoice, boolean allowUseCamera, boolean allowLearnerVideoExport, boolean allowLearnerVideoVisibility,
-	    Long toolContentId, Set videoRecorderAttachments, Set videoRecorderSessions, VideoRecorderRecording authorRecording,
-	    boolean exportAll, boolean exportOffline, boolean reflectOnActivity, String reflectInstructions) {
-	this.createDate = createDate;
-	this.updateDate = updateDate;
-	this.createBy = createBy;
-	this.title = title;
-	this.instructions = instructions;
-	this.runOffline = runOffline;
-	this.lockOnFinished = lockOnFinished;
-	this.onlineInstructions = onlineInstructions;
-	this.offlineInstructions = offlineInstructions;
-	this.contentInUse = contentInUse;
-	this.defineLater = defineLater;
-	this.toolContentId = toolContentId;
-	this.videoRecorderAttachments = videoRecorderAttachments;
-	this.videoRecorderSessions = videoRecorderSessions;
-	this.authorRecording = authorRecording;
-	this.allowUseVoice = allowUseVoice;
-	this.allowUseCamera = allowUseCamera;
-	this.allowLearnerVideoVisibility = allowLearnerVideoVisibility;
-	this.exportOffline = exportOffline;
-	this.exportAll = exportAll;
-	this.reflectOnActivity = reflectOnActivity;
-	this.reflectInstructions = reflectInstructions;
-    }
-
     // Property accessors
     /**
      * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
@@ -243,21 +195,8 @@
 
 	public void setReflectInstructions(String reflectInstructions) {
 		this.reflectInstructions = reflectInstructions;
-	}    
-    
-    /**
-     * @hibernate.property column="run_offline" length="1"
-     * 
-     */
+	}
 
-    public boolean isRunOffline() {
-	return runOffline;
-    }
-
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
     /**
      * @hibernate.property column="lock_on_finished" length="1"
      * 
@@ -353,35 +292,9 @@
 
     public void setExportAll(boolean exportAll) {
 	this.exportAll = exportAll;
-    }  
-    
-    /**
-     * @hibernate.property column="online_instructions" length="65535"
-     * 
-     */
-
-    public String getOnlineInstructions() {
-	return onlineInstructions;
     }
 
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
     /**
-     * @hibernate.property column="offline_instructions" length="65535"
-     * 
-     */
-
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    /**
      * @hibernate.property column="content_in_use" length="1"
      * 
      */
@@ -421,21 +334,6 @@
     }
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="videoRecorder_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment"
-     * 
-     */
-
-    public Set getVideoRecorderAttachments() {
-	return videoRecorderAttachments;
-    }
-
-    public void setVideoRecorderAttachments(Set videoRecorderAttachments) {
-	this.videoRecorderAttachments = videoRecorderAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="videoRecorder_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession"
@@ -527,10 +425,8 @@
 	return result;
     }
 
-    public static VideoRecorder newInstance(VideoRecorder fromContent, Long toContentId,
-	    IToolContentHandler videoRecorderToolContentHandler) {
+    public static VideoRecorder newInstance(VideoRecorder fromContent, Long toContentId) {
 	VideoRecorder toContent = new VideoRecorder();
-	fromContent.toolContentHandler = videoRecorderToolContentHandler;
 	toContent = (VideoRecorder) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -545,17 +441,6 @@
 	    videoRecorder = (VideoRecorder) super.clone();
 	    videoRecorder.setUid(null);
 
-	    if (videoRecorderAttachments != null) {
-		// create a copy of the attachments
-		Iterator iter = videoRecorderAttachments.iterator();
-		Set<VideoRecorderAttachment> set = new HashSet<VideoRecorderAttachment>();
-		while (iter.hasNext()) {
-		    VideoRecorderAttachment originalFile = (VideoRecorderAttachment) iter.next();
-		    VideoRecorderAttachment newFile = (VideoRecorderAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		videoRecorder.videoRecorderAttachments = set;
-	    }
 	    // create an empty set for the videoRecorderSession
 	    videoRecorder.videoRecorderSessions = new HashSet();
 
@@ -573,12 +458,4 @@
 	return videoRecorder;
     }
 
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-
 }
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java	(.../IVideoRecorderService.java)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java	(.../IVideoRecorderService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -24,7 +24,6 @@
 
 package org.lamsfoundation.lams.tool.videoRecorder.service;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -34,7 +33,6 @@
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRatingDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderCondition;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating;
@@ -76,28 +74,6 @@
     public VideoRecorder getVideoRecorderByContentId(Long toolContentID);
 
     /**
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    public VideoRecorderAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * @param uuid
-     * @param versionID
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws VideoRecorderException;
-
-    /**
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * @param videoRecorder
      */
     public void saveOrUpdateVideoRecorder(VideoRecorder videoRecorder);
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderImportContentVersionFilter.java
===================================================================
diff -u
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderImportContentVersionFilter.java	(revision 0)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderImportContentVersionFilter.java	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,43 @@
+/**************************************************************** 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.videoRecorder.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
+
+/**
+ * Import filter class for different version of VideoRecorder content.
+ */
+public class VideoRecorderImportContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20081208 version content to 20140102 version tool server.
+     */
+    public void up20081208To20140102() {
+	this.removeField(VideoRecorder.class, "runOffline");
+	this.removeField(VideoRecorder.class, "onlineInstructions");
+	this.removeField(VideoRecorder.class, "offlineInstructions");
+	this.removeField(VideoRecorder.class, "videoRecorderAttachments");
+    }
+}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
===================================================================
diff -u -r33da76d05725a84e191a5f6dca50b394cca3c1ee -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 33da76d05725a84e191a5f6dca50b394cca3c1ee)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -64,7 +64,6 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
-import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderAttachmentDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderCommentDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRatingDAO;
@@ -75,7 +74,6 @@
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRatingDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderCondition;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating;
@@ -110,8 +108,6 @@
 
     private IVideoRecorderUserDAO videoRecorderUserDAO = null;
 
-    private IVideoRecorderAttachmentDAO videoRecorderAttachmentDAO = null;
-
     private IVideoRecorderRatingDAO videoRecorderRatingDAO = null;
 
     private IVideoRecorderCommentDAO videoRecorderCommentDAO = null;
@@ -122,10 +118,6 @@
 
     private IToolContentHandler videoRecorderToolContentHandler = null;
 
-    private IRepositoryService repositoryService = null;
-
-    private IAuditService auditService = null;
-
     private IExportToolContentService exportContentService;
 
     private ICoreNotebookService coreNotebookService;
@@ -235,28 +227,10 @@
 	    fromContent = getDefaultContent();
 	}
 
-	VideoRecorder toContent = VideoRecorder.newInstance(fromContent, toContentId, videoRecorderToolContentHandler);
+	VideoRecorder toContent = VideoRecorder.newInstance(fromContent, toContentId);
 	videoRecorderDAO.saveOrUpdate(toContent);
     }
 
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId);
-	if (videoRecorder == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	videoRecorder.setDefineLater(value);
-	videoRecorderDAO.saveOrUpdate(videoRecorder);
-    }
-
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId);
-	if (videoRecorder == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	videoRecorder.setRunOffline(value);
-	videoRecorderDAO.saveOrUpdate(videoRecorder);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	// TODO Auto-generated method stub
@@ -282,9 +256,8 @@
 
 	// set ResourceToolContentHandler as null to avoid copy file node in
 	// repository again.
-	videoRecorder = VideoRecorder.newInstance(videoRecorder, toolContentId, null);
+	videoRecorder = VideoRecorder.newInstance(videoRecorder, toolContentId);
 	videoRecorder.setToolContentId(null);
-	videoRecorder.setToolContentHandler(null);
 	videoRecorder.setVideoRecorderSessions(null);
 
 	VideoRecorderRecording authorRecording = (VideoRecorderRecording) getFirstRecordingByToolContentId(toolContentId);
@@ -298,14 +271,7 @@
 	}
 
 	videoRecorder.setAuthorRecording(authorRecording);
-
-	Set<VideoRecorderAttachment> atts = videoRecorder.getVideoRecorderAttachments();
-	for (VideoRecorderAttachment att : atts) {
-	    att.setVideoRecorder(null);
-	}
 	try {
-	    exportContentService.registerFileClassForExport(VideoRecorderAttachment.class.getName(), "fileUuid",
-		    "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, videoRecorder, videoRecorderToolContentHandler,
 		    rootPath);
 	} catch (ExportToolContentException e) {
@@ -322,9 +288,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(VideoRecorderAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(VideoRecorderImportContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, videoRecorderToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof VideoRecorder)) {
@@ -423,7 +389,7 @@
 	VideoRecorder defaultContent = getDefaultContent();
 	// create new videoRecorder using the newContentID
 	VideoRecorder newContent = new VideoRecorder();
-	newContent = VideoRecorder.newInstance(defaultContent, newContentID, videoRecorderToolContentHandler);
+	newContent = VideoRecorder.newInstance(defaultContent, newContentID);
 	videoRecorderDAO.saveOrUpdate(newContent);
 	return newContent;
     }
@@ -521,32 +487,6 @@
 	}
     }
 
-    public VideoRecorderAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new VideoRecorderException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-
-	VideoRecorderAttachment attachment = new VideoRecorderAttachment(nodeKey.getVersion(), type,
-		file.getFileName(), nodeKey.getUuid(), new Date());
-	return attachment;
-    }
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws VideoRecorderException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new VideoRecorderException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	videoRecorderDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-    }
-
     public void saveOrUpdateVideoRecorder(VideoRecorder videoRecorder) {
 	videoRecorderDAO.saveOrUpdate(videoRecorder);
     }
@@ -577,63 +517,6 @@
 	return videoRecorderUser;
     }
 
-    public IAuditService getAuditService() {
-	return auditService;
-    }
-
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
-
-    private NodeKey processFile(FormFile file, String type) {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = getVideoRecorderToolContentHandler().uploadFile(file.getInputStream(), fileName,
-			file.getContentType(), type);
-	    } catch (InvalidParameterException e) {
-		throw new VideoRecorderException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new VideoRecorderException("FileNotFoundException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new VideoRecorderException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new VideoRecorderException("IOException occured while trying to upload File" + e.getMessage());
-	    }
-	}
-	return node;
-    }
-
-    /**
-     * This method verifies the credentials of the SubmitFiles Tool and gives it the <code>Ticket</code> to login and
-     * access the Content Repository.
-     * 
-     * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
-     * the tool needs to upload/download files from the content repository.
-     * 
-     * @return ITicket The ticket for repostory access
-     * @throws SubmitFilesException
-     */
-    private ITicket getRepositoryLoginTicket() throws VideoRecorderException {
-	ICredentials credentials = new SimpleCredentials(VideoRecorderToolContentHandler.repositoryUser,
-		VideoRecorderToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials,
-		    VideoRecorderToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new VideoRecorderException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new VideoRecorderException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new VideoRecorderException("Login failed." + e.getMessage());
-	}
-    }
-
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
     /**
@@ -649,15 +532,9 @@
 	videoRecorder.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
 	videoRecorder.setLockOnFinished(Boolean.TRUE);
-	videoRecorder.setOfflineInstructions(null);
-	videoRecorder.setOnlineInstructions(null);
-	videoRecorder.setRunOffline(Boolean.FALSE);
 	videoRecorder.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	videoRecorder.setToolContentId(toolContentId);
 	videoRecorder.setUpdateDate(now);
-	// leave as empty, no need to set them to anything.
-	// setVideoRecorderAttachments(Set videoRecorderAttachments);
-	// setVideoRecorderSessions(Set videoRecorderSessions);
 	videoRecorderDAO.saveOrUpdate(videoRecorder);
     }
 
@@ -679,14 +556,6 @@
     // =========================================================================================
     /* ********** Used by Spring to "inject" the linked objects ************* */
 
-    public IVideoRecorderAttachmentDAO getVideoRecorderAttachmentDAO() {
-	return videoRecorderAttachmentDAO;
-    }
-
-    public void setVideoRecorderAttachmentDAO(IVideoRecorderAttachmentDAO attachmentDAO) {
-	videoRecorderAttachmentDAO = attachmentDAO;
-    }
-
     public IVideoRecorderDAO getVideoRecorderDAO() {
 	return videoRecorderDAO;
     }
@@ -791,14 +660,6 @@
 	this.videoRecorderOutputFactory = videoRecorderOutputFactory;
     }
 
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public void releaseConditionsFromCache(VideoRecorder videoRecorder) {
 	if (videoRecorder.getConditions() != null) {
 	    for (VideoRecorderCondition condition : videoRecorder.getConditions()) {
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderConstants.java
===================================================================
diff -u -r61df3f3f473a3619f93c63ceb879ae36438020e8 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderConstants.java	(.../VideoRecorderConstants.java)	(revision 61df3f3f473a3619f93c63ceb879ae36438020e8)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderConstants.java	(.../VideoRecorderConstants.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -33,8 +33,6 @@
     public static final Integer SESSION_COMPLETED = new Integer(2);
 
     public static final String AUTHORING_DEFAULT_TAB = "1";
-    public static final String ATTACHMENT_LIST = "attachmentList";
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
     public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter";
     public static final String AUTH_SESSION_ID = "authoringSessionId";
 
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,7 +26,6 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderService">
-				<property name="videoRecorderAttachmentDAO"><ref bean="videoRecorderAttachmentDAO"/></property>
 				<property name="videoRecorderSessionDAO"><ref bean="videoRecorderSessionDAO"/></property>
 				<property name="videoRecorderUserDAO"><ref bean="videoRecorderUserDAO"/></property>
 				<property name="videoRecorderDAO"><ref bean="videoRecorderDAO"/></property>
@@ -35,13 +34,11 @@
 				<property name="videoRecorderCommentDAO"><ref bean="videoRecorderCommentDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="videoRecorderToolContentHandler"><ref bean="videoRecorderToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="videoRecorderOutputFactory"><ref bean="videoRecorderOutputFactory"/></property>
-		   		<property name="messageService"><ref bean="videoRecorderMessageService"/></property>  
-		   		<property name="repositoryService"><ref bean="repositoryService" /></property>
+		   		<property name="messageService"><ref bean="videoRecorderMessageService"/></property> 
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -55,10 +52,7 @@
 				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="add*">PROPAGATION_REQUIRED</prop>
 				<prop key="leaveToolSession">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsDefineLater">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsRunOffline">PROPAGATION_REQUIRED</prop>
                 <prop key="exportToolSession">PROPAGATION_REQUIRED</prop>
-
 				<prop key="importToolContent">PROPAGATION_REQUIRED</prop>
 				<prop key="exportToolContent">PROPAGATION_REQUIRED</prop>
 				<prop key="import102ToolContent">PROPAGATION_REQUIRED</prop>
@@ -83,10 +77,6 @@
 	<bean id="videoRecorderRecordingDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderRecordingDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-	
-	<bean id="videoRecorderAttachmentDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
 
 	<bean id="videoRecorderRatingDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderRatingDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java
===================================================================
diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -52,14 +52,9 @@
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
-import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderSessionDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderCondition;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession;
-import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser;
 import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService;
-import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderService;
 import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants;
 import org.lamsfoundation.lams.tool.videoRecorder.web.forms.AuthoringForm;
@@ -90,11 +85,6 @@
     private static final String KEY_TOOL_CONTENT_ID = "toolContentID";
     private static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
     private static final String KEY_MODE = "mode";
-    private static final String KEY_ONLINE_FILES = "onlineFiles";
-    private static final String KEY_OFFLINE_FILES = "offlineFiles";
-    private static final String KEY_UNSAVED_ONLINE_FILES = "unsavedOnlineFiles";
-    private static final String KEY_UNSAVED_OFFLINE_FILES = "unsavedOfflineFiles";
-    private static final String KEY_DELETED_FILES = "deletedFiles";
 
     /**
      * Default method when no dispatch parameter is specified. It is expected that the parameter
@@ -201,24 +191,6 @@
 	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
 	updateVideoRecorder(videoRecorder, authForm, mode);
 
-	// remove attachments marked for deletion.
-	Set<VideoRecorderAttachment> attachments = videoRecorder.getVideoRecorderAttachments();
-	if (attachments == null) {
-	    attachments = new HashSet<VideoRecorderAttachment>();
-	}
-
-	for (VideoRecorderAttachment att : getAttList(AuthoringAction.KEY_DELETED_FILES, map)) {
-	    // remove from db, leave in repository
-	    attachments.remove(att);
-	}
-
-	// add unsaved attachments
-	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map));
-	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map));
-
-	// set attachments in case it didn't exist
-	videoRecorder.setVideoRecorderAttachments(attachments);
-
 	videoRecorderService.releaseConditionsFromCache(videoRecorder);
 
 	Set<VideoRecorderCondition> conditions = videoRecorder.getConditions();
@@ -239,7 +211,7 @@
 	    }
 	}
 
-	// set attachments in case it didn't exist
+	// set conditions in case it didn't exist
 	videoRecorder.setConditions(conditionSet);
 
 	// set the update date
@@ -263,156 +235,8 @@
 	return mapping.findForward("success");
     }
 
-    public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return uploadFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return uploadFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    public ActionForward deleteOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    public ActionForward deleteOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    public ActionForward removeUnsavedOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return removeUnsaved(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    public ActionForward removeUnsavedOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return removeUnsaved(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
     /* ========== Private Methods ********** */
 
-    private ActionForward uploadFile(ActionMapping mapping, AuthoringForm authForm, String type,
-	    HttpServletRequest request) {
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-	FormFile file;
-	List<VideoRecorderAttachment> unsavedFiles;
-	List<VideoRecorderAttachment> savedFiles;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = authForm.getOfflineFile();
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
-
-	    savedFiles = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-	} else {
-	    file = authForm.getOnlineFile();
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map);
-
-	    savedFiles = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-	}
-
-	// validate file max size
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map);
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	if (file.getFileName().length() != 0) {
-
-	    // upload file to repository
-	    VideoRecorderAttachment newAtt = videoRecorderService.uploadFileToContent((Long) map
-		    .get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
-
-	    // Add attachment to unsavedFiles
-	    // check to see if file with same name exists
-	    VideoRecorderAttachment currAtt;
-	    Iterator iter = savedFiles.iterator();
-	    while (iter.hasNext()) {
-		currAtt = (VideoRecorderAttachment) iter.next();
-		if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
-			&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
-		    // move from this this list to deleted list.
-		    getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(currAtt);
-		    iter.remove();
-		    break;
-		}
-	    }
-	    unsavedFiles.add(newAtt);
-
-	    request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map);
-	    request.setAttribute("unsavedChanges", new Boolean(true));
-	}
-	return mapping.findForward("success");
-    }
-
-    private ActionForward deleteFile(ActionMapping mapping, AuthoringForm authForm, String type,
-	    HttpServletRequest request) {
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-	List fileList;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    fileList = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-	} else {
-	    fileList = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-	}
-
-	Iterator iter = fileList.iterator();
-
-	while (iter.hasNext()) {
-	    VideoRecorderAttachment att = (VideoRecorderAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// move to delete file list, deleted at next updateContent
-		getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(att);
-
-		// remove from this list
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
-    private ActionForward removeUnsaved(ActionMapping mapping, AuthoringForm authForm, String type,
-	    HttpServletRequest request) {
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-	List unsavedFiles;
-
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
-	} else {
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map);
-	}
-
-	Iterator iter = unsavedFiles.iterator();
-	while (iter.hasNext()) {
-	    VideoRecorderAttachment att = (VideoRecorderAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// delete from repository and list
-		videoRecorderService.deleteFromRepository(att.getFileUuid(), att.getFileVersionId());
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
     /**
      * Updates VideoRecorder content using AuthoringForm inputs.
      * 
@@ -424,8 +248,6 @@
 	videoRecorder.setTitle(authForm.getTitle());
 	videoRecorder.setInstructions(authForm.getInstructions());
 	//if (mode.isAuthor()) { // Teacher cannot modify following
-	    videoRecorder.setOfflineInstructions(authForm.getOnlineInstruction());
-	    videoRecorder.setOnlineInstructions(authForm.getOfflineInstruction());
 	    videoRecorder.setLockOnFinished(authForm.isLockOnFinished());
 	    videoRecorder.setAllowUseVoice(authForm.isAllowUseVoice());
 	    videoRecorder.setAllowUseCamera(authForm.isAllowUseCamera());
@@ -447,8 +269,6 @@
     private void updateAuthForm(AuthoringForm authForm, VideoRecorder videoRecorder) {
 	authForm.setTitle(videoRecorder.getTitle());
 	authForm.setInstructions(videoRecorder.getInstructions());
-	authForm.setOnlineInstruction(videoRecorder.getOnlineInstructions());
-	authForm.setOfflineInstruction(videoRecorder.getOfflineInstructions());
 	authForm.setLockOnFinished(videoRecorder.isLockOnFinished());
 	authForm.setAllowUseVoice(videoRecorder.isAllowUseVoice());
 	authForm.setAllowUseCamera(videoRecorder.isAllowUseCamera());
@@ -473,25 +293,8 @@
 	map.put(AuthoringAction.KEY_MODE, mode);
 	map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
 	map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
-	map.put(AuthoringAction.KEY_ONLINE_FILES, new LinkedList<VideoRecorderAttachment>());
-	map.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<VideoRecorderAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<VideoRecorderAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<VideoRecorderAttachment>());
-	map.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<VideoRecorderAttachment>());
 	map.put(VideoRecorderConstants.ATTR_DELETED_CONDITION_LIST, new ArrayList<VideoRecorderCondition>());
 
-	Iterator iter = videoRecorder.getVideoRecorderAttachments().iterator();
-	while (iter.hasNext()) {
-	    VideoRecorderAttachment attachment = (VideoRecorderAttachment) iter.next();
-	    String type = attachment.getFileType();
-	    if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-		getAttList(AuthoringAction.KEY_OFFLINE_FILES, map).add(attachment);
-	    }
-	    if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-		getAttList(AuthoringAction.KEY_ONLINE_FILES, map).add(attachment);
-	    }
-	}
-
 	SortedSet<VideoRecorderCondition> set = new TreeSet<VideoRecorderCondition>(new TextSearchConditionComparator());
 
 	if (videoRecorder.getConditions() != null) {
@@ -519,18 +322,6 @@
     }
 
     /**
-     * Retrieves a List of attachments from the map using the key.
-     * 
-     * @param key
-     * @param map
-     * @return
-     */
-    private List<VideoRecorderAttachment> getAttList(String key, SessionMap<String, Object> map) {
-	List<VideoRecorderAttachment> list = (List<VideoRecorderAttachment>) map.get(key);
-	return list;
-    }
-
-    /**
      * Retrieve the SessionMap from the HttpSession.
      * 
      * @param request
@@ -540,20 +331,4 @@
     private SessionMap<String, Object> getSessionMap(HttpServletRequest request, AuthoringForm authForm) {
 	return (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
     }
-
-    /**
-     * Lists deleted VideoRecorder conditions, which could be persisted or non-persisted items.
-     * 
-     * @param request
-     * @return
-     */
-    private List getDeletedVideoRecorderConditionList(SessionMap sessionMap) {
-	List list = (List) sessionMap.get(VideoRecorderConstants.ATTR_DELETED_CONDITION_LIST);
-	if (list == null) {
-	    list = new ArrayList();
-	    sessionMap.put(VideoRecorderConstants.ATTR_DELETED_CONDITION_LIST, list);
-	}
-	return list;
-
-    }
 }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -72,7 +72,6 @@
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm"
  * @struts.action-forward name="videoRecorder" path="tiles:/learning/main"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  */
 public class LearningAction extends LamsDispatchAction {
@@ -169,11 +168,6 @@
 		
         	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
         		.getServletContext());
-
-		// check runOffline
-		if (videoRecorder.isRunOffline()) {
-			return mapping.findForward("runOffline");
-		}
 		
 		// get any existing videoRecorder entry
 		
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java
===================================================================
diff -u -rb33e717f9a734d318eefab07a17234f07c770c92 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -113,29 +113,6 @@
 
 		return FILENAME;
 	}
-
-	protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
-        if (toolContentID == null && toolSessionID == null) {
-            logger.error("Tool content Id or and session Id are null. Unable to activity title");
-        } else {
-    		if (videoRecorderService == null) {
-    			videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(getServletContext());
-    		}
-
-        	VideoRecorder content = null;
-            if ( toolContentID != null ) {
-            	content = videoRecorderService.getVideoRecorderByContentId(toolContentID);
-            } else {
-            	VideoRecorderSession session=videoRecorderService.getSessionBySessionId(toolSessionID);
-            	if ( session != null )
-            		content = session.getVideoRecorder();
-            }
-            if ( content != null ) {
-            	activityTitle = content.getTitle();
-            }
-        }
-        return super.doOfflineExport(request, response, directoryName, cookies);
-	}
 	
 	private void doLearnerExport(HttpServletRequest request,
 			HttpServletResponse response, String directoryName, Cookie[] cookies)
Index: lams_tool_videorecorder/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_videorecorder/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -86,10 +86,6 @@
 	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/videoRecorder.jsp" />
 	</definition>
-
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
-	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
Index: lams_tool_videorecorder/web/includes/javascript/authoring.js
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -17,8 +17,3 @@
 	document.authoringForm.dispatch.value = method;
 	document.authoringForm.submit();
 }
-function deleteAttachment(dispatch, uuid) {
-	document.authoringForm.dispatch.value = dispatch;
-	document.authoringForm.deleteFileUuid.value = uuid;
-	document.authoringForm.submit();
-}
Index: lams_tool_videorecorder/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
+++ lams_tool_videorecorder/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -1,14 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<%@ page
-	import="org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants"%>
+<%@ page import="org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants"%>
 
-<html:form action="/authoring" styleId="authoringForm" method="post"
-	enctype="multipart/form-data">
+<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
 
-	<c:set var="formBean"
-		value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 
 	<c:set var="defineLater" value="no" />
@@ -23,7 +19,6 @@
 			<lams:Tab id="1" key="button.basic" />
 			<c:if test="${sessionMap.mode == 'author'}">
 				<lams:Tab id="2" key="button.advanced" />
-				<lams:Tab id="3" key="button.instructions" />
 			</c:if>
 		</lams:Tabs>
 
@@ -36,9 +31,6 @@
 		<html:hidden property="sessionMapID" />
 
 		<div id="message" style="text-align: center;">
-			<c:if test="${unsavedChanges}">
-				<fmt:message key="message.unsavedChanges" />
-			</c:if>
 			<logic:messagesPresent>
 				<p class="warning">
 				        <html:messages id="error">
@@ -55,8 +47,6 @@
 		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 		<c:if test="${sessionMap.mode == 'author'}">
 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.instructions"
-				page="instructions.jsp" />
 		</c:if>
 
 		<lams:AuthoringButton formID="authoringForm"
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_videorecorder/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -4,9 +4,8 @@
 <div id="header">
 	<lams:Tabs>
 		<lams:Tab id="1" key="button.summary" />
-		<lams:Tab id="2" key="button.instructions" />
-		<lams:Tab id="3" key="button.editActivity" />
-		<lams:Tab id="4" key="button.statistics" />
+		<lams:Tab id="2" key="button.editActivity" />
+		<lams:Tab id="3" key="button.statistics" />
 	</lams:Tabs>
 	<script type="text/javascript">
 		var initialTabId = "${videoRecorderDTO.currentTab}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= VideoRecorderConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 
 	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.instructions" page="instructions.jsp" />
-	<lams:TabBody id="3" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="4" titleKey="button.statistics" page="statistics.jsp" />
+	<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+	<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
 	
 </div>
 
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -101,14 +101,6 @@
         column="created_by"
         length="20"
     />
-    
-   <property
-        name="runOffline"
-        type="boolean"
-        access="property"
-        column="run_offline"
-        length="1"        
-   />
 
    <property
         name="defineLater"
@@ -119,22 +111,6 @@
    />
 
     <property
-        name="offlineInstructions"
-        type="java.lang.String"
-        access="property"        
-        column="offline_instructions"
-        length="65535"
-    />
-    
-    <property
-        name="onlineInstructions"
-        type="java.lang.String"
-        access="property"        
-        column="online_instructions"
-        length="65535"
-    />
-
-    <property
         name="contentInUse"
         type="boolean"
         access="property"        
@@ -242,23 +218,6 @@
               />
 
     </set>
-    
-    	<set
-            name="voteAttachments"
-            lazy="true"
-            inverse="true"
-            cascade="all-delete-orphan"
-            sort="unsorted"
-        >
-              <key
-                  column="vote_content_id"
-              >
-              </key>
-
-              <one-to-many
-                  class="org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile"
-              />
-    </set>
 	
 </class>
 </hibernate-mapping>
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -85,8 +85,6 @@
     public static final String CURRENT_SESSION_NAME = "currentSessionName";
     public static final String REVISITED_ALL_NOMINATIONS = "revisitedAllNominations";
 
-    public static final String ATTACHMENT_LIST_KEY = "attachmentListKey";
-    public static final String DELETED_ATTACHMENT_LIST_KEY = "deletedAttachmentListKey";
     public static final String ACTIVITY_TITLE_KEY = "activityTitleKey";
     public static final String ACTIVITY_INSTRUCTIONS_KEY = "activityInstructionsKey";
     public static final String VOTE_GENERAL_MONITORING_DTO = "voteGeneralMonitoringDTO";
@@ -108,12 +106,6 @@
     public static final String LIST_NOMINATION_CONTENT_DTO = "listNominationContentDTO";
     public static final String LIST_NOMINATION_CONTENT_DTO_KEY = "listNominationContentDTOKey";
 
-    public static final String DEFAULT_ONLINE_INST = "";
-    public static final String DEFAULT_OFFLINE_INST = "";
-    public static final String ONLINE_INSTRUCTIONS = "onlineInstructions";
-    public static final String OFFLINE_INSTRUCTIONS = "offlineInstructions";
-    public static final String ONLINE_INSTRUCTIONS_KEY = "onlineInstructionsKey";
-    public static final String OFFLINE_INSTRUCTIONS_KEY = "offlineInstructionsKey";
     public static final String TOTAL_NOMINATION_COUNT = "totalNominationCount";
     public static final String MAX_INPUTS = "maxInputs";
 
@@ -142,8 +134,6 @@
     public static final String COPY_TOOL_CONTENT = "copyToolContent";
     public static final String REMOVE_TOOL_CONTENT = "removeToolContent";
     public static final String OPT_INDEX = "optIndex";
-
-    public static final String RUN_OFFLINE = "runOffline";
     
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
     public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
@@ -218,24 +208,10 @@
     public static final String RICHTEXT_INCORRECT_FEEDBACK = "richTextIncorrectFeedback";
     public static final String RICHTEXT_CORRECT_FEEDBACK = "richTextCorrectFeedback";
     public static final String RICHTEXT_FEEDBACK_INCORRECT = "richTextFeedbackInCorrect";
-    public static final String RICHTEXT_OFFLINEINSTRUCTIONS = "richTextOfflineInstructions";
-    public static final String RICHTEXT_ONLINEINSTRUCTIONS = "richTextOnlineInstructions";
     public static final String RICHTEXT_TITLE = "richTextTitle";
     public static final String RICHTEXT_INSTRUCTIONS = "richTextInstructions";
     public static final String RICHTEXT_BLANK = "<p>&nbsp;</p>";
-    public static final String SUBMIT_OFFLINE_FILE = "submitOfflineFile";
-    public static final String SUBMIT_ONLINE_FILE = "submitOnlineFile";
-    public static final String LIST_UPLOADED_OFFLINE_FILENAMES = "listUploadedOfflineFileNames";
-    public static final String LIST_UPLOADED_OFFLINE_FILENAMES_KEY = "listUploadedOfflineFileNamesKey";
-    public static final String LIST_UPLOADED_ONLINE_FILENAMES = "listUploadedOnlineFileNames";
-    public static final String LIST_UPLOADED_ONLINE_FILENAMES_KEY = "listUploadedOnlineFileNamesKey";
-    public static final String LIST_OFFLINEFILES_METADATA = "listOfflineFilesMetadata";
-    public static final String LIST_OFFLINEFILES_METADATA_KEY = "listOfflineFilesMetadataKey";
-    public static final String LIST_ONLINEFILES_METADATA = "listOnlineFilesMetadata";
-    public static final String LIST_ONLINEFILES_METADATA_KEY = "listOnlineFilesMetadataKey";
     public static final String LIST_VOTE_ALLSESSIONS_DTO = "listVoteAllSessionsDTO";
-    public static final String ATTACHMENT_LIST = "attachmentList";
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
 
     public static final String COUNT_SESSION_COMPLETE = "countSessionComplete";
     public static final String COUNT_ALL_USERS = "countAllUsers";
@@ -276,7 +252,6 @@
     public static final String CURRENT_ANSWER = "currentAnswer";
     public static final String REPORT_TITLE_LEARNER = "reportTitleLearner";
 
-    public static final String IS_TOOL_ACTIVITY_OFFLINE = "isToolActivityOffline";
     public static final String IS_CONTENT_IN_USE = "isContentInUse";
     public static final String IS_MONITORED_CONTENT_IN_USE = "isMonitoredContentInUse";
     public static final String IS_ALL_SESSIONS_COMPLETED = "isAllSessionsCompleted";
@@ -343,15 +318,13 @@
     public static final String USER_EXCEPTION_MODE_REQUIRED = "userExceptionModeRequired";
     public static final String USER_EXCEPTION_CONTENT_IN_USE = "userExceptionContentInUse";
     public static final String USER_EXCEPTION_CONTENT_BEING_MODIFIED = "userExceptionContentBeingModified";
-    public static final String USER_EXCEPTION_CONTENT_RUNOFFLINE = "userExceptionContentRunOffline";
     public static final String USER_EXCEPTION_MODE_INVALID = "userExceptionModeInvalid";
     public static final String USER_EXCEPTION_QUESTION_EMPTY = "userExceptionQuestionEmpty";
     public static final String USER_EXCEPTION_ANSWER_EMPTY = "userExceptionAnswerEmpty";
     public static final String USER_EXCEPTION_ANSWERS_DUPLICATE = "userExceptionAnswersDuplicate";
     public static final String USER_EXCEPTION_OPTIONS_COUNT_ZERO = "userExceptionOptionsCountZero";
     public static final String USER_EXCEPTION_CHKBOXES_EMPTY = "userExceptionChkboxesEmpty";
     public static final String USER_EXCEPTION_SUBMIT_NONE = "userExceptionSubmitNone";
-    public static final String USER_EXCEPTION_FILENAME_EMPTY = "userExceptionFilenameEmpty";
     public static final String USER_EXCEPTION_WEIGHT_MUST_EQUAL100 = "userExceptionWeightMustEqual100";
     public static final String USER_EXCEPTION_SINGLE_OPTION = "userExceptionSingleOption";
     public static final String USER_EXCEPTION_OPTIONS_DUPLICATE = "userExceptionOptionsDuplicate";
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java	(.../VoteGeneralAuthoringDTO.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java	(.../VoteGeneralAuthoringDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -48,17 +48,7 @@
     protected String activityInstructions;
     protected int maxOptionIndex;
     protected String defaultOptionContent;
-    protected String richTextOfflineInstructions;
-    protected String richTextOnlineInstructions;
 
-    protected List listUploadedOfflineFileNames;
-    protected List listUploadedOnlineFileNames;
-    protected List listOfflineFilesMetadata;
-    protected List listOnlineFilesMetadata;
-
-    protected String onlineInstructions;
-    protected String offlineInstructions;
-
     protected String useSelectLeaderToolOuput;
     protected String allowText;
     protected String showResults;
@@ -154,30 +144,6 @@
     }
 
     /**
-     * @param listOfflineFilesMetadata
-     *            The listOfflineFilesMetadata to set.
-     */
-    public void setListOfflineFilesMetadata(List listOfflineFilesMetadata) {
-	this.listOfflineFilesMetadata = listOfflineFilesMetadata;
-    }
-
-    /**
-     * @param listOnlineFilesMetadata
-     *            The listOnlineFilesMetadata to set.
-     */
-    public void setListOnlineFilesMetadata(List listOnlineFilesMetadata) {
-	this.listOnlineFilesMetadata = listOnlineFilesMetadata;
-    }
-
-    /**
-     * @param listUploadedOnlineFileNames
-     *            The listUploadedOnlineFileNames to set.
-     */
-    public void setListUploadedOnlineFileNames(List listUploadedOnlineFileNames) {
-	this.listUploadedOnlineFileNames = listUploadedOnlineFileNames;
-    }
-
-    /**
      * @return Returns the isMonitoredContentInUse.
      */
     public String getIsMonitoredContentInUse() {
@@ -321,21 +287,6 @@
     }
 
     /**
-     * @return Returns the listUploadedOfflineFileNames.
-     */
-    public List getListUploadedOfflineFileNames() {
-	return listUploadedOfflineFileNames;
-    }
-
-    /**
-     * @param listUploadedOfflineFileNames
-     *            The listUploadedOfflineFileNames to set.
-     */
-    public void setListUploadedOfflineFileNames(List listUploadedOfflineFileNames) {
-	this.listUploadedOfflineFileNames = listUploadedOfflineFileNames;
-    }
-
-    /**
      * @return Returns the maxOptionIndex.
      */
     public int getMaxOptionIndex() {
@@ -351,36 +302,6 @@
     }
 
     /**
-     * @return Returns the richTextOfflineInstructions.
-     */
-    public String getRichTextOfflineInstructions() {
-	return richTextOfflineInstructions;
-    }
-
-    /**
-     * @param richTextOfflineInstructions
-     *            The richTextOfflineInstructions to set.
-     */
-    public void setRichTextOfflineInstructions(String richTextOfflineInstructions) {
-	this.richTextOfflineInstructions = richTextOfflineInstructions;
-    }
-
-    /**
-     * @return Returns the richTextOnlineInstructions.
-     */
-    public String getRichTextOnlineInstructions() {
-	return richTextOnlineInstructions;
-    }
-
-    /**
-     * @param richTextOnlineInstructions
-     *            The richTextOnlineInstructions to set.
-     */
-    public void setRichTextOnlineInstructions(String richTextOnlineInstructions) {
-	this.richTextOnlineInstructions = richTextOnlineInstructions;
-    }
-
-    /**
      * @return Returns the sbmtSuccess.
      */
     public String getSbmtSuccess() {
@@ -424,57 +345,6 @@
     public void setToolContentID(String toolContentID) {
 	this.toolContentID = toolContentID;
     }
-
-    /**
-     * @return Returns the offlineInstructions.
-     */
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    /**
-     * @param offlineInstructions
-     *            The offlineInstructions to set.
-     */
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    /**
-     * @return Returns the onlineInstructions.
-     */
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    /**
-     * @param onlineInstructions
-     *            The onlineInstructions to set.
-     */
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    /**
-     * @return Returns the listOfflineFilesMetadata.
-     */
-    public List getListOfflineFilesMetadata() {
-	return listOfflineFilesMetadata;
-    }
-
-    /**
-     * @return Returns the listOnlineFilesMetadata.
-     */
-    public List getListOnlineFilesMetadata() {
-	return listOnlineFilesMetadata;
-    }
-
-    /**
-     * @return Returns the listUploadedOnlineFileNames.
-     */
-    public List getListUploadedOnlineFileNames() {
-	return listUploadedOnlineFileNames;
-    }
     
     /**
      * @return Returns the useSelectLeaderToolOuput.
@@ -638,25 +508,17 @@
     public String toString() {
 	return new ToStringBuilder(this).append("activeModule: ", activeModule)
 		.append("contentFolderID: ", contentFolderID).append("editableQuestionText: ", editableQuestionText)
-		.append("defineLaterInEditMode: ", defineLaterInEditMode)
 		.append("reflectionSubject: ", reflectionSubject).append("submissionAttempt: ", submissionAttempt)
 		.append("mapNominationContent: ", mapNominationContent).append("sbmtSuccess: ", sbmtSuccess)
 		.append("exceptionMaxNominationInvalid: ", exceptionMaxNominationInvalid)
 		.append("toolContentID: ", toolContentID).append("defaultContentId: ", defaultContentId)
 		.append("defaultContentIdStr: ", defaultContentIdStr).append("reflect: ", reflect)
-		.append("isDefineLater: ", isDefineLater).append("allowText: ", allowText)
+		.append("allowText: ", allowText)
 		.append("showResults: ", showResults).append("lockOnFinish: ", lockOnFinish)
 		.append("maxNominationCount: ", maxNominationCount).append("minNominationCount: ", minNominationCount)
 		.append("activityTitle: ", activityTitle).append("activityInstructions: ", activityInstructions)
 		.append("maxOptionIndex: ", maxOptionIndex).append("defaultOptionContent: ", defaultOptionContent)
-		.append("richTextOfflineInstructions: ", richTextOfflineInstructions)
-		.append("richTextOnlineInstructions: ", richTextOnlineInstructions)
-		.append("listUploadedOfflineFileNames: ", listUploadedOfflineFileNames)
-		.append("listUploadedOnlineFileNames: ", listUploadedOnlineFileNames)
-		.append("listOfflineFilesMetadata: ", listOfflineFilesMetadata)
-		.append("listOnlineFilesMetadata: ", listOnlineFilesMetadata)
-		.append("mapOptionsContent: ", mapOptionsContent).append("onlineInstructions: ", onlineInstructions)
-		.append("offlineInstructions: ", offlineInstructions)
+		.append("mapOptionsContent: ", mapOptionsContent)
 		.append("userExceptionMaxNominationInvalid: ", userExceptionMaxNominationInvalid)
 		.append("userExceptionFilenameEmpty: ", userExceptionFilenameEmpty)
 		.append("isMonitoredContentInUse: ", isMonitoredContentInUse)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java	(.../VoteGeneralLearnerFlowDTO.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java	(.../VoteGeneralLearnerFlowDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -52,8 +52,6 @@
 
     protected String minNominationCountReached;
 
-    protected String activityRunOffline;
-
     protected String toolSessionID;
 
     protected String toolContentID;
@@ -115,21 +113,6 @@
     protected List listUserEntries;
 
     /**
-     * @return Returns the activityRunOffline.
-     */
-    public String getActivityRunOffline() {
-	return activityRunOffline;
-    }
-
-    /**
-     * @param activityRunOffline
-     *            The activityRunOffline to set.
-     */
-    public void setActivityRunOffline(String activityRunOffline) {
-	this.activityRunOffline = activityRunOffline;
-    }
-
-    /**
      * @return Returns the castVoteCount.
      */
     public String getCastVoteCount() {
@@ -443,7 +426,6 @@
 		.append("activityTitle: ", activityTitle).append("revisitingUser: ", revisitingUser)
 		.append("userEntry: ", userEntry).append("castVoteCount: ", castVoteCount)
 		.append("maxNominationCountReached: ", maxNominationCountReached)
-		.append("activityRunOffline: ", activityRunOffline).append("toolSessionID: ", toolSessionID)
 		.append("learningMode: ", learningMode).append("maxNominationCount: ", maxNominationCount)
 		.append("allowTextEntry: ", allowTextEntry).append("showResults: ", showResults)
 		.append("lockOnFinish: ", lockOnFinish).append("toolContentID: ", toolContentID)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralMonitoringDTO.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralMonitoringDTO.java	(.../VoteGeneralMonitoringDTO.java)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralMonitoringDTO.java	(.../VoteGeneralMonitoringDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -72,12 +72,6 @@
 	protected List listUserEntries;
 	protected String selectedToolSessionId;
 	
-	protected String richTextOnlineInstructions;
-	protected String richTextOfflineInstructions;
-	protected List listOfflineFilesMetadata;
-	protected List listUploadedOfflineFileNames;
-	protected List listOnlineFilesMetadata;
-	protected List listUploadedOnlineFileNames;
 	protected String showOpenVotesSection;
 	
 	protected List listVoteAllSessionsDTO;
@@ -93,90 +87,9 @@
     protected String completedSessionUserPercent;
     protected List mapStudentsVoted;
     
-    protected String onlineInstructions;
-    protected String offlineInstructions;
-    protected List attachmentList;
-    protected List deletedAttachmentList;
-    
     protected String contentFolderID;
 
-
-    
     /**
-     * @return Returns the listOfflineFilesMetadata.
-     */
-    public List getListOfflineFilesMetadata() {
-        return listOfflineFilesMetadata;
-    }
-    /**
-     * @param listOfflineFilesMetadata The listOfflineFilesMetadata to set.
-     */
-    public void setListOfflineFilesMetadata(List listOfflineFilesMetadata) {
-        this.listOfflineFilesMetadata = listOfflineFilesMetadata;
-    }
-    /**
-     * @return Returns the listOnlineFilesMetadata.
-     */
-    public List getListOnlineFilesMetadata() {
-        return listOnlineFilesMetadata;
-    }
-    /**
-     * @param listOnlineFilesMetadata The listOnlineFilesMetadata to set.
-     */
-    public void setListOnlineFilesMetadata(List listOnlineFilesMetadata) {
-        this.listOnlineFilesMetadata = listOnlineFilesMetadata;
-    }
-    /**
-     * @return Returns the listUploadedOfflineFileNames.
-     */
-    public List getListUploadedOfflineFileNames() {
-        return listUploadedOfflineFileNames;
-    }
-    /**
-     * @param listUploadedOfflineFileNames The listUploadedOfflineFileNames to set.
-     */
-    public void setListUploadedOfflineFileNames(
-            List listUploadedOfflineFileNames) {
-        this.listUploadedOfflineFileNames = listUploadedOfflineFileNames;
-    }
-    /**
-     * @return Returns the listUploadedOnlineFileNames.
-     */
-    public List getListUploadedOnlineFileNames() {
-        return listUploadedOnlineFileNames;
-    }
-    /**
-     * @param listUploadedOnlineFileNames The listUploadedOnlineFileNames to set.
-     */
-    public void setListUploadedOnlineFileNames(List listUploadedOnlineFileNames) {
-        this.listUploadedOnlineFileNames = listUploadedOnlineFileNames;
-    }
-    /**
-     * @return Returns the richTextOfflineInstructions.
-     */
-    public String getRichTextOfflineInstructions() {
-        return richTextOfflineInstructions;
-    }
-    /**
-     * @param richTextOfflineInstructions The richTextOfflineInstructions to set.
-     */
-    public void setRichTextOfflineInstructions(
-            String richTextOfflineInstructions) {
-        this.richTextOfflineInstructions = richTextOfflineInstructions;
-    }
-    /**
-     * @return Returns the richTextOnlineInstructions.
-     */
-    public String getRichTextOnlineInstructions() {
-        return richTextOnlineInstructions;
-    }
-    /**
-     * @param richTextOnlineInstructions The richTextOnlineInstructions to set.
-     */
-    public void setRichTextOnlineInstructions(String richTextOnlineInstructions) {
-        this.richTextOnlineInstructions = richTextOnlineInstructions;
-    }
-    /**
      * @return Returns the userExceptionContentDoesNotExist.
      */
     public String getUserExceptionContentDoesNotExist() {
@@ -714,7 +627,6 @@
             .append("isToolSessionChanged: ", isToolSessionChanged)
             .append("currentTab: ", currentTab)
             .append("sbmtSuccess: ", sbmtSuccess)
-            .append("defineLaterInEditMode: ", defineLaterInEditMode)
             .append("requestLearningReport: ", requestLearningReport)
             .append("userExceptionNoToolSessions: ", userExceptionNoToolSessions)
             .append("userExceptionContentDoesNotExist: ", userExceptionContentDoesNotExist)
@@ -736,12 +648,6 @@
             .append("existsOpenVotes: ", existsOpenVotes)
             .append("selectedToolSessionId: ", selectedToolSessionId)
             .append("listVoteAllSessionsDTO: ", listVoteAllSessionsDTO)
-			.append("richTextOnlineInstructions: ", richTextOnlineInstructions)
-			.append("richTextOfflineInstructions: ", richTextOfflineInstructions)
-			.append("listOfflineFilesMetadata: ", listOfflineFilesMetadata)
-			.append("listUploadedOfflineFileNames: ", listUploadedOfflineFileNames)
-			.append("listOnlineFilesMetadata: ", listOnlineFilesMetadata)
-			.append("listUploadedOnlineFileNames: ", listUploadedOnlineFileNames)
 			.append("showOpenVotesSection: ", showOpenVotesSection)
 			.append("mapStudentsVoted: ", mapStudentsVoted)
 			.append("responseId: ", responseId)
@@ -774,45 +680,7 @@
     public void setMonitoredContentInUse(String monitoredContentInUse) {
         this.monitoredContentInUse = monitoredContentInUse;
     }
-    
     /**
-     * @return Returns the offlineInstructions.
-     */
-    public String getOfflineInstructions() {
-        return offlineInstructions;
-    }
-    /**
-     * @param offlineInstructions The offlineInstructions to set.
-     */
-    public void setOfflineInstructions(String offlineInstructions) {
-        this.offlineInstructions = offlineInstructions;
-    }
-    /**
-     * @return Returns the onlineInstructions.
-     */
-    public String getOnlineInstructions() {
-        return onlineInstructions;
-    }
-    /**
-     * @param onlineInstructions The onlineInstructions to set.
-     */
-    public void setOnlineInstructions(String onlineInstructions) {
-        this.onlineInstructions = onlineInstructions;
-    }
-    
-    /**
-     * @return Returns the attachmentList.
-     */
-    public List getAttachmentList() {
-        return attachmentList;
-    }
-    /**
-     * @param attachmentList The attachmentList to set.
-     */
-    public void setAttachmentList(List attachmentList) {
-        this.attachmentList = attachmentList;
-    }
-    /**
      * @return Returns the contentFolderID.
      */
     public String getContentFolderID() {
@@ -824,16 +692,4 @@
     public void setContentFolderID(String contentFolderID) {
         this.contentFolderID = contentFolderID;
     }
-    /**
-     * @return Returns the deletedAttachmentList.
-     */
-    public List getDeletedAttachmentList() {
-        return deletedAttachmentList;
-    }
-    /**
-     * @param deletedAttachmentList The deletedAttachmentList to set.
-     */
-    public void setDeletedAttachmentList(List deletedAttachmentList) {
-        this.deletedAttachmentList = deletedAttachmentList;
-    }
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -36,7 +36,6 @@
 
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
-import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.web.VoteAuthoringForm;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -152,18 +151,12 @@
 	voteAuthoringForm.setLockOnFinish(defaultVoteContent.isLockOnFinish() ? "1" : "0");
 	voteAuthoringForm.setReflect(defaultVoteContent.isReflect() ? "1" : "0");
 
-	voteAuthoringForm.setOnlineInstructions(defaultVoteContent.getOnlineInstructions());
-	voteAuthoringForm.setOfflineInstructions(defaultVoteContent.getOfflineInstructions());
-
 	voteGeneralAuthoringDTO
 		.setUseSelectLeaderToolOuput(defaultVoteContent.isUseSelectLeaderToolOuput() ? "1" : "0");
 	voteGeneralAuthoringDTO.setAllowText(defaultVoteContent.isAllowText() ? "1" : "0");
 	voteGeneralAuthoringDTO.setLockOnFinish(defaultVoteContent.isLockOnFinish() ? "1" : "0");
 	voteAuthoringForm.setReflect(defaultVoteContent.isReflect() ? "1" : "0");
 
-	voteGeneralAuthoringDTO.setOnlineInstructions(defaultVoteContent.getOnlineInstructions());
-	voteGeneralAuthoringDTO.setOfflineInstructions(defaultVoteContent.getOfflineInstructions());
-
 	String maxNomcount = defaultVoteContent.getMaxNominationCount();
 	if (maxNomcount.equals(""))
 	    maxNomcount = "0";
@@ -236,26 +229,8 @@
 	if (richTextInstructions != null) {
 	    voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 	}
-
-	String richTextOfflineInstructions = request.getParameter(RICHTEXT_OFFLINEINSTRUCTIONS);
-
-	if ((richTextOfflineInstructions != null) && (richTextOfflineInstructions.length() > 0)) {
-	    voteGeneralAuthoringDTO.setRichTextOfflineInstructions(richTextOfflineInstructions);
-	    sessionMap.put(OFFLINE_INSTRUCTIONS_KEY, richTextOfflineInstructions);
-	}
-
-	String richTextOnlineInstructions = request.getParameter(RICHTEXT_ONLINEINSTRUCTIONS);
-
-	if ((richTextOnlineInstructions != null) && (richTextOnlineInstructions.length() > 0)) {
-	    voteGeneralAuthoringDTO.setRichTextOnlineInstructions(richTextOnlineInstructions);
-	    sessionMap.put(ONLINE_INSTRUCTIONS_KEY, richTextOnlineInstructions);
-	}
     }
 
-    public static void configureContentRepository(HttpServletRequest request, IVoteService voteService) {
-	voteService.configureContentRepository();
-    }
-
     /**
      * temporary function
      * 
@@ -362,17 +337,6 @@
 	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 voteContent)
-     * 
-     * @param voteContent
-     * @return boolean
-     */
-    public static boolean isRunOffline(VoteContent voteContent) {
-	return voteContent.isRunOffline();
-    }
-
     public static String getDestination(String sourceVoteStarter) {
 
 	if ((sourceVoteStarter != null) && !sourceVoteStarter.equals("monitoring")) {
@@ -435,7 +399,6 @@
 	request.getSession().removeAttribute(USER_EXCEPTION_MODE_REQUIRED);
 	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
 	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_BEING_MODIFIED);
-	request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_RUNOFFLINE);
 	request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID);
 	request.getSession().removeAttribute(USER_EXCEPTION_QUESTION_EMPTY);
 	request.getSession().removeAttribute(USER_EXCEPTION_ANSWER_EMPTY);
@@ -444,7 +407,6 @@
 	request.getSession().removeAttribute(USER_EXCEPTION_CHKBOXES_EMPTY);
 	request.getSession().removeAttribute(USER_EXCEPTION_SUBMIT_NONE);
 	request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT);
-	request.getSession().removeAttribute(USER_EXCEPTION_FILENAME_EMPTY);
 	request.getSession().removeAttribute(USER_EXCEPTION_WEIGHT_MUST_EQUAL100);
 	request.getSession().removeAttribute(USER_EXCEPTION_SINGLE_OPTION);
     }
@@ -492,14 +454,6 @@
 	String reflectionSubject = request.getParameter("reflectionSubject");
 	voteAuthoringForm.setReflectionSubject(reflectionSubject);
 	voteGeneralAuthoringDTO.setReflectionSubject(reflectionSubject);
-
-	String offlineInstructions = request.getParameter(OFFLINE_INSTRUCTIONS);
-	voteAuthoringForm.setOfflineInstructions(offlineInstructions);
-	voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	String onlineInstructions = request.getParameter(ONLINE_INSTRUCTIONS);
-	voteAuthoringForm.setOnlineInstructions(onlineInstructions);
-	voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
     }
 
     public static void setDefineLater(HttpServletRequest request, boolean value, String strToolContentID,
@@ -513,56 +467,4 @@
 	}
     }
 
-    /**
-     * If this file exists in attachments map, move it to the deleted attachments map. Returns the updated
-     * deletedAttachments map, creating a new one if needed. If uuid supplied then tries to match on that, otherwise
-     * uses filename and isOnline.
-     */
-    public static List moveToDelete(String uuid, List attachmentsList, List deletedAttachmentsList) {
-
-	List deletedList = deletedAttachmentsList != null ? deletedAttachmentsList : new ArrayList();
-
-	if (attachmentsList != null) {
-	    Iterator iter = attachmentsList.iterator();
-	    VoteUploadedFile attachment = null;
-	    while (iter.hasNext() && attachment == null) {
-		VoteUploadedFile value = (VoteUploadedFile) iter.next();
-
-		if (uuid.equals(value.getUuid())) {
-		    attachment = value;
-		}
-
-	    }
-	    if (attachment != null) {
-		deletedList.add(attachment);
-		attachmentsList.remove(attachment);
-	    }
-	}
-
-	return deletedList;
-    }
-
-    public static List moveToDelete(String filename, boolean isOnline, List attachmentsList, List deletedAttachmentsList) {
-
-	List deletedList = deletedAttachmentsList != null ? deletedAttachmentsList : new ArrayList();
-
-	if (attachmentsList != null) {
-	    Iterator iter = attachmentsList.iterator();
-	    VoteUploadedFile attachment = null;
-	    while (iter.hasNext() && attachment == null) {
-		VoteUploadedFile value = (VoteUploadedFile) iter.next();
-		if (filename.equals(value.getFileName()) && isOnline == value.isFileOnline()) {
-		    attachment = value;
-		}
-
-	    }
-	    if (attachment != null) {
-		deletedList.add(attachment);
-		attachmentsList.remove(attachment);
-	    }
-	}
-
-	return deletedList;
-    }
-
 }
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20140102.sql
===================================================================
diff -u
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20140102.sql	(revision 0)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20140102.sql	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,19 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
+ALTER TABLE tl_lavote11_content DROP COLUMN online_instructions;
+ALTER TABLE tl_lavote11_content DROP COLUMN offline_instructions;
+ALTER TABLE tl_lavote11_content DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lavote11_uploadedfile;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lavote11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	(.../VoteContent.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	(.../VoteContent.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -64,9 +64,6 @@
     private boolean defineLater;
 
     /** nullable persistent field */
-    private boolean runOffline;
-
-    /** nullable persistent field */
     private Date creationDate;
 
     /** nullable persistent field */
@@ -91,22 +88,13 @@
     /** nullable persistent field */
     private boolean contentInUse;
 
-    /** nullable persistent field */
-    private String offlineInstructions;
-
-    /** nullable persistent field */
-    private String onlineInstructions;
-
     private boolean showResults;
 
     /** persistent field */
     private Set voteQueContents;
 
     /** persistent field */
     private Set voteSessions;
-
-    /** persistent field */
-    private Set voteAttachments;
     
     private Date submissionDeadline;
 
@@ -123,17 +111,15 @@
 
     /** full constructor */
     public VoteContent(Long voteContentId, String content, String title, String instructions, boolean defineLater,
-	    boolean runOffline, Date creationDate, Date updateDate, boolean allowText,
-	    boolean useSelectLeaderToolOuput, boolean reflect, String reflectionSubject, String maxNominationCount,
-	    String minNominationCount, long createdBy, boolean lockOnFinish, boolean contentInUse,
-	    String offlineInstructions, String onlineInstructions, boolean showResults, Short maxExternalInputs,
-	    Short externalInputsAdded, Set voteQueContents, Set voteSessions, Set voteAttachments) {
+	    Date creationDate, Date updateDate, boolean allowText, boolean useSelectLeaderToolOuput, boolean reflect,
+	    String reflectionSubject, String maxNominationCount, String minNominationCount, long createdBy,
+	    boolean lockOnFinish, boolean contentInUse, boolean showResults, Short maxExternalInputs,
+	    Short externalInputsAdded, Set voteQueContents, Set voteSessions) {
 	this.voteContentId = voteContentId;
 	this.content = content;
 	this.title = title;
 	this.instructions = instructions;
 	this.defineLater = defineLater;
-	this.runOffline = runOffline;
 	this.creationDate = creationDate;
 	this.updateDate = updateDate;
 	this.maxNominationCount = maxNominationCount;
@@ -145,12 +131,9 @@
 	this.createdBy = createdBy;
 	this.lockOnFinish = lockOnFinish;
 	this.contentInUse = contentInUse;
-	this.offlineInstructions = offlineInstructions;
-	this.onlineInstructions = onlineInstructions;
 	this.showResults = showResults;
 	this.voteQueContents = voteQueContents;
 	this.voteSessions = voteSessions;
-	this.voteAttachments = voteAttachments;
 	this.maxExternalInputs = maxExternalInputs;
 	this.externalInputsAdded = externalInputsAdded;
     }
@@ -180,15 +163,13 @@
      */
     public static VoteContent newInstance(IToolContentHandler toolContentHandler, VoteContent vote, Long newContentId)
 	    throws ItemNotFoundException, RepositoryCheckedException {
-	VoteContent newContent = new VoteContent(newContentId, vote.getContent(), vote.getTitle(), vote
-		.getInstructions(), vote.isDefineLater(), vote.isRunOffline(), vote.getCreationDate(), vote
-		.getUpdateDate(), vote.isAllowText(), vote.isUseSelectLeaderToolOuput(), vote.isReflect(), vote.getReflectionSubject(), vote
-		.getMaxNominationCount(), vote.getMinNominationCount(), vote.getCreatedBy(), vote.isLockOnFinish(),
-		vote.isContentInUse(), vote.getOfflineInstructions(), vote.getOnlineInstructions(), vote
-			.isShowResults(), vote.getMaxExternalInputs(), vote.getExternalInputsAdded(), new TreeSet(),
-		new TreeSet(), new TreeSet());
+	VoteContent newContent = new VoteContent(newContentId, vote.getContent(), vote.getTitle(),
+		vote.getInstructions(), vote.isDefineLater(), vote.getCreationDate(), vote.getUpdateDate(),
+		vote.isAllowText(), vote.isUseSelectLeaderToolOuput(), vote.isReflect(), vote.getReflectionSubject(),
+		vote.getMaxNominationCount(), vote.getMinNominationCount(), vote.getCreatedBy(), vote.isLockOnFinish(),
+		vote.isContentInUse(), vote.isShowResults(), vote.getMaxExternalInputs(),
+		vote.getExternalInputsAdded(), new TreeSet(), new TreeSet());
 	newContent.setVoteQueContents(vote.deepCopyMcQueContent(newContent));
-	newContent.setVoteAttachments(vote.deepCopyMcAttachments(toolContentHandler, newContent));
 	newContent.setAssignedDataFlowObject(vote.getAssignedDataFlowObject());
 
 	return newContent;
@@ -214,26 +195,6 @@
 	return newMcQueContent;
     }
 
-    /**
-     * gets called as part of the copyToolContent
-     * 
-     * @param newMcContent
-     * @return Set
-     */
-    public Set deepCopyMcAttachments(IToolContentHandler toolContentHandler, VoteContent newMcContent)
-	    throws ItemNotFoundException, RepositoryCheckedException {
-	Set newMcQueContent = new TreeSet();
-	for (Iterator i = this.getVoteAttachments().iterator(); i.hasNext();) {
-	    VoteUploadedFile mcUploadedFile = (VoteUploadedFile) i.next();
-	    if (mcUploadedFile.getVoteContent() != null) {
-		VoteUploadedFile newMcUploadedFile = VoteUploadedFile.newInstance(toolContentHandler, mcUploadedFile,
-			newMcContent);
-		newMcQueContent.add(newMcUploadedFile);
-	    }
-	}
-	return newMcQueContent;
-    }
-
     public Long getUid() {
 	return uid;
     }
@@ -266,14 +227,6 @@
 	this.defineLater = defineLater;
     }
 
-    public boolean isRunOffline() {
-	return runOffline;
-    }
-
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
     public Date getUpdateDate() {
 	return updateDate;
     }
@@ -298,22 +251,6 @@
 	this.contentInUse = contentInUse;
     }
 
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
     /**
      * @return Returns the voteQueContents.
      */
@@ -357,25 +294,6 @@
     }
 
     /**
-     * @return Returns the voteAttachments.
-     */
-    public Set getVoteAttachments() {
-	if (voteAttachments == null) {
-	    voteAttachments = new TreeSet();
-	}
-
-	return voteAttachments;
-    }
-
-    /**
-     * @param voteAttachments
-     *            The voteAttachments to set.
-     */
-    public void setVoteAttachments(Set voteAttachments) {
-	this.voteAttachments = voteAttachments;
-    }
-
-    /**
      * @return Returns the creationDate.
      */
     public Date getCreationDate() {
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	(.../IVoteService.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	(.../IVoteService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -22,13 +22,9 @@
 
 package org.lamsfoundation.lams.tool.vote.service;
 
-import java.io.InputStream;
 import java.util.List;
 import java.util.Set;
 
-import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.learningdesign.DataFlowObject;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -43,7 +39,6 @@
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
-import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt;
 import org.lamsfoundation.lams.usermanagement.User;
 
@@ -77,8 +72,6 @@
      */
     void copyAnswersFromLeader(VoteQueUsr user, VoteQueUsr leader);
 
-    void configureContentRepository() throws VoteApplicationException;
-
     void createVote(VoteContent voteContent) throws VoteApplicationException;
 
     VoteContent retrieveVote(Long toolContentID) throws VoteApplicationException;
@@ -234,10 +227,6 @@
 
     void copyToolContent(Long fromContentId, Long toContentId) throws ToolException;
 
-    void setAsDefineLater(Long toolContentID, boolean value) throws DataMissingException, ToolException;
-
-    void setAsRunOffline(Long toolContentID, boolean value) throws DataMissingException, ToolException;
-
     void removeToolContent(Long toolContentID, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException;
 
@@ -262,28 +251,10 @@
 
     List getToolSessionsForContent(VoteContent vote);
 
-    ITicket getRepositoryLoginTicket() throws VoteApplicationException;
-
-    void deleteFromRepository(Long uuid, Long versionID);
-
-    NodeKey uploadFileToRepository(InputStream stream, String fileName) throws VoteApplicationException;
-
-    InputStream downloadFile(Long uuid, Long versionID) throws VoteApplicationException;
-
-    void cleanUploadedFilesMetaData() throws VoteApplicationException;
-
-    void persistFile(String uuid, boolean isOnlineFile, String fileName, VoteContent voteContent)
-	    throws VoteApplicationException;
-
     List getAttemptsForUser(final Long userUid) throws VoteApplicationException;
 
     int countSessionComplete() throws VoteApplicationException;
 
-    NodeKey uploadFile(InputStream istream, String filename, String contentType, String fileType)
-	    throws RepositoryCheckedException;
-
-    NodeKey copyFile(Long uuid) throws RepositoryCheckedException;
-
     List getAllQuestionEntriesSorted(final long voteContentId) throws VoteApplicationException;
 
     List getSessionsFromContent(VoteContent mcContent) throws VoteApplicationException;
@@ -295,12 +266,6 @@
 
     NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID);
 
-    void removeFile(Long submissionId) throws VoteApplicationException;
-
-    void persistFile(VoteContent content, VoteUploadedFile file) throws VoteApplicationException;
-
-    List retrieveVoteUploadedFiles(VoteContent Vote) throws VoteApplicationException;
-
     void removeNominationsFromCache(VoteContent voteContent);
 
     ToolOutput getToolInput(Long requestingToolContentId, Integer learnerId);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java	(.../VoteImportContentVersionFilter.java)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java	(.../VoteImportContentVersionFilter.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,26 +26,37 @@
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 
 /**
- * Import filter class for different versions of Q&A content.
+ * Import filter class for different versions of Vote content.
  */
-public class VoteImportContentVersionFilter extends ToolContentVersionFilter{
+public class VoteImportContentVersionFilter extends ToolContentVersionFilter {
 
-	/**
-	 * Import 2.0RC1 version content to 2.0RC2 version. Added lock on finish
-	 * field.
-	 */
-	public void up20061102To20061113(){
-		this.removeField(VoteContent.class, "voteChangable");
-	}
+    /**
+     * Import 2.0RC1 version content to 2.0RC2 version. Added lock on finish field.
+     */
+    public void up20061102To20061113() {
+	this.removeField(VoteContent.class, "voteChangable");
+    }
 
-	/** Version 2.1 added a showResults column and this should default to true. 20080108 was an pre-release version
-	 * of 2.1, but using 20080108 will cover the prerelease 2.1 + 2.0.4 created import files. */
-	public void up20080108To20080326(){
-		this.addField(VoteContent.class, "showResults", true);
-	}
+    /**
+     * Version 2.1 added a showResults column and this should default to true. 20080108 was an pre-release version of
+     * 2.1, but using 20080108 will cover the prerelease 2.1 + 2.0.4 created import files.
+     */
+    public void up20080108To20080326() {
+	this.addField(VoteContent.class, "showResults", true);
+    }
 
-	/** Version 2.3.4 added a minNominationCount column and this should default to "1". */
-	public void up20090726To20100309(){
-		this.addField(VoteContent.class, "minNominationCount", "1");
-	}
+    /** Version 2.3.4 added a minNominationCount column and this should default to "1". */
+    public void up20090726To20100309() {
+	this.addField(VoteContent.class, "minNominationCount", "1");
+    }
+
+    /**
+     * Import 20131227 version content to 20140102 version tool server.
+     */
+    public void up20131227To20140102() {
+	this.removeField(VoteContent.class, "runOffline");
+	this.removeField(VoteContent.class, "onlineInstructions");
+	this.removeField(VoteContent.class, "offlineInstructions");
+	this.removeField(VoteContent.class, "voteAttachments");
+    }
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -22,7 +22,6 @@
 
 package org.lamsfoundation.lams.tool.vote.service;
 
-import java.io.InputStream;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -35,20 +34,9 @@
 import org.apache.log4j.Logger;
 import org.hibernate.Hibernate;
 import org.hibernate.proxy.HibernateProxy;
-import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
-import org.lamsfoundation.lams.contentrepository.FileException;
-import org.lamsfoundation.lams.contentrepository.ICredentials;
-import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.IVersionedNode;
-import org.lamsfoundation.lams.contentrepository.ItemExistsException;
 import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.LoginException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.DataFlowObject;
@@ -81,14 +69,12 @@
 import org.lamsfoundation.lams.tool.vote.dao.IVoteContentDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteQueContentDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteSessionDAO;
-import org.lamsfoundation.lams.tool.vote.dao.IVoteUploadedFileDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteUserDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteUsrAttemptDAO;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
-import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -115,20 +101,12 @@
 {
     static Logger logger = Logger.getLogger(VoteServicePOJO.class.getName());
 
-    private static String repositoryWorkspaceName = "vote11";
-    private final String repositoryUser = "vote11";
-    private final char[] repositoryId = { 'v', 'o', 't', 'e', '_', '1', '1' };
-
-    private IRepositoryService repositoryService;
-    private ICredentials cred;
-
     private IVoteContentDAO voteContentDAO;
     private IVoteQueContentDAO voteQueContentDAO;
     private IVoteSessionDAO voteSessionDAO;
     private IVoteUserDAO voteUserDAO;
     private IVoteUsrAttemptDAO voteUsrAttemptDAO;
 
-    private IVoteUploadedFileDAO voteUploadedFileDAO;
     private IUserManagementService userManagementService;
     private ILearnerService learnerService;
     private IAuditService auditService;
@@ -296,22 +274,6 @@
 	}
     }
 
-    public void configureContentRepository() throws VoteApplicationException {
-	cred = new SimpleCredentials(repositoryUser, repositoryId);
-	try {
-	    repositoryService.createCredentials(cred);
-	    repositoryService.addWorkspace(cred, VoteServicePOJO.repositoryWorkspaceName);
-	} catch (ItemExistsException ie) {
-	    VoteServicePOJO.logger.warn("Tried to configure repository but it "
-		    + " appears to be already configured. Exception thrown by repository being ignored. ", ie);
-	} catch (RepositoryCheckedException e) {
-	    String error = "Error occured while trying to configure repository." + " Unable to recover from error: "
-		    + e.getMessage();
-	    VoteServicePOJO.logger.error(error, e);
-	    throw new VoteApplicationException(error, e);
-	}
-    }
-
     public void createVote(VoteContent voteContent) throws VoteApplicationException {
 	try {
 	    voteContentDAO.saveVoteContent(voteContent);
@@ -1147,20 +1109,6 @@
 	VoteContent voteContent = voteContentDAO.findVoteContentById(toolContentID);
 
 	if (voteContent != null) {
-	    Iterator filesIterator = voteContent.getVoteAttachments().iterator();
-	    while (filesIterator.hasNext()) {
-		VoteUploadedFile voteUploadedFile = (VoteUploadedFile) filesIterator.next();
-		String filesUuid = voteUploadedFile.getUuid();
-		if (filesUuid != null && filesUuid.length() > 0) {
-		    try {
-			voteToolContentHandler.deleteFile(new Long(filesUuid));
-		    } catch (RepositoryCheckedException e) {
-			VoteServicePOJO.logger.error("exception occured deleting files from content repository : " + e);
-			throw new ToolException("undeletable file in the content repository");
-		    }
-		}
-	    }
-
 	    Iterator sessionIterator = voteContent.getVoteSessions().iterator();
 	    while (sessionIterator.hasNext()) {
 		if (removeSessionData == false) {
@@ -1219,7 +1167,6 @@
 	    for (VoteQueContent que : ques) {
 		que.setMcUsrAttempts(null);
 	    }
-	    exportContentService.registerFileClassForExport(VoteUploadedFile.class.getName(), "uuid", null);
 	    exportContentService.exportToolContent(toolContentID, toolContentObj, voteToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -1239,9 +1186,6 @@
     public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(VoteUploadedFile.class.getName(), "uuid", null, "fileName",
-		    "fileProperty", null, null);
-
 	    // register version filter class
 	    exportContentService.registerImportVersionFilterClass(VoteImportContentVersionFilter.class);
 
@@ -1264,51 +1208,6 @@
     }
 
     /**
-     * Implemented as part of the tool contract. Sets the defineLater to true on this content. setAsDefineLater(Long
-     * toolContentID) throws DataMissingException, ToolException
-     * 
-     * @param toolContentID
-     * @return
-     * @throws ToolException
-     */
-    public void setAsDefineLater(Long toolContentID, boolean value) throws DataMissingException, ToolException {
-	if (toolContentID == null) {
-	    VoteServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentID is null.");
-	    throw new DataMissingException("toolContentID is missing");
-	}
-
-	VoteContent voteContent = retrieveVote(toolContentID);
-	if (voteContent == null) {
-	    VoteServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved voteContent is null.");
-	    throw new DataMissingException("voteContent is missing");
-	}
-	voteContent.setDefineLater(value);
-	saveVoteContent(voteContent);
-    }
-
-    /**
-     * Implemented as part of the tool contract. Sets the runOffline to true on this content. setAsRunOffline(Long
-     * toolContentID) throws DataMissingException, ToolException
-     * 
-     * @param toolContentID
-     *                return
-     * @throws ToolException
-     */
-    public void setAsRunOffline(Long toolContentID, boolean value) throws DataMissingException, ToolException {
-	if (toolContentID == null) {
-	    VoteServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved toolContentID is null.");
-	    throw new DataMissingException("toolContentID is missing");
-	}
-	VoteContent voteContent = voteContentDAO.findVoteContentById(toolContentID);
-	if (voteContent == null) {
-	    VoteServicePOJO.logger.error("throwing DataMissingException: WARNING!: retrieved voteContent is null.");
-	    throw new DataMissingException("voteContent is missing");
-	}
-	voteContent.setRunOffline(value);
-	saveVoteContent(voteContent);
-    }
-
-    /**
      * it is possible that the tool session id already exists in the tool sessions table as the users from the same
      * session are involved. existsSession(long toolSessionID)
      * 
@@ -1517,131 +1416,6 @@
 	List listToolSessionIds = voteSessionDAO.getSessionsFromContent(vote);
 	return listToolSessionIds;
     }
-
-    public void removeAttachment(VoteContent content, VoteUploadedFile attachment) throws RepositoryCheckedException {
-	try {
-	    attachment.setVoteContent(null);
-	    content.getVoteAttachments().remove(attachment);
-	    voteToolContentHandler.deleteFile(new Long(attachment.getUuid()));
-	    saveVoteContent(content);
-	} catch (DataAccessException e) {
-	    throw new VoteApplicationException(
-		    "EXCEPTION: An exception has occurred while trying to remove this attachment" + e.getMessage(), e);
-	}
-    }
-
-    public NodeKey uploadFile(InputStream istream, String filename, String contentType, String fileType)
-	    throws RepositoryCheckedException {
-	return voteToolContentHandler.uploadFile(istream, filename, contentType, fileType);
-    }
-
-    public NodeKey copyFile(Long uuid) throws RepositoryCheckedException {
-	return voteToolContentHandler.copyFile(uuid);
-    }
-
-    /**
-     * This method verifies the credentials of the SubmitFiles Tool and gives it the <code>Ticket</code> to login and
-     * access the Content Repository.
-     * 
-     * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
-     * the tool needs to upload/download files from the content repository.
-     * 
-     * @return ITicket The ticket for repostory access
-     * @throws SubmitFilesException
-     */
-    public ITicket getRepositoryLoginTicket() throws VoteApplicationException {
-	ICredentials credentials = new SimpleCredentials(repositoryUser, repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, VoteServicePOJO.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException e) {
-	    throw new VoteApplicationException("Access Denied to repository." + e.getMessage());
-	} catch (WorkspaceNotFoundException e) {
-	    throw new VoteApplicationException("Workspace not found." + e.getMessage());
-	} catch (LoginException e) {
-	    throw new VoteApplicationException("Login failed." + e.getMessage());
-	}
-    }
-
-    /**
-     * This method deletes the content with the given <code>uuid</code> and <code>versionID</code> from the content
-     * repository
-     * 
-     * @param uuid
-     *                The <code>uuid</code> of the node to be deleted
-     * @param versionID
-     *                The <code>version_id</code> of the node to be deleted.
-     * @throws SubmitFilesException
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws VoteApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    String files[] = repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new VoteApplicationException("Exception occured while deleting files from" + " the repository "
-		    + e.getMessage());
-	}
-    }
-
-    /**
-     * This method is called everytime a new content has to be added to the repository. In order to do so first of all a
-     * valid ticket is obtained from the Repository hence authenticating the tool(SubmitFiles) and then the
-     * corresponding file is added to the repository.
-     * 
-     * @param stream
-     *                The <code>InputStream</code> representing the data to be added
-     * @param fileName
-     *                The name of the file being added
-     * @param mimeType
-     *                The MIME type of the file (eg. TXT, DOC, GIF etc)
-     * @return NodeKey Represents the two part key - UUID and Version.
-     * @throws SubmitFilesException
-     */
-    public NodeKey uploadFileToRepository(InputStream stream, String fileName) throws VoteApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-
-	try {
-	    NodeKey nodeKey = repositoryService.addFileItem(ticket, stream, fileName, null, null);
-	    return nodeKey;
-	} catch (Exception e) {
-	    throw new VoteApplicationException("Exception occured while trying to" + " upload file into the repository"
-		    + e.getMessage());
-	}
-    }
-
-    public InputStream downloadFile(Long uuid, Long versionID) throws VoteApplicationException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    IVersionedNode node = repositoryService.getFileItem(ticket, uuid, null);
-	    return node.getFile();
-	} catch (AccessDeniedException e) {
-	    throw new VoteApplicationException("AccessDeniedException occured while trying to download file "
-		    + e.getMessage());
-	} catch (FileException e) {
-	    throw new VoteApplicationException("FileException occured while trying to download file " + e.getMessage());
-	} catch (ItemNotFoundException e) {
-	    throw new VoteApplicationException("ItemNotFoundException occured while trying to download file "
-		    + e.getMessage());
-	}
-    }
-
-    /**
-     * adds a new entry to the uploaded files table
-     */
-    public void persistFile(String uuid, boolean isOnlineFile, String fileName, VoteContent voteContent)
-	    throws VoteApplicationException {
-
-	VoteUploadedFile voteUploadedFile = new VoteUploadedFile(uuid, isOnlineFile, fileName, voteContent);
-	voteUploadedFileDAO.saveUploadFile(voteUploadedFile);
-    }
-
-    /**
-     * 
-     * removes all the entries in the uploaded files table
-     */
-    public void cleanUploadedFilesMetaData() throws VoteApplicationException {
-	voteUploadedFileDAO.cleanUploadedFilesMetaData();
-    }
     
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
@@ -1699,12 +1473,9 @@
 	toolContentObj.setDefineLater(false);
 	toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
-	toolContentObj.setOfflineInstructions(null);
-	toolContentObj.setOnlineInstructions(null);
 	toolContentObj.setReflectionSubject(null);
 	toolContentObj.setReflect(false);
 	toolContentObj.setUseSelectLeaderToolOuput(false);
-	toolContentObj.setRunOffline(false);
 	toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 
 	toolContentObj.setContent(null);
@@ -1739,7 +1510,6 @@
 	}
 
 	// leave as empty, no need to set them to anything.
-	// setVoteUploadedFiles(Set voteAttachments);
 	// setVoteSessions(Set voteSessions);
 
 	// set up question from body
@@ -1800,56 +1570,7 @@
 	}
     }
 
-    public void removeFile(Long submissionId) throws VoteApplicationException {
-	voteUploadedFileDAO.removeUploadFile(submissionId);
-    }
-
-    public void persistFile(VoteContent content, VoteUploadedFile file) throws VoteApplicationException {
-	content.getVoteAttachments().add(file);
-	file.setVoteContent(content);
-	voteContentDAO.saveOrUpdateVote(content);
-
-    }
-
-    public List retrieveVoteUploadedFiles(VoteContent Vote) throws VoteApplicationException {
-	try {
-	    return voteUploadedFileDAO.retrieveVoteUploadedFiles(Vote);
-	} catch (DataAccessException e) {
-	    throw new VoteApplicationException("Exception occured when lams is loading Vote uploaded files: "
-		    + e.getMessage(), e);
-	}
-    }
-
     /**
-     * @return Returns the cred.
-     */
-    public ICredentials getCred() {
-	return cred;
-    }
-
-    /**
-     * @param cred
-     *                The cred to set.
-     */
-    public void setCred(ICredentials cred) {
-	this.cred = cred;
-    }
-
-    /**
-     * @return Returns the repositoryId.
-     */
-    public char[] getRepositoryId() {
-	return repositoryId;
-    }
-
-    /**
-     * @return Returns the repositoryUser.
-     */
-    public String getRepositoryUser() {
-	return repositoryUser;
-    }
-
-    /**
      * @return Returns the toolService.
      */
     public ILamsToolService getToolService() {
@@ -1908,21 +1629,6 @@
 	this.voteUsrAttemptDAO = voteUsrAttemptDAO;
     }
 
-    /**
-     * @return Returns the repositoryService.
-     */
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    /**
-     * @param repositoryService
-     *                The repositoryService to set.
-     */
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public void setUserManagementService(IUserManagementService userManagementService) {
 	this.userManagementService = userManagementService;
     }
@@ -1932,21 +1638,6 @@
     }
 
     /**
-     * @return Returns the voteUploadedFileDAO.
-     */
-    public IVoteUploadedFileDAO getvoteUploadedFileDAO() {
-	return voteUploadedFileDAO;
-    }
-
-    /**
-     * @param voteUploadedFileDAO
-     *                The voteUploadedFileDAO to set.
-     */
-    public void setvoteUploadedFileDAO(IVoteUploadedFileDAO voteUploadedFileDAO) {
-	this.voteUploadedFileDAO = voteUploadedFileDAO;
-    }
-
-    /**
      * @return Returns the voteToolContentHandler.
      */
     public IToolContentHandler getVoteToolContentHandler() {
@@ -2052,21 +1743,6 @@
     }
 
     /**
-     * @return Returns the voteUploadedFileDAO.
-     */
-    public IVoteUploadedFileDAO getVoteUploadedFileDAO() {
-	return voteUploadedFileDAO;
-    }
-
-    /**
-     * @param voteUploadedFileDAO
-     *                The voteUploadedFileDAO to set.
-     */
-    public void setVoteUploadedFileDAO(IVoteUploadedFileDAO voteUploadedFileDAO) {
-	this.voteUploadedFileDAO = voteUploadedFileDAO;
-    }
-
-    /**
      * @return Returns the voteUserDAO.
      */
     public IVoteUserDAO getVoteUserDAO() {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -43,10 +43,6 @@
 	<bean id="voteUsrAttemptDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUsrAttemptDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-
-	<bean id="voteUploadedFileDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUploadedFileDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
 	
 	<bean id="voteToolContentHandler" class="org.lamsfoundation.lams.tool.vote.util.VoteToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
@@ -67,11 +63,9 @@
 					<property name="voteSessionDAO"><ref bean="voteSessionDAO"/></property>
 					<property name="voteUserDAO"><ref bean="voteUserDAO"/></property>
 					<property name="voteQueContentDAO"><ref bean="voteQueContentDAO"/></property>
-					<property name="voteUsrAttemptDAO"><ref bean="voteUsrAttemptDAO"/></property>													
-			 		<property name="voteUploadedFileDAO"><ref bean="voteUploadedFileDAO"/></property>
+					<property name="voteUsrAttemptDAO"><ref bean="voteUsrAttemptDAO"/></property>
 			 		<property name="dataFlowDAO"><ref bean="dataFlowDAO"/></property>
 					<property name="toolService"><ref bean="lamsToolService"/></property>
-			 		<property name="repositoryService"><ref bean="repositoryService"/></property> 
 			 		<property name="learnerService"><ref bean="learnerService"/></property>		
 					<property name="auditService"><ref bean="auditService"/></property>			 		
 					<property name="voteToolContentHandler"><ref bean="voteToolContentHandler"/></property>		
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -22,9 +22,6 @@
 
 package org.lamsfoundation.lams.tool.vote.web;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -36,18 +33,12 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.FileException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.learningdesign.DataFlowObject;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
-import org.lamsfoundation.lams.tool.vote.VoteAttachmentDTO;
 import org.lamsfoundation.lams.tool.vote.VoteComparator;
 import org.lamsfoundation.lams.tool.vote.VoteNominationContentDTO;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
-import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -188,221 +179,6 @@
 	return mapTempOptionsContent;
     }
 
-    /**
-     * 
-     * Used in uploading offline and online files
-     * 
-     * @param request
-     * @param voteAuthoringForm
-     * @param isOfflineFile
-     * @return VoteAttachmentDTO
-     * @throws RepositoryCheckedException
-     */
-    public static VoteAttachmentDTO uploadFile(HttpServletRequest request, IVoteService voteService,
-	    VoteAuthoringForm voteAuthoringForm, boolean isOfflineFile, SessionMap sessionMap)
-	    throws RepositoryCheckedException {
-
-	InputStream stream = null;
-	String fileName = null;
-	String mimeType = null;
-	String fileProperty = null;
-
-	if (isOfflineFile) {
-	    FormFile theOfflineFile = voteAuthoringForm.getTheOfflineFile();
-
-	    try {
-		stream = theOfflineFile.getInputStream();
-		fileName = theOfflineFile.getFileName();
-		if (fileName.length() == 0) {
-		    return null;
-		}
-		fileProperty = "OFFLINE";
-
-	    } catch (FileNotFoundException e) {
-		AuthoringUtil.logger
-			.error("filenotfound exception occured in accessing the repository server for the offline file : "
-				+ e.getMessage());
-	    } catch (IOException e) {
-		AuthoringUtil.logger
-			.error("io exception occured in accessing the repository server for the offline file : "
-				+ e.getMessage());
-	    }
-
-	    if (fileName.length() > 0) {
-		List listUploadedOfflineFileNames = (List) sessionMap
-			.get(VoteAppConstants.LIST_UPLOADED_OFFLINE_FILENAMES_KEY);
-		int index = findFileNameIndex(listUploadedOfflineFileNames, fileName);
-		if (index == 0) {
-		    listUploadedOfflineFileNames.add(fileName);
-		    sessionMap.put(VoteAppConstants.LIST_UPLOADED_OFFLINE_FILENAMES_KEY, listUploadedOfflineFileNames);
-		}
-	    }
-
-	} else {
-	    FormFile theOnlineFile = voteAuthoringForm.getTheOnlineFile();
-
-	    try {
-		stream = theOnlineFile.getInputStream();
-		fileName = theOnlineFile.getFileName();
-
-		if (fileName.length() == 0) {
-		    return null;
-		}
-
-		fileProperty = "ONLINE";
-
-	    } catch (FileNotFoundException e) {
-		AuthoringUtil.logger
-			.error("filenotfound exception occured in accessing the repository server for the online file : "
-				+ e.getMessage());
-	    } catch (IOException e) {
-		AuthoringUtil.logger
-			.error("io exception occured in accessing the repository server for the online file : "
-				+ e.getMessage());
-	    }
-
-	    if (fileName.length() > 0) {
-		List listUploadedOnlineFileNames = (List) sessionMap
-			.get(VoteAppConstants.LIST_UPLOADED_ONLINE_FILENAMES_KEY);
-		int index = findFileNameIndex(listUploadedOnlineFileNames, fileName);
-		if (index == 0) {
-		    listUploadedOnlineFileNames.add(fileName);
-		    sessionMap.put(VoteAppConstants.LIST_UPLOADED_ONLINE_FILENAMES_KEY, listUploadedOnlineFileNames);
-		}
-	    }
-	}
-
-	NodeKey nodeKey = null;
-	try {
-	    nodeKey = voteService.uploadFile(stream, fileName, mimeType, fileProperty);
-	} catch (FileException e) {
-	    AuthoringUtil.logger.error("exception writing raw data:" + e);
-	    /* return a null dto */
-	    return null;
-	}
-
-	VoteAttachmentDTO voteAttachmentDTO = new VoteAttachmentDTO();
-	voteAttachmentDTO.setUid(null);
-	voteAttachmentDTO.setUuid(nodeKey.getUuid().toString());
-	voteAttachmentDTO.setFilename(fileName);
-	voteAttachmentDTO.setOfflineFile(isOfflineFile);
-
-	return voteAttachmentDTO;
-    }
-
-    /**
-     * returns a list of Vote attachements for listing of online and offline file information
-     * 
-     * @param listOfflineFilesMetaData
-     * @return
-     */
-    public static List populateMetaDataAsAttachments(List listOfflineFilesMetaData) {
-	List listAttachments = new LinkedList();
-
-	Iterator itList = listOfflineFilesMetaData.iterator();
-	while (itList.hasNext()) {
-	    VoteUploadedFile voteUploadedFile = (VoteUploadedFile) itList.next();
-
-	    VoteAttachmentDTO voteAttachmentDTO = new VoteAttachmentDTO();
-	    voteAttachmentDTO.setUid(voteUploadedFile.getSubmissionId().toString());
-	    voteAttachmentDTO.setUuid(voteUploadedFile.getUuid());
-	    voteAttachmentDTO.setFilename(voteUploadedFile.getFileName());
-	    voteAttachmentDTO.setOfflineFile(!voteUploadedFile.isFileOnline());
-
-	    listAttachments.add(voteAttachmentDTO);
-	}
-	return listAttachments;
-    }
-
-    /**
-     * @param listFilesMetaData
-     * @return
-     */
-    public static List populateMetaDataAsFilenames(List listFilesMetaData) {
-	List listFilenames = new LinkedList();
-
-	Iterator itList = listFilesMetaData.iterator();
-	while (itList.hasNext()) {
-	    VoteAttachmentDTO voteAttachmentDTO = (VoteAttachmentDTO) itList.next();
-	    listFilenames.add(voteAttachmentDTO.getFilename());
-	}
-	return listFilenames;
-    }
-
-    /**
-     * used in removing a file item listed in the jsp
-     * 
-     * @param request
-     * @param filename
-     * @param offlineFile
-     */
-    public static void removeFileItem(HttpServletRequest request, String filename, String offlineFile,
-	    SessionMap sessionMap) {
-	if (offlineFile.equals("1")) {
-	    List listUploadedOfflineFileNames = (List) sessionMap
-		    .get(VoteAppConstants.LIST_UPLOADED_OFFLINE_FILENAMES_KEY);
-
-	    listUploadedOfflineFileNames.remove(filename);
-
-	    sessionMap.put(VoteAppConstants.LIST_UPLOADED_OFFLINE_FILENAMES_KEY, listUploadedOfflineFileNames);
-	} else {
-	    List listUploadedOnlineFileNames = (List) sessionMap
-		    .get(VoteAppConstants.LIST_UPLOADED_ONLINE_FILENAMES_KEY);
-
-	    listUploadedOnlineFileNames.remove(filename);
-
-	    sessionMap.put(VoteAppConstants.LIST_UPLOADED_ONLINE_FILENAMES_KEY, listUploadedOnlineFileNames);
-	}
-    }
-
-    /**
-     * @param listUploadedFileNames
-     * @param filename
-     * @return int
-     */
-    public static int findFileNameIndex(List listUploadedFileNames, String filename) {
-	Iterator itListUploadedFileNames = listUploadedFileNames.iterator();
-	int mainIndex = 0;
-	while (itListUploadedFileNames.hasNext()) {
-	    mainIndex++;
-	    String currentFilename = (String) itListUploadedFileNames.next();
-	    if (currentFilename.equals(filename)) {
-		return mainIndex;
-	    }
-	}
-	return 0;
-    }
-
-    public static List removeFileItem(List listFilesMetaData, String uuid) {
-	VoteAttachmentDTO deletableAttachmentDTO = null;
-
-	Iterator itList = listFilesMetaData.iterator();
-	while (itList.hasNext()) {
-	    VoteAttachmentDTO currentAttachmentDTO = (VoteAttachmentDTO) itList.next();
-
-	    if (currentAttachmentDTO.getUuid().equals(uuid)) {
-		deletableAttachmentDTO = currentAttachmentDTO;
-		break;
-	    }
-	}
-
-	listFilesMetaData.remove(deletableAttachmentDTO);
-
-	return listFilesMetaData;
-    }
-
-    public static List extractFileNames(List listFilesMetaData) {
-	Iterator itList = listFilesMetaData.iterator();
-	LinkedList listFilenames = new LinkedList();
-
-	while (itList.hasNext()) {
-	    VoteAttachmentDTO voteAttachmentDTO = (VoteAttachmentDTO) itList.next();
-	    String filename = voteAttachmentDTO.getFilename();
-	    listFilenames.add(filename);
-	}
-	return listFilenames;
-    }
-
     protected Map reconstructOptionContentMapForAdd(Map mapOptionsContent, HttpServletRequest request) {
 
 	mapOptionsContent = repopulateMap(mapOptionsContent, request);
@@ -549,11 +325,7 @@
 	String maxNomcount = voteAuthoringForm.getMaxNominationCount();
 
         String minNomcount= voteAuthoringForm.getMinNominationCount();
-	    
-	String richTextOfflineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
 
-	String richTextOnlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-
 	String activeModule = voteAuthoringForm.getActiveModule();
 
 	boolean lockedOnFinishBoolean = false;
@@ -626,9 +398,7 @@
 	    voteContent.setReflect(reflectBoolean);
 	    voteContent.setReflectionSubject(reflectionSubject);
 	    voteContent.setMaxNominationCount(maxNomcount);
-	    voteContent.setMinNominationCount(minNomcount);	    
-	    voteContent.setOnlineInstructions(richTextOnlineInstructions);
-	    voteContent.setOfflineInstructions(richTextOfflineInstructions);
+	    voteContent.setMinNominationCount(minNomcount);
 	    voteContent.setMaxExternalInputs(maxInputsShort);
 	}
 
@@ -989,9 +759,6 @@
 	
         String minNomcount= voteAuthoringForm.getMinNominationCount();
 
-	String richTextOfflineInstructions = request.getParameter(VoteAppConstants.OFFLINE_INSTRUCTIONS);
-	String richTextOnlineInstructions = request.getParameter(VoteAppConstants.ONLINE_INSTRUCTIONS);
-
 	String activeModule = request.getParameter(VoteAppConstants.ACTIVE_MODULE);
 
 	boolean setCommonContent = true;
@@ -1069,9 +836,6 @@
 	    voteContent.setMaxNominationCount(maxNomcount);
 	    voteContent.setMinNominationCount(minNomcount);
 
-	    voteContent.setOnlineInstructions(richTextOnlineInstructions);
-	    voteContent.setOfflineInstructions(richTextOfflineInstructions);
-
 	    voteContent.setReflectionSubject(reflectionSubject);
 
 	    voteContent.setMaxExternalInputs(maxInputsShort);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -50,34 +50,20 @@
 		    session.removeAttribute(TOOL_CONTENT_ID);
 		    session.removeAttribute(DEFAULT_CONTENT_ID);
 		    session.removeAttribute(DEFAULT_CONTENT_ID_STR);
-		    session.removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
-		    session.removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
-		    session.removeAttribute(LIST_OFFLINEFILES_METADATA);
-		    session.removeAttribute(LIST_ONLINEFILES_METADATA);
 		    session.removeAttribute(IS_DEFINE_LATER);
 		    session.removeAttribute(REMOVABLE_QUESTION_INDEX);
 		    session.removeAttribute(ACTIVITY_TITLE);
 		    session.removeAttribute(ACTIVITY_INSTRUCTIONS);
 		    session.removeAttribute(DEFAULT_OPTION_CONTENT);
 		    session.removeAttribute(MAP_OPTIONS_CONTENT);
 		    session.removeAttribute(MAX_OPTION_INDEX);
-		    session.removeAttribute(RICHTEXT_OFFLINEINSTRUCTIONS);
-		    session.removeAttribute(RICHTEXT_ONLINEINSTRUCTIONS);
-		    session.removeAttribute(LIST_OFFLINEFILES_METADATA);
-		    session.removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
-		    session.removeAttribute(LIST_ONLINEFILES_METADATA);
-		    session.removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
 		    session.removeAttribute(EDITACTIVITY_EDITMODE);
-		    session.removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
-		    session.removeAttribute(ATTACHMENT_LIST);
-		    session.removeAttribute(DELETED_ATTACHMENT_LIST);
 		    session.removeAttribute(IS_MONITORED_CONTENT_IN_USE);
 		    session.removeAttribute(OPT_INDEX);
 		    session.removeAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP);
 		    session.removeAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS);
 		    session.removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
 		    session.removeAttribute(USER_EXCEPTION_CONTENTID_REQUIRED);
-		    session.removeAttribute(USER_EXCEPTION_FILENAME_EMPTY);
 		    session.removeAttribute(USER_EXCEPTION_NUMBERFORMAT);
 		}
 	}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
===================================================================
diff -u -rb33e717f9a734d318eefab07a17234f07c770c92 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	(.../ExportServlet.java)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	(.../ExportServlet.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -73,30 +73,6 @@
 	return FILENAME;
     }
 
-    @Override
-    protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
-	    Cookie[] cookies) {
-	if ((toolContentID == null) && (toolSessionID == null)) {
-	    ExportServlet.logger.error("Tool content Id or and session Id are null. Unable to activity title");
-	} else {
-	    IVoteService service = VoteServiceProxy.getVoteService(getServletContext());
-
-	    VoteContent content = null;
-	    if (toolContentID != null) {
-		content = service.retrieveVote(toolContentID);
-	    } else {
-		VoteSession session = service.retrieveVoteSession(toolSessionID);
-		if (session != null) {
-		    content = session.getVoteContent();
-		}
-	    }
-	    if (content != null) {
-		activityTitle = content.getTitle();
-	    }
-	}
-	return super.doOfflineExport(request, response, directoryName, cookies);
-    }
-
     public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
 	ExportPortfolioDTO exportPortfolioDTO = new ExportPortfolioDTO();
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -22,7 +22,6 @@
 
 package org.lamsfoundation.lams.tool.vote.web;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -41,40 +40,28 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learningdesign.DataFlowObject;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
-import org.lamsfoundation.lams.tool.vote.VoteAttachmentDTO;
 import org.lamsfoundation.lams.tool.vote.VoteGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.vote.VoteNominationContentDTO;
 import org.lamsfoundation.lams.tool.vote.VoteUtils;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
-import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
-import org.lamsfoundation.lams.tool.vote.util.VoteToolContentHandler;
-import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Ozgur Demirtas
  */
 public class VoteAction extends LamsDispatchAction implements VoteAppConstants {
     static Logger logger = Logger.getLogger(VoteAction.class.getName());
 
-    private VoteToolContentHandler toolContentHandler;
-
     /**
      * 
      * main content/question content management and workflow logic
@@ -96,307 +83,6 @@
     }
 
     /**
-     * persists offline files
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     * @throws RepositoryCheckedException
-     */
-    public ActionForward submitOfflineFiles(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, RepositoryCheckedException {
-	VoteUtils.cleanUpUserExceptions(request);
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-
-	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-	VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO();
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	voteAuthoringForm.setContentFolderID(contentFolderID);
-
-	repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
-	String httpSessionID = voteAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	Map mapOptionsContent = (Map) sessionMap.get(VoteAppConstants.MAP_OPTIONS_CONTENT_KEY);
-	voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent);
-
-	int maxIndex = mapOptionsContent.size();
-	voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex);
-
-	String firstEntry = (String) mapOptionsContent.get("1");
-	voteGeneralAuthoringDTO.setDefaultOptionContent(firstEntry);
-
-	voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
-	voteGeneralAuthoringDTO.setSubmissionAttempt(new Boolean(false).toString());
-
-	/* determine whether the request is from Monitoring url Edit Activity */
-	String sourceVoteStarter = (String) request.getAttribute(VoteAppConstants.SOURCE_VOTE_STARTER);
-	String destination = VoteUtils.getDestination(sourceVoteStarter);
-
-	VoteUtils.saveRichText(request, voteGeneralAuthoringDTO, sessionMap);
-
-	VoteAttachmentDTO voteAttachmentDTO = AuthoringUtil.uploadFile(request, voteService, voteAuthoringForm, true,
-		sessionMap);
-	List listOfflineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_OFFLINEFILES_METADATA_KEY);
-
-	if (voteAttachmentDTO != null) {
-	    listOfflineFilesMetaData.add(voteAttachmentDTO);
-	}
-
-	sessionMap.put(VoteAppConstants.LIST_OFFLINEFILES_METADATA_KEY, listOfflineFilesMetaData);
-	voteGeneralAuthoringDTO.setListOfflineFilesMetadata(listOfflineFilesMetaData);
-
-	List listOnlineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_ONLINEFILES_METADATA_KEY);
-	voteGeneralAuthoringDTO.setListOnlineFilesMetadata(listOnlineFilesMetaData);
-
-	if (voteAttachmentDTO == null) {
-	    ActionMessages errors = new ActionMessages();
-	    errors = new ActionMessages();
-	    voteGeneralAuthoringDTO.setUserExceptionFilenameEmpty(new Boolean(true).toString());
-	    errors.add(Globals.ERROR_KEY, new ActionMessage("error.fileName.empty"));
-	    saveErrors(request, errors);
-	    voteAuthoringForm.resetUserAction();
-	    persistInRequestError(request, "error.fileName.empty");
-
-	    request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-	    return mapping.findForward(destination);
-	}
-
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	voteAuthoringForm.resetUserAction();
-	return mapping.findForward(destination);
-    }
-
-    /**
-     * persists online files
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     * @throws RepositoryCheckedException
-     */
-    public ActionForward submitOnlineFiles(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, RepositoryCheckedException {
-	VoteUtils.cleanUpUserExceptions(request);
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-
-	VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO();
-	repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	voteAuthoringForm.setContentFolderID(contentFolderID);
-
-	String httpSessionID = voteAuthoringForm.getHttpSessionID();
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	Map mapOptionsContent = (Map) sessionMap.get(VoteAppConstants.MAP_OPTIONS_CONTENT_KEY);
-	voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent);
-
-	int maxIndex = mapOptionsContent.size();
-	voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex);
-
-	String firstEntry = (String) mapOptionsContent.get("1");
-	voteGeneralAuthoringDTO.setDefaultOptionContent(firstEntry);
-
-	voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
-	voteGeneralAuthoringDTO.setSubmissionAttempt(new Boolean(false).toString());
-
-	/* determine whether the request is from Monitoring url Edit Activity */
-	String sourceVoteStarter = (String) request.getAttribute(VoteAppConstants.SOURCE_VOTE_STARTER);
-	String destination = VoteUtils.getDestination(sourceVoteStarter);
-
-	VoteUtils.saveRichText(request, voteGeneralAuthoringDTO, sessionMap);
-
-	VoteAttachmentDTO voteAttachmentDTO = AuthoringUtil.uploadFile(request, voteService, voteAuthoringForm, false,
-		sessionMap);
-	List listOnlineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_ONLINEFILES_METADATA_KEY);
-
-	if (voteAttachmentDTO != null) {
-	    listOnlineFilesMetaData.add(voteAttachmentDTO);
-	}
-
-	sessionMap.put(VoteAppConstants.LIST_ONLINEFILES_METADATA_KEY, listOnlineFilesMetaData);
-	voteGeneralAuthoringDTO.setListOnlineFilesMetadata(listOnlineFilesMetaData);
-
-	List listOfflineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_OFFLINEFILES_METADATA_KEY);
-	voteGeneralAuthoringDTO.setListOfflineFilesMetadata(listOfflineFilesMetaData);
-
-	if (voteAttachmentDTO == null) {
-	    ActionMessages errors = new ActionMessages();
-	    errors = new ActionMessages();
-	    voteGeneralAuthoringDTO.setUserExceptionFilenameEmpty(new Boolean(true).toString());
-	    errors.add(Globals.ERROR_KEY, new ActionMessage("error.fileName.empty"));
-	    saveErrors(request, errors);
-	    voteAuthoringForm.resetUserAction();
-	    persistInRequestError(request, "error.fileName.empty");
-
-	    request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-
-	    return mapping.findForward(destination);
-	}
-
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	voteAuthoringForm.resetUserAction();
-	return mapping.findForward(destination);
-    }
-
-    /**
-     * removes an offline file from the jsp
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     */
-    public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException
-
-    {
-	VoteUtils.cleanUpUserExceptions(request);
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-
-	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-	VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO();
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	voteAuthoringForm.setContentFolderID(contentFolderID);
-
-	repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
-	String httpSessionID = voteAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	Map mapOptionsContent = (Map) sessionMap.get(VoteAppConstants.MAP_OPTIONS_CONTENT_KEY);
-	voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent);
-
-	int maxIndex = mapOptionsContent.size();
-	voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex);
-
-	String firstEntry = (String) mapOptionsContent.get("1");
-	voteGeneralAuthoringDTO.setDefaultOptionContent(firstEntry);
-
-	voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
-	voteGeneralAuthoringDTO.setSubmissionAttempt(new Boolean(false).toString());
-
-	/* determine whether the request is from Monitoring url Edit Activity */
-	String sourceVoteStarter = (String) request.getAttribute(VoteAppConstants.SOURCE_VOTE_STARTER);
-	String destination = VoteUtils.getDestination(sourceVoteStarter);
-
-	VoteUtils.saveRichText(request, voteGeneralAuthoringDTO, sessionMap);
-
-	String uuid = voteAuthoringForm.getUuid();
-
-	List listOfflineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_OFFLINEFILES_METADATA_KEY);
-	listOfflineFilesMetaData = AuthoringUtil.removeFileItem(listOfflineFilesMetaData, uuid);
-	sessionMap.put(VoteAppConstants.LIST_OFFLINEFILES_METADATA_KEY, listOfflineFilesMetaData);
-
-	voteGeneralAuthoringDTO.setListOfflineFilesMetadata(listOfflineFilesMetaData);
-
-	List listOnlineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_ONLINEFILES_METADATA_KEY);
-	voteGeneralAuthoringDTO.setListOnlineFilesMetadata(listOnlineFilesMetaData);
-
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	voteAuthoringForm.resetUserAction();
-
-	return mapping.findForward(destination);
-    }
-
-    /**
-     * deletes an online file from the jsp
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     */
-    public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException
-
-    {
-	VoteUtils.cleanUpUserExceptions(request);
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-
-	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-	VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO();
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	voteAuthoringForm.setContentFolderID(contentFolderID);
-
-	repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
-	String httpSessionID = voteAuthoringForm.getHttpSessionID();
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	Map mapOptionsContent = (Map) sessionMap.get(VoteAppConstants.MAP_OPTIONS_CONTENT_KEY);
-	voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent);
-
-	int maxIndex = mapOptionsContent.size();
-	voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex);
-
-	String firstEntry = (String) mapOptionsContent.get("1");
-	voteGeneralAuthoringDTO.setDefaultOptionContent(firstEntry);
-
-	voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
-	voteGeneralAuthoringDTO.setSubmissionAttempt(new Boolean(false).toString());
-
-	/* determine whether the request is from Monitoring url Edit Activity */
-	String sourceVoteStarter = (String) request.getAttribute(VoteAppConstants.SOURCE_VOTE_STARTER);
-	String destination = VoteUtils.getDestination(sourceVoteStarter);
-
-	VoteUtils.saveRichText(request, voteGeneralAuthoringDTO, sessionMap);
-
-	String uuid = voteAuthoringForm.getUuid();
-
-	List listOnlineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_ONLINEFILES_METADATA_KEY);
-	listOnlineFilesMetaData = AuthoringUtil.removeFileItem(listOnlineFilesMetaData, uuid);
-	sessionMap.put(VoteAppConstants.LIST_ONLINEFILES_METADATA_KEY, listOnlineFilesMetaData);
-
-	voteGeneralAuthoringDTO.setListOnlineFilesMetadata(listOnlineFilesMetaData);
-
-	List listOfflineFilesMetaData = (List) sessionMap.get(VoteAppConstants.LIST_OFFLINEFILES_METADATA_KEY);
-	voteGeneralAuthoringDTO.setListOfflineFilesMetadata(listOfflineFilesMetaData);
-
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	voteAuthoringForm.resetUserAction();
-
-	return mapping.findForward(destination);
-    }
-
-    /**
      * used in define later mode to switch from view-only to editable screen
      * 
      * @param mapping
@@ -537,14 +223,6 @@
 	voteAuthoringForm.setReflectionSubject(reflectionSubject);
 	voteGeneralAuthoringDTO.setReflectionSubject(reflectionSubject);
 
-	String offlineInstructions = request.getParameter(VoteAppConstants.OFFLINE_INSTRUCTIONS);
-	voteAuthoringForm.setOfflineInstructions(offlineInstructions);
-	voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	String onlineInstructions = request.getParameter(VoteAppConstants.ONLINE_INSTRUCTIONS);
-	voteAuthoringForm.setOnlineInstructions(onlineInstructions);
-	voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
 	String maxInputs = request.getParameter(VoteAppConstants.MAX_INPUTS);
 	if (maxInputs == null) {
 	    maxInputs = "0";
@@ -618,26 +296,6 @@
 
 	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    voteGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
-
 	voteGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
@@ -716,26 +374,6 @@
 
 	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    voteGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
-
 	voteGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
@@ -823,25 +461,6 @@
 
 	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-	    List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    voteGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	voteGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
@@ -936,13 +555,6 @@
 
 	request.setAttribute(VoteAppConstants.TOTAL_NOMINATION_COUNT, new Integer(listNominationContentDTO.size()));
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	return mapping.findForward("editNominationBox");
     }
 
@@ -985,13 +597,6 @@
 
 	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	voteGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
@@ -1072,26 +677,6 @@
 	voteAuthoringForm.setTitle(richTextTitle);
 	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-
-	    List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    voteGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	}
-
 	voteGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
@@ -1235,27 +820,6 @@
 	voteAuthoringForm.setTitle(richTextTitle);
 	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-
-	    List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	    voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    voteGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-
-	}
-
 	voteGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
@@ -1362,28 +926,7 @@
 	DataFlowObject assignedDataFlowObject = null;
 
 	if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-	    List attachmentListBackup = new ArrayList();
-	    List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-	    attachmentListBackup = attachmentList;
 
-	    List deletedAttachmentListBackup = new ArrayList();
-	    List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-	    deletedAttachmentListBackup = deletedAttachmentList;
-
-	    String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-
-	    String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	    voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	    voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    voteGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-
-	    String strOnlineInstructions = request.getParameter("onlineInstructions");
-	    String strOfflineInstructions = request.getParameter("offlineInstructions");
-	    voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	    voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-
 	    List<DataFlowObject> dataFlowObjects = voteService.getDataFlowObjects(new Long(strToolContentID));
 	    List<String> dataFlowObjectNames = null;
 	    if (dataFlowObjects != null) {
@@ -1448,15 +991,6 @@
 
 	    authoringUtil.reOrganizeDisplayOrder(mapNominationContent, voteService, voteAuthoringForm, voteContent);
 
-	    if (activeModule.equals(VoteAppConstants.AUTHORING)) {
-		//since it is authoring save the attachments
-
-		List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-		List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-		List attachments = saveAttachments(voteContent, attachmentList, deletedAttachmentList, mapping, request);
-	    }
-
 	    VoteUtils.setDefineLater(request, false, strToolContentID, voteService);
 
 	    if (activeModule.equals(VoteAppConstants.AUTHORING)) {
@@ -1506,346 +1040,4 @@
 	return mapping.findForward(VoteAppConstants.LOAD_QUESTIONS);
     }
 
-    private VoteToolContentHandler getToolContentHandler() {
-	if (toolContentHandler == null) {
-	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
-		    .getServletContext());
-	    toolContentHandler = (VoteToolContentHandler) wac.getBean("voteToolContentHandler");
-	}
-	return toolContentHandler;
-    }
-
-    /**
-     * saveAttachments
-     * 
-     * persists uploaded files
-     * 
-     * @param voteContent
-     * @param attachmentList
-     * @param deletedAttachmentList
-     * @param mapping
-     * @param request
-     * @return
-     */
-    private List saveAttachments(VoteContent voteContent, List attachmentList, List deletedAttachmentList,
-	    ActionMapping mapping, HttpServletRequest request) {
-
-	if (attachmentList == null || deletedAttachmentList == null) {
-	    return null;
-	}
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-
-	if (deletedAttachmentList != null) {
-	    Iterator iter = deletedAttachmentList.iterator();
-	    while (iter.hasNext()) {
-		VoteUploadedFile attachment = (VoteUploadedFile) iter.next();
-
-		if (attachment.getSubmissionId() != null) {
-		    voteService.removeFile(attachment.getSubmissionId());
-		}
-	    }
-	    deletedAttachmentList.clear();
-	}
-
-	if (attachmentList != null) {
-	    Iterator iter = attachmentList.iterator();
-	    while (iter.hasNext()) {
-		VoteUploadedFile attachment = (VoteUploadedFile) iter.next();
-
-		if (attachment.getSubmissionId() == null) {
-		    /* add entry to tool table - file already in content repository */
-		    voteService.persistFile(voteContent, attachment);
-		}
-	    }
-	}
-
-	return deletedAttachmentList;
-    }
-
-    /**
-     * deleteFile
-     * 
-     * removes an uploaded file
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     */
-    public ActionForward deleteFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
-	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-
-	String httpSessionID = request.getParameter(VoteAppConstants.HTTP_SESSION_ID);
-	voteAuthoringForm.setHttpSessionID(httpSessionID);
-
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	voteAuthoringForm.setContentFolderID(contentFolderID);
-
-	String activeModule = request.getParameter(VoteAppConstants.ACTIVE_MODULE);
-
-	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-
-	List listQuestionContentDTO = (List) sessionMap.get(VoteAppConstants.LIST_NOMINATION_CONTENT_DTO_KEY);
-
-	request.setAttribute(VoteAppConstants.LIST_NOMINATION_CONTENT_DTO, listQuestionContentDTO);
-
-	VoteContent voteContent = voteService.retrieveVote(new Long(strToolContentID));
-
-	VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO();
-	voteGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-	voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-
-	repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
-	voteGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-
-	String onlineInstructions = (String) sessionMap.get(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY);
-	String offlineInstructions = (String) sessionMap.get(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY);
-	voteAuthoringForm.setOnlineInstructions(onlineInstructions);
-	voteAuthoringForm.setOfflineInstructions(offlineInstructions);
-	voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	String richTextTitle = (String) sessionMap.get(VoteAppConstants.ACTIVITY_TITLE_KEY);
-	String richTextInstructions = (String) sessionMap.get(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY);
-
-	voteGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	voteAuthoringForm.setTitle(richTextTitle);
-	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-
-	sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
-	sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-
-	long uuid = WebUtil.readLongParam(request, VoteAppConstants.UUID);
-
-	List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-	if (attachmentList == null) {
-	    attachmentList = new ArrayList();
-	}
-
-	List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-	if (deletedAttachmentList == null) {
-	    deletedAttachmentList = new ArrayList();
-	}
-
-	/*
-	 * move the file's details from the attachment collection to the deleted attachments collection the attachment
-	 * will be delete on saving.
-	 */
-
-	deletedAttachmentList = VoteUtils.moveToDelete(Long.toString(uuid), attachmentList, deletedAttachmentList);
-	sessionMap.put(VoteAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
-
-	voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	voteGeneralAuthoringDTO.setToolContentID(strToolContentID);
-	voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-	voteGeneralAuthoringDTO.setActiveModule(activeModule);
-
-	voteAuthoringForm.setToolContentID(strToolContentID);
-	voteAuthoringForm.setHttpSessionID(httpSessionID);
-	voteAuthoringForm.setActiveModule(activeModule);
-	voteAuthoringForm.setCurrentTab("3");
-
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-
-	request.setAttribute(VoteAppConstants.TOTAL_NOMINATION_COUNT, new Integer(listQuestionContentDTO.size()));
-
-	voteAuthoringForm.resetUserAction();
-	return mapping.findForward(VoteAppConstants.LOAD_QUESTIONS);
-    }
-
-    /**
-     * addNewFile
-     * 
-     * adds a new uploaded file to the uploadedfiles list
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     */
-    public ActionForward addNewFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
-	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-	String httpSessionID = voteAuthoringForm.getHttpSessionID();
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	voteAuthoringForm.setContentFolderID(contentFolderID);
-
-	String activeModule = request.getParameter(VoteAppConstants.ACTIVE_MODULE);
-
-	String onlineInstructions = request.getParameter(VoteAppConstants.ONLINE_INSTRUCTIONS);
-
-	String offlineInstructions = request.getParameter(VoteAppConstants.OFFLINE_INSTRUCTIONS);
-
-	sessionMap.put(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY, onlineInstructions);
-	sessionMap.put(VoteAppConstants.OFFLINE_INSTRUCTIONS, offlineInstructions);
-
-	List listNominationContentDTO = (List) sessionMap.get(VoteAppConstants.LIST_NOMINATION_CONTENT_DTO_KEY);
-	request.setAttribute(VoteAppConstants.LIST_NOMINATION_CONTENT_DTO, listNominationContentDTO);
-
-	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-	VoteContent voteContent = voteService.retrieveVote(new Long(strToolContentID));
-
-	VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO();
-	voteGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-
-	voteGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	voteGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
-	repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
-	voteGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-
-	String richTextTitle = request.getParameter(VoteAppConstants.TITLE);
-	String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS);
-
-	voteGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	voteAuthoringForm.setTitle(richTextTitle);
-
-	voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-
-	sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
-	sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-
-	List attachmentList = (List) sessionMap.get(VoteAppConstants.ATTACHMENT_LIST_KEY);
-	List deletedAttachmentList = (List) sessionMap.get(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY);
-
-	addFileToContentRepository(request, voteAuthoringForm, attachmentList, deletedAttachmentList, sessionMap,
-		voteGeneralAuthoringDTO);
-
-	sessionMap.put(VoteAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
-
-	voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	voteGeneralAuthoringDTO.setToolContentID(strToolContentID);
-	voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-	voteGeneralAuthoringDTO.setActiveModule(activeModule);
-
-	voteAuthoringForm.setToolContentID(strToolContentID);
-	voteAuthoringForm.setHttpSessionID(httpSessionID);
-	voteAuthoringForm.setActiveModule(activeModule);
-	voteAuthoringForm.setCurrentTab("3");
-
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
-
-	voteAuthoringForm.resetUserAction();
-
-	String strOnlineInstructions = request.getParameter("onlineInstructions");
-	String strOfflineInstructions = request.getParameter("offlineInstructions");
-	voteAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-	voteAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-
-	request.setAttribute(VoteAppConstants.TOTAL_NOMINATION_COUNT, new Integer(listNominationContentDTO.size()));
-	return mapping.findForward(VoteAppConstants.LOAD_QUESTIONS);
-    }
-
-    /**
-     * persists files data in the content repository
-     * 
-     * @param request
-     * @param voteAuthoringForm
-     * @param attachmentList
-     * @param deletedAttachmentList
-     * @param sessionMap
-     * @param voteGeneralAuthoringDTO
-     */
-    public void addFileToContentRepository(HttpServletRequest request, VoteAuthoringForm voteAuthoringForm,
-	    List attachmentList, List deletedAttachmentList, SessionMap sessionMap,
-	    VoteGeneralAuthoringDTO voteGeneralAuthoringDTO) {
-	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
-
-	if (attachmentList == null) {
-	    attachmentList = new ArrayList();
-	}
-
-	if (deletedAttachmentList == null) {
-	    deletedAttachmentList = new ArrayList();
-	}
-
-	FormFile uploadedFile = null;
-	boolean isOnlineFile = false;
-	String fileType = null;
-	if (voteAuthoringForm.getTheOfflineFile() != null && voteAuthoringForm.getTheOfflineFile().getFileSize() > 0) {
-	    uploadedFile = voteAuthoringForm.getTheOfflineFile();
-	    fileType = IToolContentHandler.TYPE_OFFLINE;
-	} else if (voteAuthoringForm.getTheOnlineFile() != null
-		&& voteAuthoringForm.getTheOnlineFile().getFileSize() > 0) {
-	    uploadedFile = voteAuthoringForm.getTheOnlineFile();
-	    isOnlineFile = true;
-	    fileType = IToolContentHandler.TYPE_ONLINE;
-	} else {
-	    /* no file uploaded */
-	    return;
-	}
-
-	// validate upload file size.
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(uploadedFile, true, errors);
-	if (!errors.isEmpty()) {
-	    this.saveErrors(request, errors);
-	    return;
-	}
-
-	/* if a file with the same name already exists then move the old one to deleted */
-	deletedAttachmentList = VoteUtils.moveToDelete(uploadedFile.getFileName(), isOnlineFile, attachmentList,
-		deletedAttachmentList);
-
-	try {
-	    /*
-	     * This is a new file and so is saved to the content repository. Add it to the attachments collection, but
-	     * don't add it to the tool's tables yet.
-	     */
-	    NodeKey node = getToolContentHandler().uploadFile(uploadedFile.getInputStream(),
-		    uploadedFile.getFileName(), uploadedFile.getContentType(), fileType);
-	    VoteUploadedFile file = new VoteUploadedFile();
-	    String fileName = uploadedFile.getFileName();
-
-	    if (fileName != null && fileName.length() > 30) {
-		fileName = fileName.substring(0, 31);
-	    }
-
-	    file.setFileName(fileName);
-	    file.setFileOnline(isOnlineFile);
-	    file.setUuid(node.getUuid().toString());
-	    /* file.setVersionId(node.getVersion()); */
-
-	    /* add the files to the attachment collection - if one existed, it should have already been removed. */
-	    attachmentList.add(file);
-
-	    /* reset the fields so that more files can be uploaded */
-	    voteAuthoringForm.setTheOfflineFile(null);
-	    voteAuthoringForm.setTheOnlineFile(null);
-	} catch (FileNotFoundException e) {
-	    VoteAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	} catch (IOException e) {
-	    VoteAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	} catch (RepositoryCheckedException e) {
-	    VoteAction.logger.error("Unable to uploadfile", e);
-	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
-	}
-    }
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java	(.../VoteAuthoringForm.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java	(.../VoteAuthoringForm.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -62,19 +62,11 @@
     protected String maxNominationCount;
     protected String minNominationCount;
 
-    protected String fileItem;
-    protected String uuid;
-
-    protected FormFile receivedFile;
-    protected String offlineFile;
-
     protected String addContent;
     protected String removeContent;
     protected String removeAllContent;
     protected String submitAllContent;
     protected String submitTabDone;
-    protected String submitOfflineFile;
-    protected String submitOnlineFile;
 
     /* tab controller, these may go away once the Flash wraps the jsp */
     protected String choice;
@@ -92,15 +84,6 @@
     protected String toolContentID;
     protected String editableNominationIndex;
 
-    /* instructions content */
-    protected String onlineInstructions;
-    protected String offlineInstructions;
-    protected FormFile theOfflineFile;
-    protected FormFile theOnlineFile;
-
-    protected String richTextOfflineInstructions;
-    protected String richTextOnlineInstructions;
-
     protected String defineLaterInEditMode;
 
     /* proxy controllers for Monitoring tabs */
@@ -141,15 +124,11 @@
 	addOptionContent = null;
 	removeOptionContent = null;
 
-	fileItem = null;
-
 	addContent = null;
 	removeContent = null;
 	removeAllContent = null;
 	submitAllContent = null;
 	submitTabDone = null;
-	submitOfflineFile = null;
-	submitOnlineFile = null;
 
 	summaryMonitoring = null;
 	instructionsMonitoring = null;
@@ -164,18 +143,11 @@
 	addOptionContent = null;
 	removeOptionContent = null;
 
-	fileItem = null;
-	uuid = null;
-	receivedFile = null;
-
 	addContent = null;
 	removeContent = null;
 	removeAllContent = null;
 	submitAllContent = null;
 	submitTabDone = null;
-	submitOfflineFile = null;
-	submitOnlineFile = null;
-	offlineFile = null;
 
 	choice = null;
 	choiceBasic = null;
@@ -192,12 +164,6 @@
 	isRemoveContent = null;
 	toolContentID = null;
 
-	onlineInstructions = null;
-	offlineInstructions = null;
-
-	richTextOfflineInstructions = null;
-	richTextOnlineInstructions = null;
-
 	useSelectLeaderToolOuput = null;
 	reflect = null;
 	lockOnFinish = null;
@@ -379,36 +345,6 @@
     }
 
     /**
-     * @return Returns the offlineInstructions.
-     */
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    /**
-     * @param offlineInstructions
-     *                The offlineInstructions to set.
-     */
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    /**
-     * @return Returns the onlineInstructions.
-     */
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    /**
-     * @param onlineInstructions
-     *                The onlineInstructions to set.
-     */
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    /**
      * @return Returns the choiceAdvanced.
      */
     public String getChoiceAdvanced() {
@@ -559,96 +495,6 @@
     }
 
     /**
-     * @return Returns the submitOfflineFile.
-     */
-    public String getSubmitOfflineFile() {
-	return submitOfflineFile;
-    }
-
-    /**
-     * @param submitOfflineFile
-     *                The submitOfflineFile to set.
-     */
-    public void setSubmitOfflineFile(String submitOfflineFile) {
-	this.submitOfflineFile = submitOfflineFile;
-    }
-
-    /**
-     * @param theOfflineFile
-     *                The theOfflineFile to set.
-     */
-    public void setTheOfflineFile(FormFile theOfflineFile) {
-	this.theOfflineFile = theOfflineFile;
-    }
-
-    /**
-     * @param theOnlineFile
-     *                The theOnlineFile to set.
-     */
-    public void setTheOnlineFile(FormFile theOnlineFile) {
-	this.theOnlineFile = theOnlineFile;
-    }
-
-    /**
-     * @return Returns the theOfflineFile.
-     */
-    public FormFile getTheOfflineFile() {
-	return theOfflineFile;
-    }
-
-    /**
-     * @return Returns the theOnlineFile.
-     */
-    public FormFile getTheOnlineFile() {
-	return theOnlineFile;
-    }
-
-    /**
-     * @return Returns the submitOnlineFile.
-     */
-    public String getSubmitOnlineFile() {
-	return submitOnlineFile;
-    }
-
-    /**
-     * @param submitOnlineFile
-     *                The submitOnlineFile to set.
-     */
-    public void setSubmitOnlineFile(String submitOnlineFile) {
-	this.submitOnlineFile = submitOnlineFile;
-    }
-
-    /**
-     * @return Returns the richTextOfflineInstructions.
-     */
-    public String getRichTextOfflineInstructions() {
-	return richTextOfflineInstructions;
-    }
-
-    /**
-     * @param richTextOfflineInstructions
-     *                The richTextOfflineInstructions to set.
-     */
-    public void setRichTextOfflineInstructions(String richTextOfflineInstructions) {
-	this.richTextOfflineInstructions = richTextOfflineInstructions;
-    }
-
-    /**
-     * @return Returns the richTextOnlineInstructions.
-     */
-    public String getRichTextOnlineInstructions() {
-	return richTextOnlineInstructions;
-    }
-
-    /**
-     * @param richTextOnlineInstructions
-     *                The richTextOnlineInstructions to set.
-     */
-    public void setRichTextOnlineInstructions(String richTextOnlineInstructions) {
-	this.richTextOnlineInstructions = richTextOnlineInstructions;
-    }
-
-    /**
      * @return Returns the editDefaultQuestion.
      */
     public String getEditDefaultQuestion() {
@@ -741,66 +587,6 @@
     }
 
     /**
-     * @return Returns the fileItem.
-     */
-    public String getFileItem() {
-	return fileItem;
-    }
-
-    /**
-     * @param fileItem
-     *                The fileItem to set.
-     */
-    public void setFileItem(String fileItem) {
-	this.fileItem = fileItem;
-    }
-
-    /**
-     * @return Returns the receivedFile.
-     */
-    public FormFile getReceivedFile() {
-	return receivedFile;
-    }
-
-    /**
-     * @param receivedFile
-     *                The receivedFile to set.
-     */
-    public void setReceivedFile(FormFile receivedFile) {
-	this.receivedFile = receivedFile;
-    }
-
-    /**
-     * @return Returns the offlineFile.
-     */
-    public String getOfflineFile() {
-	return offlineFile;
-    }
-
-    /**
-     * @param offlineFile
-     *                The offlineFile to set.
-     */
-    public void setOfflineFile(String offlineFile) {
-	this.offlineFile = offlineFile;
-    }
-
-    /**
-     * @return Returns the uuid.
-     */
-    public String getUuid() {
-	return uuid;
-    }
-
-    /**
-     * @param uuid
-     *                The uuid to set.
-     */
-    public void setUuid(String uuid) {
-	this.uuid = uuid;
-    }
-
-    /**
      * @return Returns the currentTab.
      */
     public String getCurrentTab() {
@@ -1057,9 +843,7 @@
 		.append("defaultContentId: ", defaultContentId).append("defaultContentIdStr: ", defaultContentIdStr)
 		.append("maxNominationCount: ", maxNominationCount).append("minNominationCount: ", minNominationCount).append("defaultOptionContent: ",
 			defaultOptionContent).append("activityTitle: ", activityTitle).append("activityInstructions: ",
-			activityInstructions).append("richTextOfflineInstructions: ", richTextOfflineInstructions)
-		.append("richTextOnlineInstructions: ", richTextOnlineInstructions).append("onlineInstructions: ",
-			onlineInstructions).append("offlineInstructions: ", offlineInstructions).toString();
+			activityInstructions).toString();
     }
     
     /**
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	(.../VoteLearningForm.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	(.../VoteLearningForm.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -59,7 +59,6 @@
     protected String allowTextEntry;
     protected String showResults;
     protected String lockOnFinish;
-    protected String activityRunOffline;
     protected String activityRetries;
     protected String activityTitle;
     protected String activityInstructions;
@@ -614,21 +613,6 @@
     }
 
     /**
-     * @return Returns the activityRunOffline.
-     */
-    public String getActivityRunOffline() {
-	return activityRunOffline;
-    }
-
-    /**
-     * @param activityRunOffline
-     *            The activityRunOffline to set.
-     */
-    public void setActivityRunOffline(String activityRunOffline) {
-	this.activityRunOffline = activityRunOffline;
-    }
-
-    /**
      * @return Returns the lockOnFinish.
      */
     public String getLockOnFinish() {
@@ -952,7 +936,7 @@
 		.append("activityTitle: ", activityTitle).append("revisitingUser: ", revisitingUser)
 		.append("userEntry: ", userEntry).append("castVoteCount: ", castVoteCount)
 		.append("maxNominationCountReached: ", maxNominationCountReached)
-		.append("activityRunOffline: ", activityRunOffline).append("toolSessionID: ", toolSessionID)
+		.append("toolSessionID: ", toolSessionID)
 		.append("learningMode: ", learningMode).append("toolContentID: ", toolContentID)
 		.append("nominationsSubmited: ", nominationsSubmited).append("toolContentUID: ", toolContentUID)
 		.append("previewOnly: ", previewOnly).append("reportViewOnly: ", reportViewOnly)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -48,13 +48,8 @@
  * 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 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.
  * 
 
@@ -92,12 +87,6 @@
  />
 
  <forward
- name="runOffline"
- path="/learning/RunOffline.jsp"
- redirect="false"
- />
-
- <forward
  name="exitPage"
  path="/learning/ExitLearning.jsp"
  redirect="false"
@@ -231,13 +220,11 @@
 	voteLearningForm.setUserEntry("");
 	voteLearningForm.setCastVoteCount(0);
 	voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
-	voteLearningForm.setActivityRunOffline(new Boolean(false).toString());
 
 	voteGeneralLearnerFlowDTO.setRevisitingUser(new Boolean(false).toString());
 	voteGeneralLearnerFlowDTO.setUserEntry("");
 	voteGeneralLearnerFlowDTO.setCastVoteCount("0");
 	voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString());
-	voteGeneralLearnerFlowDTO.setActivityRunOffline(new Boolean(false).toString());
 
 	/*
 	 * save time zone information to session scope.
@@ -332,32 +319,15 @@
 	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
 	    voteGeneralLearnerFlowDTO.setSubmissionDeadline(tzSubmissionDeadline);
 
-	    // calculate whether deadline has passed, and if so forward to "runOffline"
+	    // calculate whether deadline has passed, and if so forward to "submissionDeadline"
 	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
-		return mapping.findForward(RUN_OFFLINE);
-
+		return mapping.findForward("submissionDeadline");
 	    }
 	}
 
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
 		.getServletContext());
 
-	/*
-	 * 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.
-	 */
-	boolean isRunOffline = VoteUtils.isRunOffline(voteContent);
-	if (isRunOffline == true) {
-	    VoteUtils.cleanUpSessionAbsolute(request);
-	    // warning to learner: the activity is offline
-	    voteLearningForm.setActivityRunOffline(new Boolean(true).toString());
-	    voteGeneralLearnerFlowDTO.setActivityRunOffline(new Boolean(true).toString());
-
-	    request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
-	    // return (mapping.findForward(ERROR_LIST));
-	    return mapping.findForward(VoteAppConstants.RUN_OFFLINE);
-	}
-
 	/* find out if the content is being modified at the moment. */
 	boolean isDefineLater = VoteUtils.isDefineLater(voteContent);
 	if (isDefineLater == true) {
@@ -545,13 +515,9 @@
 
 	Map mapGeneralCheckedOptionsContent = new TreeMap(new VoteComparator());
 	request.setAttribute(VoteAppConstants.MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
-	/*
-	 * Is the tool activity been checked as Run Offline in the property inspector?
-	 */
 
 	voteLearningForm.setActivityTitle(voteContent.getTitle());
 	voteLearningForm.setActivityInstructions(voteContent.getInstructions());
-	voteLearningForm.setActivityRunOffline(new Boolean(voteContent.isRunOffline()).toString());
 	voteLearningForm.setMaxNominationCount(voteContent.getMaxNominationCount());
 	voteLearningForm.setMinNominationCount(voteContent.getMinNominationCount());
 	voteLearningForm.setUseSelectLeaderToolOuput(new Boolean(voteContent.isUseSelectLeaderToolOuput()).toString());
@@ -561,7 +527,6 @@
 
 	voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle());
 	voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions());
-	voteGeneralLearnerFlowDTO.setActivityRunOffline(new Boolean(voteContent.isRunOffline()).toString());
 	voteGeneralLearnerFlowDTO.setMaxNominationCount(voteContent.getMaxNominationCount());
 	voteGeneralLearnerFlowDTO.setMinNominationCount(voteContent.getMinNominationCount());
 	voteGeneralLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(voteContent.isUseSelectLeaderToolOuput())
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -r601fd92095193321a6b2286ef55108fbe5f9dfc4 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 601fd92095193321a6b2286ef55108fbe5f9dfc4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -186,15 +185,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	EditActivityDTO editActivityDTO = new EditActivityDTO();
@@ -318,15 +308,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	EditActivityDTO editActivityDTO = new EditActivityDTO();
@@ -483,15 +464,6 @@
 	}
 	request.setAttribute(VoteAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	voteGeneralMonitoringDTO.setCurrentMonitoringTab("summary");
 
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -539,15 +511,6 @@
 	}
 	request.setAttribute(VoteAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	voteGeneralMonitoringDTO.setCurrentMonitoringTab("stats");
 
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -660,15 +623,6 @@
 	voteGeneralMonitoringDTO.setCurrentMonitoredToolSession(currentMonitoredToolSession);
 	voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(true).toString());
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (voteContent != null) {
@@ -749,15 +703,6 @@
 	    }
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (voteContent != null) {
@@ -859,15 +804,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -958,15 +894,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (voteContent != null) {
@@ -1179,15 +1106,6 @@
 	    generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	generalMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	generalMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	generalMonitoringDTO.setAttachmentList(attachmentList);
-	generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 	List listNominationContentDTO = new LinkedList();
@@ -1391,15 +1309,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (voteContent != null) {
@@ -1597,15 +1506,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	/* find out if there are any reflection entries, from here */
@@ -1738,15 +1638,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	/* find out if there are any reflection entries, from here */
@@ -1844,15 +1735,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	/* find out if there are any reflection entries, from here */
@@ -1966,15 +1848,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	/* find out if there are any reflection entries, from here */
@@ -2121,15 +1994,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (notebookEntriesExist) {
@@ -2255,15 +2119,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (notebookEntriesExist) {
@@ -2389,15 +2244,6 @@
 	    voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString());
 	}
 
-	/** getting instructions screen content from here... */
-	voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-	voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-	voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-	/** ...till here * */
-
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
 
 	if (notebookEntriesExist) {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
diff -u -r601fd92095193321a6b2286ef55108fbe5f9dfc4 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 601fd92095193321a6b2286ef55108fbe5f9dfc4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -286,16 +285,6 @@
 		{
 		    request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(false).toString());
 		}
-	
-		
-		/**getting instructions screen content from here... */
-		voteGeneralMonitoringDTO.setOnlineInstructions(voteContent.getOnlineInstructions());
-		voteGeneralMonitoringDTO.setOfflineInstructions(voteContent.getOfflineInstructions());
-		
-        List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-        voteGeneralMonitoringDTO.setAttachmentList(attachmentList);
-        voteGeneralMonitoringDTO.setDeletedAttachmentList(new ArrayList());
-        /** ...till here **/
 
 	MonitoringUtil.buildVoteStatsDTO(request, voteService, voteContent);
 
@@ -317,7 +306,6 @@
 	    {
 	    	try
 			{
-	    		long toolContentID=new Long(strToolContentId).longValue();
 		    	voteMonitoringForm.setToolContentID(strToolContentId);
 			}
 	    	catch(NumberFormatException e)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java
===================================================================
diff -u -r601fd92095193321a6b2286ef55108fbe5f9dfc4 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 601fd92095193321a6b2286ef55108fbe5f9dfc4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -19,110 +19,6 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-/**
- * @author Ozgur Demirtas
- * 
- * VoteStarterAction loads the default content and initializes the presentation Map.
- * Initializes the tool's authoring mode
- * Requests can come either from authoring environment or from the monitoring environment for Edit Activity screen.
- * 
- * 
- * <THIS SECTION IS COPIED FROM: http://lamscvs.melcoe.mq.edu.au:8090/display/lams/Tool+Contract>
- * Authoring URL 
- *
- * The tool must supply an authoring module, which will be called to create new content or edit existing content. It will be called by an authoring URL using the following format:
-
- * <lams base path>/<tool's authoringurl>&toolContentID=123
-
-
- * The initial data displayed on the authoring screen for a new tool content id may be the default tool content.
- *
- * Authoring UI data consists of general Activity data fields and the Tool specific data fields.
- * The authoring interface will have three tabs. The mandatory (and suggested) fields are given. 
- * Each tool will have its own fields which it will add on any of the three tabs, as appropriate to the tabs' function.
-
- * Basic: Displays the basic set of fields that are needed for the tool, and it could be expected that a new LAMS user would use. 
- * Mandatory fields: Title, Instructions.
- * 
- * Advanced: Displays the extra fields that would be used by experienced LAMS users. Optional fields: Lock On Finish, Make Responses Anonymous
- * Instructions: Displays the "instructions" fields for teachers. Mandatory fields: Online instructions, Offline instructions, Document upload. 
- * See Instructions. The standard LAMS tools will use a DHTML layout for the Authoring tabs. For consistency of look and feel, 
- * we prefer all tools to use the DHTML, or at least make the tabs look and behave like the DHTML layout. The javascript for the tabs is 
- * available as "/include/javascript/tabcontroller.js" from the central web app (e.g. http://blah.org/lams/include/javascript/tabcontroller.js).
- *
- * The "Define Later" and "Run Offline" options are set on the Flash authoring part, and not on the tool's authoring screens.
- * Preview The tool must be able to show the specified content as if it was running in a lesson. It will be the learner url with tool access 
- * mode set to ToolAccessMode.AUTHOR.
- *
- * Export The tool must be able to export its tool content for part of the overall learning design export.
- * The format of the serialization for export is XML. Tool will define extra namespace inside the <Content> element to add a new data element (type).
- *  Inside the data element, it can further define more structures and types as it seems fit.
-
- * The data elements must be "version" aware. The data elements must be "type" aware if they are to be shared between Tools.
- * LAMS Xpress (Ernie, could you put something in here. You explain it better than I do!)
- *
- * Data Exchange At present, there is no data exchange format between tools. Therefore if..  
- * 
- * 
- * Tool path The URL path for the tool should be <lamsroot>/tool/$TOOL_SIG.  
- * 
-
- The author is given warnings when the content in use by learners OR when the content is being edited in the Monitoring interface.
-
- <!--Authoring Starter Action: initializes the authoring module -->
- <action path="/authoringStarter" 
- type="org.lamsfoundation.lams.tool.vote.web.VoteStarterAction" 
- name="VoteAuthoringForm" 
- scope="request"
- input="/index.jsp"> 
-
- <forward
- name="load"
- path="/authoring/AuthoringMaincontent.jsp"
- redirect="false"
- />
-
- <forward
- name="loadMonitoring"
- path="/monitoring/MonitoringMaincontent.jsp"
- redirect="false"
- />
-
- <forward
- name="loadMonitoringEditActivity"
- path="/monitoring/MonitoringMaincontent.jsp"
- redirect="false"
- />
-
- <forward
- name="loadLearner"
- path="/learning/AnswersContent.jsp"
- redirect="false"
- />
-
- <forward
- name="starter"
- path="/index.jsp"
- redirect="false"
- />
-
- <forward
- name="preview"
- path="/learning/Preview.jsp"
- redirect="false"
- />
-
- <forward
- name="errorList"
- path="/VoteErrorBox.jsp"
- redirect="false"
- />
- </action>  
-
-
- */
-
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
@@ -160,6 +56,13 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
+/**
+ * @author Ozgur Demirtas
+ * 
+ * VoteStarterAction loads the default content and initializes the presentation Map.
+ * Initializes the tool's authoring mode
+ * Requests can come either from authoring environment or from the monitoring environment for Edit Activity screen.
+ */
 public class VoteStarterAction extends Action implements VoteAppConstants {
     /*
      * This class is reused by defineLater and monitoring modules as well.
@@ -211,11 +114,7 @@
 	    voteGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 	}
 
-	initialiseAttributes(request, voteGeneralAuthoringDTO, voteService);
-
 	SessionMap sessionMap = new SessionMap();
-	sessionMap.put(VoteAppConstants.ATTACHMENT_LIST_KEY, new ArrayList());
-	sessionMap.put(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY, new ArrayList());
 	sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, "");
 	sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, "");
 	voteAuthoringForm.setHttpSessionID(sessionMap.getSessionID());
@@ -328,26 +227,6 @@
 	return mapping.findForward(destination);
     }
 
-    protected void initialiseAttributes(HttpServletRequest request, VoteGeneralAuthoringDTO voteGeneralAuthoringDTO,
-	    IVoteService voteService) {
-
-	/* for development: needs to run only once per tool */
-	/* VoteUtils.configureContentRepository(request, voteService); */
-
-	/* these two are for Instructions jsp */
-	LinkedList listUploadedOfflineFileNames = new LinkedList();
-	LinkedList listUploadedOnlineFileNames = new LinkedList();
-
-	voteGeneralAuthoringDTO.setListUploadedOfflineFileNames(listUploadedOfflineFileNames);
-	voteGeneralAuthoringDTO.setListUploadedOnlineFileNames(listUploadedOnlineFileNames);
-
-	LinkedList listOfflineFilesMetaData = new LinkedList();
-	LinkedList listOnlineFilesMetaData = new LinkedList();
-
-	voteGeneralAuthoringDTO.setListOfflineFilesMetadata(listOfflineFilesMetaData);
-	voteGeneralAuthoringDTO.setListOnlineFilesMetadata(listOnlineFilesMetaData);
-    }
-
     /**
      * each tool has a signature. Voting tool's signature is stored in MY_SIGNATURE. The default tool content id and
      * other depending content ids are obtained in this method. if all the default content has been setup properly the
@@ -484,40 +363,12 @@
 	int maxIndex = mapOptionsContent.size();
 	voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex);
 
-	voteGeneralAuthoringDTO.setRichTextOfflineInstructions(voteContent.getOfflineInstructions());
-	voteGeneralAuthoringDTO.setRichTextOnlineInstructions(voteContent.getOnlineInstructions());
-
-	voteAuthoringForm.setOfflineInstructions(voteContent.getOfflineInstructions());
-	voteAuthoringForm.setOnlineInstructions(voteContent.getOnlineInstructions());
-
 	Short maxInputs = voteContent.getMaxExternalInputs();
 	if (maxInputs == null) {
 	    maxInputs = 0;
 	}
 	voteAuthoringForm.setMaxInputs(maxInputs);
 
-	if (voteContent.getOnlineInstructions() == null || voteContent.getOnlineInstructions().length() == 0) {
-	    voteGeneralAuthoringDTO.setRichTextOnlineInstructions(VoteAppConstants.DEFAULT_ONLINE_INST);
-	    voteAuthoringForm.setOnlineInstructions(VoteAppConstants.DEFAULT_ONLINE_INST);
-	    sessionMap.put(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY, VoteAppConstants.DEFAULT_ONLINE_INST);
-	}
-
-	if (voteContent.getOfflineInstructions() == null || voteContent.getOfflineInstructions().length() == 0) {
-	    voteGeneralAuthoringDTO.setRichTextOfflineInstructions(VoteAppConstants.DEFAULT_OFFLINE_INST);
-	    voteAuthoringForm.setOfflineInstructions(VoteAppConstants.DEFAULT_OFFLINE_INST);
-	    sessionMap.put(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY, VoteAppConstants.DEFAULT_OFFLINE_INST);
-	}
-
-	sessionMap.put(VoteAppConstants.ONLINE_INSTRUCTIONS_KEY, voteContent.getOnlineInstructions());
-	sessionMap.put(VoteAppConstants.OFFLINE_INSTRUCTIONS_KEY, voteContent.getOfflineInstructions());
-
-	List attachmentList = voteService.retrieveVoteUploadedFiles(voteContent);
-	voteGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	voteGeneralAuthoringDTO.setDeletedAttachmentList(new ArrayList());
-
-	sessionMap.put(VoteAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
-	sessionMap.put(VoteAppConstants.DELETED_ATTACHMENT_LIST_KEY, new ArrayList());
-
 	voteAuthoringForm.resetUserAction();
     }
 
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -211,8 +211,8 @@
 	  	/>
 
 	  	<forward
-		    name="runOffline"
-	        path="/learning/RunOffline.jsp"
+		    name="submissionDeadline"
+	        path="/learning/submissionDeadline.jsp"
 		    redirect="false"
 	  	/>
 
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -rd589af814672ff0df52e391d99e35db062671da5 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision d589af814672ff0df52e391d99e35db062671da5)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -32,7 +32,6 @@
 		Set tabs = new LinkedHashSet();
 		tabs.add("label.basic");
 		tabs.add("label.advanced");
-		tabs.add("label.instructions");
 		pageContext.setAttribute("tabs", tabs);
 		
 		Set tabsBasic = new LinkedHashSet();
@@ -198,10 +197,6 @@
 			<!-- tab content 2 (Advanced) -->
 			<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
 			<!-- end of content (Advanced) -->
-			
-			<!-- tab content 3 (Instructions) -->
-			<lams:TabBody id="3" titleKey="label.instructions" page="InstructionsContent.jsp" />
-			<!-- end of content (Instructions) -->
 
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
 			cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/web/authoring/InstructionsContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r0442ccb60db2d76107e8572c72f1ce4fc6646199 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 0442ccb60db2d76107e8572c72f1ce4fc6646199)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -175,12 +175,6 @@
 				</div>
 			</c:if>
 
-			<c:if test="${voteGeneralLearnerFlowDTO.activityRunOffline == 'true'}">
-				<div class="warning">
-					<fmt:message key="label.learning.forceOfflineMessage" />
-				</div>
-			</c:if>
-
 			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCountReached == 'true'}">
 				<div class="warning">
 					<fmt:message key="error.maxNominationCount.reached" />
@@ -189,56 +183,51 @@
 				</div>
 			</c:if>
 
-			<c:if test="${voteGeneralLearnerFlowDTO.activityRunOffline != 'true'}">
+			<p>
+				<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+			</p>
 
+			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
+				<p>&nbsp;</p>
 				<p>
-					<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}"
-						escapeXml="false" />
+					<fmt:message key="label.nominations.available">
+						<fmt:param>
+							<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
+						</fmt:param>
+					</fmt:message>
 				</p>
+			</c:if>
 
-				<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
-					<p>&nbsp;</p>
-					<p>
-						<fmt:message key="label.nominations.available">
-							<fmt:param>
-								<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
-							</fmt:param>
-						</fmt:message>
-					</p>
-				</c:if>
+			<table class="shading-bg">
+				<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
 
-				<table class="shading-bg">
-					<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+					<tr>
+						<td width="1px">
+							<input type="checkbox" name="checkedVotes" class="noBorder"
+								value="${subEntry.key}" onClick="updateCount(this);">
+						</td>
 
-						<tr>
-							<td width="1px">
-								<input type="checkbox" name="checkedVotes" class="noBorder"
-									value="${subEntry.key}" onClick="updateCount(this);">
-							</td>
-
-							<td>
-								<c:out value="${subEntry.value}" escapeXml="false" />
-							</td>
-						</tr>
+						<td>
+							<c:out value="${subEntry.value}" escapeXml="false" />
+						</td>
+					</tr>
 						
-					</c:forEach>
-				</table>
+				</c:forEach>
+			</table>
 
-				<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
-					<strong> <fmt:message key="label.other" />: </strong>
-					<html:text property="userEntry" size="30" maxlength="100" />
-				</c:if>
+			<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
+				<strong> <fmt:message key="label.other" />: </strong>
+				<html:text property="userEntry" size="30" maxlength="100" />
+			</c:if>
 
-				<html:hidden property="donePreview" />
+			<html:hidden property="donePreview" />
 
-				<div class="space-bottom-top">
-						<html:submit property="continueOptionsCombined" styleClass="button">
-							<fmt:message key="label.submit.vote" />
-						</html:submit>
-				</div>
+			<div class="space-bottom-top">
+				<html:submit property="continueOptionsCombined" styleClass="button">
+					<fmt:message key="label.submit.vote" />
+				</html:submit>
+			</div>
 				
-			</c:if>
-
 		</html:form>
 	</div>
 
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/web/learning/RunOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/learning/mobile/AnswersContent.jsp
===================================================================
diff -u -r0442ccb60db2d76107e8572c72f1ce4fc6646199 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 0442ccb60db2d76107e8572c72f1ce4fc6646199)
+++ lams_tool_vote/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -182,12 +182,6 @@
 				</div>
 			</c:if>
 
-			<c:if test="${voteGeneralLearnerFlowDTO.activityRunOffline == 'true'}">
-				<div class="warning">
-					<fmt:message key="label.learning.forceOfflineMessage" />
-				</div>
-			</c:if>
-
 			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCountReached == 'true'}">
 				<div class="warning">
 					<fmt:message key="error.maxNominationCount.reached" />
@@ -196,57 +190,52 @@
 				</div>
 			</c:if>
 
-			<c:if test="${voteGeneralLearnerFlowDTO.activityRunOffline != 'true'}">
+			<p>
+				<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+			</p>
 
+			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
+				<p>&nbsp;</p>
 				<p>
-					<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}"
-						escapeXml="false" />
+					<fmt:message key="label.nominations.available">
+						<fmt:param>
+							<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
+						</fmt:param>
+					</fmt:message>
 				</p>
+			</c:if>
 
-				<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
-					<p>&nbsp;</p>
-					<p>
-						<fmt:message key="label.nominations.available">
-							<fmt:param>
-								<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
-							</fmt:param>
-						</fmt:message>
-					</p>
-				</c:if>
-
-				<ul data-role="listview" data-inset="true">
-					<table class="alternative-color" style="margin-top: 20px; margin-bottom: 10px;">
+			<ul data-role="listview" data-inset="true">
+				<table class="alternative-color" style="margin-top: 20px; margin-bottom: 10px;">
 	
-						<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+					<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
 	
-							<tr>
-								<td width="1px" style="font-size: 13px;">
-									<input type="checkbox" name="checkedVotes" class="noBorder"
-										value="${subEntry.key}" onClick="updateCount(this);">
-								</td>
+						<tr>
+							<td width="1px" style="font-size: 13px;">
+								<input type="checkbox" name="checkedVotes" class="noBorder"
+									value="${subEntry.key}" onClick="updateCount(this);">
+							</td>
 	
-								<td>
-									<c:out value="${subEntry.value}" escapeXml="false" />
-								</td>
-							</tr>
-						</c:forEach>
-					</table>
-				</ul>
+							<td>
+								<c:out value="${subEntry.value}" escapeXml="false" />
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
+			</ul>
 
-				<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
-					<strong> <fmt:message key="label.other" />: </strong>
-					<html:text property="userEntry" size="30" maxlength="100" />
-				</c:if>
+			<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
+				<strong> <fmt:message key="label.other" />: </strong>
+				<html:text property="userEntry" size="30" maxlength="100" />
+			</c:if>
 
-				<html:hidden property="donePreview" />
+			<html:hidden property="donePreview" />
 
-				<div class="space-top button-inside" id="continue-options-combined-button">
-					<button onclick="javascript:submitMethod();return false;" name="continueOptionsCombined" class="button" data-icon="arrow-r" data-theme="b">
-						<fmt:message key="label.submit.vote" />
-					</button>
-				</div>
-				
-			</c:if>
+			<div class="space-top button-inside" id="continue-options-combined-button">
+				<button onclick="javascript:submitMethod();return false;" name="continueOptionsCombined" class="button" data-icon="arrow-r" data-theme="b">
+					<fmt:message key="label.submit.vote" />
+				</button>
+			</div>
 
 		</html:form>
 	</div>
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/web/learning/mobile/RunOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/learning/mobile/submissionDeadline.jsp
===================================================================
diff -u
--- lams_tool_vote/web/learning/mobile/submissionDeadline.jsp	(revision 0)
+++ lams_tool_vote/web/learning/mobile/submissionDeadline.jsp	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,114 @@
+<%-- 
+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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:html>
+<lams:head>
+	<html:base />
+	<title><fmt:message key="activity.title" />
+	</title>
+
+	<link rel="stylesheet" href="${lams}css/jquery.mobile.css" />
+	<link rel="stylesheet" href="${lams}css/defaultHTML_learner_mobile.css" />
+	<script src="${lams}includes/javascript/jquery.js"></script>
+	<script src="${lams}includes/javascript/jquery.mobile.js"></script>	
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+
+</lams:head>
+
+<body>
+<div data-role="page" data-cache="false">
+
+	<div data-role="header" data-theme="b" data-nobackbtn="true">
+		<h1>
+			<fmt:message key="activity.title" />
+		</h1>
+	</div><!-- /header -->
+
+	<html:form action="/learning?validate=false" method="POST">
+		<html:hidden property="dispatch" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+
+		<div data-role="content">
+			<div class="warning">
+				<fmt:message key="authoring.info.teacher.set.restriction" >
+					<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+				</fmt:message>
+			</div>
+		</div>
+	</html:form>
+	
+	<div data-role="footer" data-theme="b" class="ui-bar">
+		<span class="ui-finishbtn-right">
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
+				      <a href="#nogo" name="endLearning" id="finishButton" 
+				      onclick="javascript:submitMethod('learnerFinished');return false" data-role="button" data-icon="arrow-r" data-theme="b">
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</span>
+				      </a>
+				</c:if>
+
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
+					<button name="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"  data-icon="arrow-r" data-theme="b">
+						<fmt:message key="label.continue" />
+					</button>
+				</c:if>
+		</span>
+	</div><!-- /footer -->
+
+</div>
+</body>
+</lams:html>
+
+
+
+
+
+
+
+
Index: lams_tool_vote/web/learning/submissionDeadline.jsp
===================================================================
diff -u
--- lams_tool_vote/web/learning/submissionDeadline.jsp	(revision 0)
+++ lams_tool_vote/web/learning/submissionDeadline.jsp	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,113 @@
+<%-- 
+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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:html>
+<lams:head>
+	<html:base />
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
+
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+
+</lams:head>
+
+<body class="stripes">
+
+	<html:form action="/learning?validate=false" method="POST">
+		<html:hidden property="dispatch" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+
+		<div id="content">
+
+			<h1>
+				<fmt:message key="activity.title" />
+			</h1>
+			
+			<div class="warning">
+				<fmt:message key="authoring.info.teacher.set.restriction" >
+					<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+				</fmt:message>
+			</div>
+			
+			<div class="space-bottom-top align-right">
+
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
+
+				      <html:link href="#nogo" property="endLearning" styleId="finishButton" 
+				      onclick="javascript:submitMethod('learnerFinished');return false"
+				      styleClass="button">
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submitActivity" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</html:link>
+
+				</c:if>
+
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
+					<html:submit property="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:submit>
+				</c:if>
+
+			</div>
+
+		</div>
+	</html:form>
+
+</body>
+</lams:html>
+
+
+
+
+
+
+
+
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_vote/web/monitoring/Instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r57a242c8553eeec5781c2106493aa9f34efa5489 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -31,7 +31,6 @@
     <% 
 		Set tabs = new LinkedHashSet();
 		tabs.add("label.summary");
-		tabs.add("label.instructions");
 		tabs.add("label.editActivity");
 		tabs.add("label.stats");
 		pageContext.setAttribute("tabs", tabs);
@@ -164,9 +163,8 @@
 		<lams:help toolSignature="<%= VoteAppConstants.MY_SIGNATURE %>" module="monitoring"/>
 		
 			<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp"/>
-			<lams:TabBody id="2" titleKey="label.instructions" page="Instructions.jsp" />
-			<lams:TabBody id="3" titleKey="label.editActivity" page="Edit.jsp" />
-			<lams:TabBody id="4" titleKey="label.stats" page="Stats.jsp" />
+			<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
+			<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
 		</html:form>
 	</div>	
 
Index: lams_tool_wiki/conf/middlegen/lams_tool_lawiki11-prefs.properties
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/conf/middlegen/lams_tool_lawiki11-prefs.properties	(.../lams_tool_lawiki11-prefs.properties)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/middlegen/lams_tool_lawiki11-prefs.properties	(.../lams_tool_lawiki11-prefs.properties)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -44,8 +44,6 @@
 hibernate.tables.tl_lawiki10_wiki.columns.offline_instructions.java-type=java.lang.String
 hibernate.tables.tl_lawiki10_wiki.columns.online_instructions.java-name=onlineInstructions
 hibernate.tables.tl_lawiki10_wiki.columns.online_instructions.java-type=java.lang.String
-hibernate.tables.tl_lawiki10_wiki.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lawiki10_wiki.columns.run_offline.java-type=java.lang.Boolean
 hibernate.tables.tl_lawiki10_wiki.columns.title.inctostring=true
 hibernate.tables.tl_lawiki10_wiki.columns.title.java-name=title
 hibernate.tables.tl_lawiki10_wiki.columns.title.java-type=java.lang.String
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/IWikiAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/IWikiDAO.java
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/IWikiDAO.java	(.../IWikiDAO.java)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/IWikiDAO.java	(.../IWikiDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -37,6 +37,4 @@
 
     void saveOrUpdate(Wiki toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
 }
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java	(.../WikiDAO.java)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java	(.../WikiDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiDAO;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
-import org.lamsfoundation.lams.tool.wiki.model.WikiAttachment;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
@@ -44,10 +43,7 @@
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Wiki wiki where wiki.toolContentId=?";
 
-    private static final String FIND_INSTRUCTION_FILE = "from " + WikiAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
-    public Wiki getByContentId(Long toolContentId) {
+  public Wiki getByContentId(Long toolContentId) {
 	List list = getHibernateTemplate().find(FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    Wiki wiki = (Wiki) list.get(0);
@@ -66,21 +62,6 @@
 	//this.getHibernateTemplate().flush();
     }
 
-    public void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	if (toolContentId != null && uuid != null && versionId != null) {
-	    List list = getSession().createQuery(FIND_INSTRUCTION_FILE).setLong(0, toolContentId.longValue()).setLong(
-		    1, uuid.longValue()).setLong(2, versionId.longValue()).setString(3, type).list();
-	    if (list != null && list.size() > 0) {
-		WikiAttachment file = (WikiAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     /**
      * Although we are dealing with a set, still somehow duplicates are coming
      * through. This method removes them.
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20140102.sql
===================================================================
diff -u
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20140102.sql	(revision 0)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20140102.sql	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,19 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
+ALTER TABLE tl_lawiki10_wiki DROP COLUMN online_instructions;
+ALTER TABLE tl_lawiki10_wiki DROP COLUMN offline_instructions;
+ALTER TABLE tl_lawiki10_wiki DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lawiki10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lawiki10';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java	(.../WikiDTO.java)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java	(.../WikiDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -32,7 +32,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
-import org.lamsfoundation.lams.tool.wiki.model.WikiAttachment;
 import org.lamsfoundation.lams.tool.wiki.model.WikiSession;
 
 public class WikiDTO {
@@ -45,10 +44,6 @@
 
     public String instructions;
 
-    public String onlineInstructions;
-
-    public String offlineInstructions;
-
     public boolean defineLater;
 
     public boolean contentInUse;
@@ -71,10 +66,6 @@
 
     private Integer maximumEdits;
 
-    public Set<WikiAttachmentDTO> onlineInstructionsFiles;
-
-    public Set<WikiAttachmentDTO> offlineInstructionsFiles;
-
     public Set<WikiSessionDTO> sessionDTOs = new TreeSet<WikiSessionDTO>();
 
     public Long currentTab;
@@ -87,8 +78,6 @@
 	toolContentId = wiki.getToolContentId();
 	title = wiki.getTitle();
 	instructions = wiki.getInstructions();
-	onlineInstructions = wiki.getOnlineInstructions();
-	offlineInstructions = wiki.getOfflineInstructions();
 	contentInUse = wiki.isContentInUse();
 	lockOnFinish = wiki.isLockOnFinished();
 	allowLearnerCreatePages = wiki.isAllowLearnerCreatePages();
@@ -100,23 +89,6 @@
 	minimumEdits = wiki.getMinimumEdits();
 	maximumEdits = wiki.getMaximumEdits();
 
-	onlineInstructionsFiles = new TreeSet<WikiAttachmentDTO>();
-	offlineInstructionsFiles = new TreeSet<WikiAttachmentDTO>();
-
-	for (Iterator<WikiAttachment> i = wiki.getWikiAttachments().iterator(); i.hasNext();) {
-	    WikiAttachment att = (WikiAttachment) i.next();
-	    if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-		WikiAttachmentDTO attDTO = new WikiAttachmentDTO(att);
-		offlineInstructionsFiles.add(attDTO);
-	    } else if (att.getFileType().equals(IToolContentHandler.TYPE_ONLINE)) {
-		WikiAttachmentDTO attDTO = new WikiAttachmentDTO(att);
-		onlineInstructionsFiles.add(attDTO);
-	    } else {
-		// something is wrong. Ignore file, log error
-		logger.error("File with uid " + att.getFileUuid() + " contains invalid fileType: " + att.getFileType());
-	    }
-	}
-
 	for (Iterator<WikiSession> iter = wiki.getWikiSessions().iterator(); iter.hasNext();) {
 	    WikiSession session = (WikiSession) iter.next();
 	    WikiSessionDTO sessionDTO = new WikiSessionDTO(session);
@@ -142,38 +114,6 @@
 	this.instructions = instructions;
     }
 
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    public Set<WikiAttachmentDTO> getOfflineInstructionsFiles() {
-	return offlineInstructionsFiles;
-    }
-
-    public void setOfflineInstructionsFiles(Set<WikiAttachmentDTO> offlineInstructionsFiles) {
-	this.offlineInstructionsFiles = offlineInstructionsFiles;
-    }
-
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    public Set<WikiAttachmentDTO> getOnlineInstructionsFiles() {
-	return onlineInstructionsFiles;
-    }
-
-    public void setOnlineInstructionsFiles(Set<WikiAttachmentDTO> onlineInstructionsFiles) {
-	this.onlineInstructionsFiles = onlineInstructionsFiles;
-    }
-
     public String getTitle() {
 	return title;
     }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java	(.../Wiki.java)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java	(.../Wiki.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -61,8 +61,6 @@
 
     private String instructions;
 
-    private boolean runOffline;
-
     // BEGIN ADVANCED OPTIONS------------------
 
     // Lock the wiki after learner is finished
@@ -94,55 +92,18 @@
 
     // END ADVANCED OPTIONS------------------
 
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
     private boolean contentInUse;
 
     private boolean defineLater;
 
     private Long toolContentId;
 
-    private Set<WikiAttachment> wikiAttachments;
-
     private Set<WikiSession> wikiSessions;
 
     private Set<WikiPage> wikiPages;
 
     private WikiPage mainPage;
 
-    // *********** NON Persist fields
-    private IToolContentHandler toolContentHandler;
-
-    // Constructors
-
-    /** default constructor */
-    public Wiki() {
-    }
-
-    /** full constructor */
-    public Wiki(Date createDate, Date updateDate, Long createBy, String title, String instructions, boolean runOffline,
-	    boolean lockOnFinished, boolean filteringEnabled, String filterKeywords, String onlineInstructions,
-	    String offlineInstructions, boolean contentInUse, boolean defineLater, Long toolContentId,
-	    Set<WikiAttachment> wikiAttachments, Set<WikiSession> wikiSessions, Set<WikiPage> wikiPages) {
-	this.createDate = createDate;
-	this.updateDate = updateDate;
-	this.createBy = createBy;
-	this.title = title;
-	this.instructions = instructions;
-	this.runOffline = runOffline;
-	this.lockOnFinished = lockOnFinished;
-	this.onlineInstructions = onlineInstructions;
-	this.offlineInstructions = offlineInstructions;
-	this.contentInUse = contentInUse;
-	this.defineLater = defineLater;
-	this.toolContentId = toolContentId;
-	this.wikiAttachments = wikiAttachments;
-	this.wikiSessions = wikiSessions;
-	this.wikiPages = wikiPages;
-    }
-
     // Property accessors
     /**
      * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
@@ -223,19 +184,6 @@
     }
 
     /**
-     * @hibernate.property column="run_offline" length="1"
-     * 
-     */
-
-    public boolean isRunOffline() {
-	return this.runOffline;
-    }
-
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
-    /**
      * @hibernate.property column="lock_on_finished" length="1"
      * 
      */
@@ -341,32 +289,6 @@
     }
 
     /**
-     * @hibernate.property column="online_instructions" length="65535"
-     * 
-     */
-
-    public String getOnlineInstructions() {
-	return this.onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    /**
-     * @hibernate.property column="offline_instructions" length="65535"
-     * 
-     */
-
-    public String getOfflineInstructions() {
-	return this.offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    /**
      * @hibernate.property column="content_in_use" length="1"
      * 
      */
@@ -406,21 +328,6 @@
     }
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="wiki_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.wiki.model.WikiAttachment"
-     * 
-     */
-
-    public Set<WikiAttachment> getWikiAttachments() {
-	return this.wikiAttachments;
-    }
-
-    public void setWikiAttachments(Set<WikiAttachment> wikiAttachments) {
-	this.wikiAttachments = wikiAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="wiki_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.wiki.model.WikiSession"
@@ -500,9 +407,8 @@
 	return result;
     }
 
-    public static Wiki newInstance(Wiki fromContent, Long toContentId, IToolContentHandler wikiToolContentHandler) {
+    public static Wiki newInstance(Wiki fromContent, Long toContentId) {
 	Wiki toContent = new Wiki();
-	fromContent.toolContentHandler = wikiToolContentHandler;
 	toContent = (Wiki) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -516,18 +422,6 @@
 	    wiki = (Wiki) super.clone();
 	    wiki.setUid(null);
 
-	    if (wikiAttachments != null) {
-		// create a copy of the attachments
-		Iterator<WikiAttachment> iter = wikiAttachments.iterator();
-		Set<WikiAttachment> set = new HashSet<WikiAttachment>();
-		while (iter.hasNext()) {
-		    WikiAttachment originalFile = (WikiAttachment) iter.next();
-		    WikiAttachment newFile = (WikiAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		wiki.wikiAttachments = set;
-	    }
-
 	    if (wikiPages != null) {
 		Set<WikiPage> newPages = new HashSet<WikiPage>();
 		for (WikiPage page : wikiPages) {
@@ -552,12 +446,4 @@
 	}
 	return wiki;
     }
-
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
 }
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
===================================================================
diff -u -rb19488eb4b80f01e7dcc599a71a6f8bff477c68c -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java	(.../IWikiService.java)	(revision b19488eb4b80f01e7dcc599a71a6f8bff477c68c)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java	(.../IWikiService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -30,7 +30,6 @@
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
-import org.lamsfoundation.lams.tool.wiki.model.WikiAttachment;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent;
 import org.lamsfoundation.lams.tool.wiki.model.WikiSession;
@@ -76,34 +75,6 @@
     public Wiki getWikiByContentId(Long toolContentID);
 
     /**
-     * Uploads a file to a wiki
-     * 
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    public WikiAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * Deletes a file from the repository
-     * 
-     * @param uuid
-     * @param versionID
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws WikiException;
-
-    /**
-     * Deletes an instruction file from the repository
-     * 
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * Saves or updates a wiki instance
      * 
      * @param wiki
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiContentVersionFilter.java
===================================================================
diff -u
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiContentVersionFilter.java	(revision 0)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiContentVersionFilter.java	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,43 @@
+/**************************************************************** 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.wiki.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.wiki.model.Wiki;
+
+/**
+ * Import filter class for different version of Wiki content.
+ */
+public class WikiContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20130716 version content to 20140102 version tool server.
+     */
+    public void up20130716To20140102() {
+	this.removeField(Wiki.class, "runOffline");
+	this.removeField(Wiki.class, "onlineInstructions");
+	this.removeField(Wiki.class, "offlineInstructions");
+	this.removeField(Wiki.class, "wikiAttachments");
+    }
+}
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r33da76d05725a84e191a5f6dca50b394cca3c1ee -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 33da76d05725a84e191a5f6dca50b394cca3c1ee)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -24,8 +24,6 @@
 
 package org.lamsfoundation.lams.tool.wiki.service;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
@@ -35,20 +33,8 @@
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
-import org.lamsfoundation.lams.contentrepository.ICredentials;
-import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
-import org.lamsfoundation.lams.contentrepository.LoginException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
@@ -67,30 +53,25 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
-import org.lamsfoundation.lams.tool.wiki.dao.IWikiAttachmentDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiPageContentDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiPageDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiSessionDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiUserDAO;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
-import org.lamsfoundation.lams.tool.wiki.model.WikiAttachment;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent;
 import org.lamsfoundation.lams.tool.wiki.model.WikiSession;
 import org.lamsfoundation.lams.tool.wiki.model.WikiUser;
 import org.lamsfoundation.lams.tool.wiki.util.WikiConstants;
 import org.lamsfoundation.lams.tool.wiki.util.WikiException;
-import org.lamsfoundation.lams.tool.wiki.util.WikiToolContentHandler;
 import org.lamsfoundation.lams.tool.wiki.util.diff.Diff;
 import org.lamsfoundation.lams.tool.wiki.util.diff.Difference;
 import org.lamsfoundation.lams.tool.wiki.web.forms.WikiPageForm;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * An implementation of the IWikiService interface.
@@ -111,18 +92,12 @@
 
     private IWikiUserDAO wikiUserDAO = null;
 
-    private IWikiAttachmentDAO wikiAttachmentDAO = null;
-
     private ILearnerService learnerService;
 
     private ILamsToolService toolService;
 
     private IToolContentHandler wikiToolContentHandler = null;
 
-    private IRepositoryService repositoryService = null;
-
-    private IAuditService auditService = null;
-
     private IExportToolContentService exportContentService;
 
     private ICoreNotebookService coreNotebookService;
@@ -137,7 +112,6 @@
 
     public WikiService() {
 	super();
-	// TODO Auto-generated constructor stub
     }
 
     /* ************ Methods from ToolSessionManager ************* */
@@ -292,29 +266,11 @@
 	    // create the fromContent using the default tool content
 	    fromContent = getDefaultContent();
 	}
-	Wiki toContent = Wiki.newInstance(fromContent, toContentId, wikiToolContentHandler);
+	Wiki toContent = Wiki.newInstance(fromContent, toContentId);
 
 	insertUnsavedWikiContent(toContent);
     }
 
-    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Wiki wiki = wikiDAO.getByContentId(toolContentId);
-	if (wiki == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	wiki.setDefineLater(value);
-	wikiDAO.saveOrUpdate(wiki);
-    }
-
-    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-	Wiki wiki = wikiDAO.getByContentId(toolContentId);
-	if (wiki == null) {
-	    throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
-	}
-	wiki.setRunOffline(value);
-	wikiDAO.saveOrUpdate(wiki);
-    }
-
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	// TODO Auto-generated method stub
@@ -339,8 +295,7 @@
 
 	// set ResourceToolContentHandler as null to avoid copy file node in
 	// repository again.
-	wiki = Wiki.newInstance(wiki, toolContentId, null);
-	wiki.setToolContentHandler(null);
+	wiki = Wiki.newInstance(wiki, toolContentId);
 	wiki.setWikiSessions(null);
 
 	// Go through each page add page content and remove parent references
@@ -361,13 +316,7 @@
 	mainPage.setTitle(wiki.getMainPage().getTitle());
 	wiki.setMainPage(mainPage);
 
-	Set<WikiAttachment> atts = wiki.getWikiAttachments();
-	for (WikiAttachment att : atts) {
-	    att.setWiki(null);
-	}
 	try {
-	    exportContentService
-		    .registerFileClassForExport(WikiAttachment.class.getName(), "fileUuid", "fileVersionId");
 	    exportContentService.exportToolContent(toolContentId, wiki, wikiToolContentHandler, rootPath);
 	} catch (ExportToolContentException e) {
 	    throw new ToolException(e);
@@ -383,9 +332,9 @@
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
-	    exportContentService.registerFileClassForImport(WikiAttachment.class.getName(), "fileUuid",
-		    "fileVersionId", "fileName", "fileType", null, null);
-
+	    // register version filter class
+	    exportContentService.registerImportVersionFilterClass(WikiContentVersionFilter.class);
+	
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, wikiToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Wiki)) {
@@ -566,7 +515,7 @@
 	}
 
 	Wiki defaultContent = getDefaultContent();
-	Wiki newContent = Wiki.newInstance(defaultContent, newContentID, wikiToolContentHandler);
+	Wiki newContent = Wiki.newInstance(defaultContent, newContentID);
 
 	insertUnsavedWikiContent(newContent);
 
@@ -637,27 +586,6 @@
 	return wikiUserDAO.getByUID(uid);
     }
 
-    public WikiAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) {
-	if (file == null || StringUtils.isEmpty(file.getFileName())) {
-	    throw new WikiException("Could not find upload file: " + file);
-	}
-
-	NodeKey nodeKey = processFile(file, type);
-
-	WikiAttachment attachment = new WikiAttachment(nodeKey.getVersion(), type, file.getFileName(), nodeKey
-		.getUuid(), new Date());
-	return attachment;
-    }
-
-    public void deleteFromRepository(Long uuid, Long versionID) throws WikiException {
-	ITicket ticket = getRepositoryLoginTicket();
-	try {
-	    repositoryService.deleteVersion(ticket, uuid, versionID);
-	} catch (Exception e) {
-	    throw new WikiException("Exception occured while deleting files from" + " the repository " + e.getMessage());
-	}
-    }
-
     /**
      * (non-Javadoc)
      * 
@@ -751,11 +679,6 @@
 	wikiPageDAO.saveOrUpdate(wikiPage);
     }
 
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
-	wikiDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-
-    }
-
     public void saveOrUpdateWiki(Wiki wiki) {
 	wikiDAO.saveOrUpdate(wiki);
     }
@@ -807,14 +730,6 @@
 	saveOrUpdateWikiUser(wikiUser);
 	return wikiUser;
     }
-
-    public IAuditService getAuditService() {
-	return auditService;
-    }
-
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
     
     @Override
     public boolean isGroupedActivity(long toolContentID) {
@@ -826,55 +741,8 @@
 	return toolService.getLearnerContentFolder(toolSessionId, userId);
     }
 
-    private NodeKey processFile(FormFile file, String type) {
-	NodeKey node = null;
-	if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = getWikiToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType(),
-			type);
-	    } catch (InvalidParameterException e) {
-		throw new WikiException("InvalidParameterException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (FileNotFoundException e) {
-		throw new WikiException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-	    } catch (RepositoryCheckedException e) {
-		throw new WikiException("RepositoryCheckedException occured while trying to upload File"
-			+ e.getMessage());
-	    } catch (IOException e) {
-		throw new WikiException("IOException occured while trying to upload File" + e.getMessage());
-	    }
-	}
-	return node;
-    }
-
     /**
-     * This method verifies the credentials of the Wiki Tool and gives it the <code>Ticket</code> to login and access
-     * the Content Repository.
      * 
-     * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
-     * the tool needs to upload/download files from the content repository.
-     * 
-     * @return ITicket The ticket for repostory access
-     * @throws SubmitFilesException
-     */
-    private ITicket getRepositoryLoginTicket() throws WikiException {
-	ICredentials credentials = new SimpleCredentials(WikiToolContentHandler.repositoryUser,
-		WikiToolContentHandler.repositoryId);
-	try {
-	    ITicket ticket = repositoryService.login(credentials, WikiToolContentHandler.repositoryWorkspaceName);
-	    return ticket;
-	} catch (AccessDeniedException ae) {
-	    throw new WikiException("Access Denied to repository." + ae.getMessage());
-	} catch (WorkspaceNotFoundException we) {
-	    throw new WikiException("Workspace not found." + we.getMessage());
-	} catch (LoginException e) {
-	    throw new WikiException("Login failed." + e.getMessage());
-	}
-    }
-
-    /**
-     * 
      * @param learnerId
      * @param toolSessionId
      * @return
@@ -934,9 +802,6 @@
 	wiki.setInstructions(WebUtil.convertNewlines((String) importValues
 		.get(ToolContentImport102Manager.CONTENT_BODY)));
 	wiki.setLockOnFinished(Boolean.TRUE);
-	wiki.setOfflineInstructions(null);
-	wiki.setOnlineInstructions(null);
-	wiki.setRunOffline(Boolean.FALSE);
 	wiki.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	wiki.setToolContentId(toolContentId);
 	wiki.setUpdateDate(now);
@@ -948,9 +813,6 @@
 	wiki.setMaximumEdits(0);
 	wiki.setMinimumEdits(0);
 
-	// leave as empty, no need to set them to anything.
-	// setWikiAttachments(Set wikiAttachments);
-	// setWikiSessions(Set wikiSessions);
 	wikiDAO.saveOrUpdate(wiki);
     }
 
@@ -974,14 +836,6 @@
     // =========================================================================================
     /* ********** Used by Spring to "inject" the linked objects ************* */
 
-    public IWikiAttachmentDAO getWikiAttachmentDAO() {
-	return wikiAttachmentDAO;
-    }
-
-    public void setWikiAttachmentDAO(IWikiAttachmentDAO attachmentDAO) {
-	wikiAttachmentDAO = attachmentDAO;
-    }
-
     public IWikiDAO getWikiDAO() {
 	return wikiDAO;
     }
@@ -1106,14 +960,6 @@
 	this.lessonService = lessonService;
     }
 
-    public IRepositoryService getRepositoryService() {
-	return repositoryService;
-    }
-
-    public void setRepositoryService(IRepositoryService repositoryService) {
-	this.repositoryService = repositoryService;
-    }
-
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getWikiOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -r31d297d14df060ae066a55e125b5025ed713d681 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 31d297d14df060ae066a55e125b5025ed713d681)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -33,8 +33,6 @@
     public static final Integer SESSION_COMPLETED = new Integer(2);
 
     public static final String AUTHORING_DEFAULT_TAB = "1";
-    public static final String ATTACHMENT_LIST = "attachmentList";
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
     public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter";
     public static final String AUTH_SESSION_ID = "authoringSessionId";
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -r4161978f8d7ac38d8de94e68128ae300b0892e9d -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4161978f8d7ac38d8de94e68128ae300b0892e9d)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -49,7 +49,6 @@
 import org.lamsfoundation.lams.tool.wiki.dto.WikiPageContentDTO;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiPageDTO;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
-import org.lamsfoundation.lams.tool.wiki.model.WikiAttachment;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent;
 import org.lamsfoundation.lams.tool.wiki.model.WikiUser;
@@ -91,16 +90,6 @@
 
     private static final String KEY_MODE = "mode";
 
-    private static final String KEY_ONLINE_FILES = "onlineFiles";
-
-    private static final String KEY_OFFLINE_FILES = "offlineFiles";
-
-    private static final String KEY_UNSAVED_ONLINE_FILES = "unsavedOnlineFiles";
-
-    private static final String KEY_UNSAVED_OFFLINE_FILES = "unsavedOfflineFiles";
-
-    private static final String KEY_DELETED_FILES = "deletedFiles";
-
     /**
      * Default method when no dispatch parameter is specified. It is expected that the parameter
      * <code>toolContentID</code> will be passed in. This will be used to retrieve content for this tool.
@@ -264,24 +253,6 @@
 	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
 	updateWiki(wiki, authForm, mode);
 
-	// remove attachments marked for deletion.
-	Set<WikiAttachment> attachments = wiki.getWikiAttachments();
-	if (attachments == null) {
-	    attachments = new HashSet<WikiAttachment>();
-	}
-
-	for (WikiAttachment att : getAttList(AuthoringAction.KEY_DELETED_FILES, map)) {
-	    // remove from db, leave in repository
-	    attachments.remove(att);
-	}
-
-	// add unsaved attachments
-	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map));
-	attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map));
-
-	// set attachments in case it didn't exist
-	wiki.setWikiAttachments(attachments);
-
 	// set the update date
 	wiki.setUpdateDate(new Date());
 
@@ -300,169 +271,8 @@
 	return mapping.findForward("success");
     }
 
-    public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return uploadFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_ONLINE, request);
-    }
 
-    public ActionForward uploadOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return uploadFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    public ActionForward deleteOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    public ActionForward deleteOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return deleteFile(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    public ActionForward removeUnsavedOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return removeUnsaved(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_ONLINE, request);
-    }
-
-    public ActionForward removeUnsavedOffline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	return removeUnsaved(mapping, (AuthoringForm) form, IToolContentHandler.TYPE_OFFLINE, request);
-    }
-
-    /* ========== Private Methods ********** */
-
     /**
-     * Upload a file
-     */
-    private ActionForward uploadFile(ActionMapping mapping, AuthoringForm authForm, String type,
-	    HttpServletRequest request) {
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-	FormFile file;
-	List<WikiAttachment> unsavedFiles;
-	List<WikiAttachment> savedFiles;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    file = authForm.getOfflineFile();
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
-
-	    savedFiles = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-	} else {
-	    file = authForm.getOnlineFile();
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map);
-
-	    savedFiles = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-	}
-
-	// validate file max size
-	ActionMessages errors = new ActionMessages();
-	FileValidatorUtil.validateFileSize(file, true, errors);
-	if (!errors.isEmpty()) {
-	    request.setAttribute(WikiConstants.ATTR_SESSION_MAP, map);
-	    this.saveErrors(request, errors);
-	    return mapping.findForward("success");
-	}
-
-	if (file.getFileName().length() != 0) {
-
-	    // upload file to repository
-	    WikiAttachment newAtt = wikiService.uploadFileToContent(
-		    (Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID), file, type);
-
-	    // Add attachment to unsavedFiles
-	    // check to see if file with same name exists
-	    WikiAttachment currAtt;
-	    Iterator iter = savedFiles.iterator();
-	    while (iter.hasNext()) {
-		currAtt = (WikiAttachment) iter.next();
-		if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
-			&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
-		    // move from this this list to deleted list.
-		    getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(currAtt);
-		    iter.remove();
-		    break;
-		}
-	    }
-	    unsavedFiles.add(newAtt);
-
-	    request.setAttribute(WikiConstants.ATTR_SESSION_MAP, map);
-	    request.setAttribute("unsavedChanges", new Boolean(true));
-	}
-	return mapping.findForward("success");
-    }
-
-    /**
-     * Delete a file
-     * 
-     * @param mapping
-     * @param authForm
-     * @param type
-     * @param request
-     * @return
-     */
-    private ActionForward deleteFile(ActionMapping mapping, AuthoringForm authForm, String type,
-	    HttpServletRequest request) {
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-	List fileList;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    fileList = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-	} else {
-	    fileList = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-	}
-
-	Iterator iter = fileList.iterator();
-
-	while (iter.hasNext()) {
-	    WikiAttachment att = (WikiAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// move to delete file list, deleted at next updateContent
-		getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(att);
-
-		// remove from this list
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(WikiConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
-    private ActionForward removeUnsaved(ActionMapping mapping, AuthoringForm authForm, String type,
-	    HttpServletRequest request) {
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-	List unsavedFiles;
-
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
-	} else {
-	    unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, map);
-	}
-
-	Iterator iter = unsavedFiles.iterator();
-	while (iter.hasNext()) {
-	    WikiAttachment att = (WikiAttachment) iter.next();
-
-	    if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-		// delete from repository and list
-		wikiService.deleteFromRepository(att.getFileUuid(), att.getFileVersionId());
-		iter.remove();
-		break;
-	    }
-	}
-
-	request.setAttribute(WikiConstants.ATTR_SESSION_MAP, map);
-	request.setAttribute("unsavedChanges", new Boolean(true));
-
-	return mapping.findForward("success");
-    }
-
-    /**
      * Updates Wiki content using AuthoringForm inputs.
      * 
      * @param authForm
@@ -481,8 +291,6 @@
 	wiki.setMainPage(mainPage);
 
 	if (mode.isAuthor()) { // Teacher cannot modify following
-	    wiki.setOfflineInstructions(authForm.getOfflineInstruction());
-	    wiki.setOnlineInstructions(authForm.getOnlineInstruction());
 	    wiki.setLockOnFinished(authForm.isLockOnFinished());
 	    wiki.setAllowLearnerAttachImages(authForm.isAllowLearnerAttachImages());
 	    wiki.setAllowLearnerCreatePages(authForm.isAllowLearnerCreatePages());
@@ -503,8 +311,6 @@
      * @return
      */
     private void updateAuthForm(AuthoringForm authForm, Wiki wiki) {
-	authForm.setOnlineInstruction(wiki.getOnlineInstructions());
-	authForm.setOfflineInstruction(wiki.getOfflineInstructions());
 	authForm.setLockOnFinished(wiki.isLockOnFinished());
 	authForm.setAllowLearnerAttachImages(wiki.isAllowLearnerAttachImages());
 	authForm.setAllowLearnerCreatePages(wiki.isAllowLearnerCreatePages());
@@ -531,24 +337,7 @@
 	map.put(AuthoringAction.KEY_MODE, mode);
 	map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
 	map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
-	map.put(AuthoringAction.KEY_ONLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(AuthoringAction.KEY_OFFLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, new LinkedList<WikiAttachment>());
-	map.put(AuthoringAction.KEY_DELETED_FILES, new LinkedList<WikiAttachment>());
 
-	Iterator iter = wiki.getWikiAttachments().iterator();
-	while (iter.hasNext()) {
-	    WikiAttachment attachment = (WikiAttachment) iter.next();
-	    String type = attachment.getFileType();
-	    if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-		getAttList(AuthoringAction.KEY_OFFLINE_FILES, map).add(attachment);
-	    }
-	    if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-		getAttList(AuthoringAction.KEY_ONLINE_FILES, map).add(attachment);
-	    }
-	}
-
 	return map;
     }
 
@@ -567,18 +356,6 @@
     }
 
     /**
-     * Retrieves a List of attachments from the map using the key.
-     * 
-     * @param key
-     * @param map
-     * @return
-     */
-    private List<WikiAttachment> getAttList(String key, SessionMap<String, Object> map) {
-	List<WikiAttachment> list = (List<WikiAttachment>) map.get(key);
-	return list;
-    }
-
-    /**
      * Retrieve the SessionMap from the HttpSession.
      * 
      * @param request
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -rb19488eb4b80f01e7dcc599a71a6f8bff477c68c -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision b19488eb4b80f01e7dcc599a71a6f8bff477c68c)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -77,7 +77,6 @@
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm" validate="false"
  * @struts.action-forward name="wiki" path="tiles:/learning/main"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="compareWiki" path="/pages/wiki/compare.jsp"
  * @struts.action-forward name="viewWiki" path="/pages/wiki/viewWiki.jsp"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
@@ -141,11 +140,6 @@
 	
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 		.getServletContext());
-	
-	// check runOffline
-	if (wiki.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
 
 	// get the user
 	WikiUser wikiUser;
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
===================================================================
diff -u -rb33e717f9a734d318eefab07a17234f07c770c92 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -113,35 +113,6 @@
     }
 
     /**
-     * Do an offline export
-     */
-    @Override
-    protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
-	    Cookie[] cookies) {
-	if (toolContentID == null && toolSessionID == null) {
-	    ExportServlet.logger.error("Tool content Id or and session Id are null. Unable to activity title");
-	} else {
-	    if (wikiService == null) {
-		wikiService = WikiServiceProxy.getWikiService(getServletContext());
-	    }
-
-	    Wiki content = null;
-	    if (toolContentID != null) {
-		content = wikiService.getWikiByContentId(toolContentID);
-	    } else {
-		WikiSession session = wikiService.getSessionBySessionId(toolSessionID);
-		if (session != null) {
-		    content = session.getWiki();
-		}
-	    }
-	    if (content != null) {
-		activityTitle = content.getTitle();
-	    }
-	}
-	return super.doOfflineExport(request, response, directoryName, cookies);
-    }
-
-    /**
      * Do export for learners, outputs the wiki pages into one page which seperates each page into divs which are
      * displayed onclick
      * 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -16,22 +16,19 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.wiki.service.WikiService">
-				<property name="wikiAttachmentDAO"><ref bean="wikiAttachmentDAO"/></property>
 				<property name="wikiSessionDAO"><ref bean="wikiSessionDAO"/></property>
 				<property name="wikiUserDAO"><ref bean="wikiUserDAO"/></property>
 				<property name="wikiDAO"><ref bean="wikiDAO"/></property>
 				<property name="wikiPageDAO"><ref bean="wikiPageDAO"/></property>
 				<property name="wikiPageContentDAO"><ref bean="wikiPageContentDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="wikiToolContentHandler"><ref bean="wikiToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 		   		<property name="messageService"><ref bean="wikiMessageService"/></property>
-		   		<property name="lessonService"><ref bean="lessonService"/></property> 
-		   		<property name="repositoryService"><ref bean="repositoryService"/></property> 
+		   		<property name="lessonService"><ref bean="lessonService"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -45,8 +42,6 @@
 				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="add*">PROPAGATION_REQUIRED</prop>
 				<prop key="leaveToolSession">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsDefineLater">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsRunOffline">PROPAGATION_REQUIRED</prop>
                 <prop key="exportToolSession">PROPAGATION_REQUIRED</prop>
 
 				<prop key="importToolContent">PROPAGATION_REQUIRED</prop>
@@ -78,10 +73,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="wikiAttachmentDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
  	<bean id="wikiToolContentHandler" class="org.lamsfoundation.lams.tool.wiki.util.WikiToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
Index: lams_tool_wiki/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_wiki/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -86,10 +86,6 @@
 	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/wiki.jsp" />
 	</definition>
-
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
-	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
Index: lams_tool_wiki/web/includes/javascript/authoring.js
===================================================================
diff -u -r31d297d14df060ae066a55e125b5025ed713d681 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 31d297d14df060ae066a55e125b5025ed713d681)
+++ lams_tool_wiki/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -25,7 +25,3 @@
 		finishButtonDiv.style.display = "block";
 	}
 }
-function deleteAttachment(dispatch, uuid) {
-	document.authoringForm.deleteFileUuid.value = uuid;
-	submitWiki(dispatch);
-}
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r4161978f8d7ac38d8de94e68128ae300b0892e9d -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4161978f8d7ac38d8de94e68128ae300b0892e9d)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -19,7 +19,6 @@
 			<lams:Tab id="1" key="button.basic" />
 			<c:if test="${sessionMap.mode == 'author'}">
 				<lams:Tab id="2" key="button.advanced" />
-				<lams:Tab id="3" key="button.instructions" />
 			</c:if>
 		</lams:Tabs>
 	
@@ -38,9 +37,6 @@
 		<html:hidden property="historyPageContentId" styleId="historyPageContentId"/>
 		
 		<div id="message" style="text-align: center;">
-			<c:if test="${unsavedChanges}">
-				<fmt:message key="message.unsavedChanges" />
-			</c:if>
 			<c:if test="${currentWikiPage.deleted}">
 				<p class="warning"><fmt:message key="label.wiki.removed" /></p>
 			</c:if>
@@ -61,8 +57,6 @@
 		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 		<c:if test="${sessionMap.mode == 'author'}">
 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.instructions"
-				page="instructions.jsp" />
 		</c:if>
 
 		<div id="finishButtonDiv">
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wiki/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -4,9 +4,8 @@
 <div id="header">
 	<lams:Tabs>
 		<lams:Tab id="1" key="button.summary" />
-		<lams:Tab id="2" key="button.instructions" />
-		<lams:Tab id="3" key="button.editActivity" />
-		<lams:Tab id="4" key="button.statistics" />
+		<lams:Tab id="2" key="button.editActivity" />
+		<lams:Tab id="3" key="button.statistics" />
 	</lams:Tabs>
 	<script type="text/javascript">
 		var initialTabId = "${wikiDTO.currentTab}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= WikiConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 
 	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.instructions" page="instructions.jsp" />
-	<lams:TabBody id="3" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="4" titleKey="button.statistics" page="statistics.jsp" />
+	<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+	<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
 </div>
 
 <div id="footer"></div>
Index: lams_tool_wookie/conf/middlegen/lams_tool_lawookie11-prefs.properties
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/conf/middlegen/lams_tool_lawookie11-prefs.properties	(.../lams_tool_lawookie11-prefs.properties)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/conf/middlegen/lams_tool_lawookie11-prefs.properties	(.../lams_tool_lawookie11-prefs.properties)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -44,8 +44,6 @@
 hibernate.tables.tl_lawook10_wookie.columns.offline_instructions.java-type=java.lang.String
 hibernate.tables.tl_lawook10_wookie.columns.online_instructions.java-name=onlineInstructions
 hibernate.tables.tl_lawook10_wookie.columns.online_instructions.java-type=java.lang.String
-hibernate.tables.tl_lawook10_wookie.columns.run_offline.java-name=runOffline
-hibernate.tables.tl_lawook10_wookie.columns.run_offline.java-type=java.lang.Boolean
 hibernate.tables.tl_lawook10_wookie.columns.title.inctostring=true
 hibernate.tables.tl_lawook10_wookie.columns.title.java-name=title
 hibernate.tables.tl_lawook10_wookie.columns.title.java-type=java.lang.String
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/IWookieAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/IWookieDAO.java
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/IWookieDAO.java	(.../IWookieDAO.java)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/IWookieDAO.java	(.../IWookieDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -37,8 +37,6 @@
 
     void saveOrUpdate(Wookie toContent);
 
-    void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type);
-
     void releaseFromCache(Object o);
 
 }
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java	(.../WookieDAO.java)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java	(.../WookieDAO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,12 +26,9 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.wookie.dao.IWookieDAO;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
-import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment;
-import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * DAO for accessing the Wookie objects - Hibernate specific code.
@@ -40,9 +37,6 @@
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Wookie wookie where wookie.toolContentId=?";
 
-    private static final String FIND_INSTRUCTION_FILE = "from " + WookieAttachment.class.getName()
-	    + " as i where tool_content_id=? and i.file_uuid=? and i.file_version_id=? and i.file_type=?";
-
     @SuppressWarnings("unchecked")
     public Wookie getByContentId(Long toolContentId) {
 	List list = getHibernateTemplate().find(WookieDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
@@ -58,23 +52,6 @@
 	this.getHibernateTemplate().flush();
     }
 
-    @SuppressWarnings("unchecked")
-    public void deleteInstructionFile(Long toolContentId, Long uuid, Long versionId, String type) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	if (toolContentId != null && uuid != null && versionId != null) {
-	    List list = getSession().createQuery(WookieDAO.FIND_INSTRUCTION_FILE).setLong(0,
-		    toolContentId.longValue()).setLong(1, uuid.longValue()).setLong(2, versionId.longValue())
-		    .setString(3, type).list();
-	    if (list != null && list.size() > 0) {
-		WookieAttachment file = (WookieAttachment) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(file);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public void releaseFromCache(Object o) {
 	getSession().evict(o);
 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/patch20140102.sql
===================================================================
diff -u
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/patch20140102.sql	(revision 0)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/patch20140102.sql	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,19 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
+ALTER TABLE tl_lawook10_wookie DROP COLUMN online_instructions;
+ALTER TABLE tl_lawook10_wookie DROP COLUMN offline_instructions;
+ALTER TABLE tl_lawook10_wookie DROP COLUMN run_offline;
+DROP TABLE IF EXISTS tl_lawook10_attachment;
+
+UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lawook10';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieAttachmentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java	(.../WookieDTO.java)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java	(.../WookieDTO.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -32,7 +32,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
-import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment;
 import org.lamsfoundation.lams.tool.wookie.model.WookieSession;
 
 public class WookieDTO {
@@ -45,10 +44,6 @@
 
     public String instructions;
 
-    public String onlineInstructions;
-
-    public String offlineInstructions;
-
     public boolean defineLater;
 
     public boolean contentInUse;
@@ -57,10 +52,6 @@
 
     public boolean lockOnFinish;
 
-    public Set<WookieAttachmentDTO> onlineInstructionsFiles;
-
-    public Set<WookieAttachmentDTO> offlineInstructionsFiles;
-
     public Set<WookieSessionDTO> sessionDTOs = new TreeSet<WookieSessionDTO>();
 
     public Long currentTab;
@@ -77,29 +68,11 @@
 	this.toolContentId = wookie.getToolContentId();
 	this.title = wookie.getTitle();
 	this.instructions = wookie.getInstructions();
-	this.onlineInstructions = wookie.getOnlineInstructions();
-	this.offlineInstructions = wookie.getOfflineInstructions();
 	this.contentInUse = wookie.isContentInUse();
 	this.reflectOnActivity = wookie.isReflectOnActivity();
 	this.lockOnFinish = wookie.isLockOnFinished();
 	this.reflectInstructions = wookie.getReflectInstructions();
-	this.onlineInstructionsFiles = new TreeSet<WookieAttachmentDTO>();
-	this.offlineInstructionsFiles = new TreeSet<WookieAttachmentDTO>();
 
-	for (Iterator<WookieAttachment> i = wookie.getWookieAttachments().iterator(); i.hasNext();) {
-	    WookieAttachment att = (WookieAttachment) i.next();
-	    if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) {
-		WookieAttachmentDTO attDTO = new WookieAttachmentDTO(att);
-		offlineInstructionsFiles.add(attDTO);
-	    } else if (att.getFileType().equals(IToolContentHandler.TYPE_ONLINE)) {
-		WookieAttachmentDTO attDTO = new WookieAttachmentDTO(att);
-		onlineInstructionsFiles.add(attDTO);
-	    } else {
-		// something is wrong. Ignore file, log error
-		logger.error("File with uid " + att.getFileUuid() + " contains invalid fileType: " + att.getFileType());
-	    }
-	}
-
 	for (Iterator<WookieSession> iter = wookie.getWookieSessions().iterator(); iter.hasNext();) {
 	    WookieSession session = (WookieSession) iter.next();
 	    WookieSessionDTO sessionDTO = new WookieSessionDTO(session);
@@ -125,38 +98,6 @@
 	this.instructions = instructions;
     }
 
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    public Set<WookieAttachmentDTO> getOfflineInstructionsFiles() {
-	return offlineInstructionsFiles;
-    }
-
-    public void setOfflineInstructionsFiles(Set<WookieAttachmentDTO> offlineInstructionsFiles) {
-	this.offlineInstructionsFiles = offlineInstructionsFiles;
-    }
-
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    public Set<WookieAttachmentDTO> getOnlineInstructionsFiles() {
-	return onlineInstructionsFiles;
-    }
-
-    public void setOnlineInstructionsFiles(Set<WookieAttachmentDTO> onlineInstructionsFiles) {
-	this.onlineInstructionsFiles = onlineInstructionsFiles;
-    }
-
     public String getTitle() {
 	return title;
     }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java
===================================================================
diff -u -r08622dbb2e6672584f1cfcb52a239a46b3d667b1 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java	(.../Wookie.java)	(revision 08622dbb2e6672584f1cfcb52a239a46b3d667b1)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java	(.../Wookie.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -38,10 +38,7 @@
  */
 
 public class Wookie implements java.io.Serializable, Cloneable {
-
-    /**
-     * 
-     */
+    
     private static final long serialVersionUID = 579733009969321015L;
 
     static Logger log = Logger.getLogger(WookieService.class.getName());
@@ -62,26 +59,18 @@
 
     private String instructions;
 
-    private boolean runOffline;
-
     private boolean lockOnFinished;
 
     private boolean reflectOnActivity;
 
     private String reflectInstructions;
 
-    private String onlineInstructions;
-
-    private String offlineInstructions;
-
     private boolean contentInUse;
 
     private boolean defineLater;
 
     private Long toolContentId;
 
-    private Set<WookieAttachment> wookieAttachments;
-
     private Set<WookieSession> wookieSessions;
     
     // Wookie parameters
@@ -91,38 +80,6 @@
     Boolean widgetMaximise;
     String widgetIdentifier;
 
-    // *********** NON Persisit fields
-    private IToolContentHandler toolContentHandler;
-
-    // Constructors
-
-    /** default constructor */
-    public Wookie() {
-    }
-
-    /** full constructor */
-    public Wookie(Date createDate, Date updateDate, Integer createBy, String title, String instructions,
-	    boolean runOffline, boolean lockOnFinished, boolean filteringEnabled, String filterKeywords,
-	    String onlineInstructions, String offlineInstructions, boolean contentInUse, boolean defineLater,
-	    Long toolContentId, String reflectInstructions, Set<WookieAttachment> wookieAttachments,
-	    Set<WookieSession> wookieSessions, String imageFileName, Long imageWidth, Long imageHeight) {
-	this.createDate = createDate;
-	this.updateDate = updateDate;
-	this.createBy = createBy;
-	this.title = title;
-	this.instructions = instructions;
-	this.runOffline = runOffline;
-	this.lockOnFinished = lockOnFinished;
-	this.onlineInstructions = onlineInstructions;
-	this.offlineInstructions = offlineInstructions;
-	this.contentInUse = contentInUse;
-	this.defineLater = defineLater;
-	this.toolContentId = toolContentId;
-	this.wookieAttachments = wookieAttachments;
-	this.wookieSessions = wookieSessions;
-	this.reflectInstructions = reflectInstructions;
-    }
-
     // Property accessors
     /**
      * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
@@ -203,19 +160,6 @@
     }
 
     /**
-     * @hibernate.property column="run_offline" length="1"
-     * 
-     */
-
-    public boolean isRunOffline() {
-	return runOffline;
-    }
-
-    public void setRunOffline(boolean runOffline) {
-	this.runOffline = runOffline;
-    }
-
-    /**
      * @hibernate.property column="lock_on_finished" length="1"
      * 
      */
@@ -240,31 +184,6 @@
     }
 
     /**
-     * @hibernate.property column="online_instructions" length="65535"
-     * 
-     */
-    public String getOnlineInstructions() {
-	return onlineInstructions;
-    }
-
-    public void setOnlineInstructions(String onlineInstructions) {
-	this.onlineInstructions = onlineInstructions;
-    }
-
-    /**
-     * @hibernate.property column="offline_instructions" length="65535"
-     * 
-     */
-
-    public String getOfflineInstructions() {
-	return offlineInstructions;
-    }
-
-    public void setOfflineInstructions(String offlineInstructions) {
-	this.offlineInstructions = offlineInstructions;
-    }
-
-    /**
      * @hibernate.property column="content_in_use" length="1"
      * 
      */
@@ -302,25 +221,8 @@
     public void setToolContentId(Long toolContentId) {
 	this.toolContentId = toolContentId;
     }
-    
-    
 
     /**
-     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
-     * @hibernate.collection-key column="wookie_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.wookie.model.WookieAttachment"
-     * 
-     */
-
-    public Set<WookieAttachment> getWookieAttachments() {
-	return wookieAttachments;
-    }
-
-    public void setWookieAttachments(Set<WookieAttachment> wookieAttachments) {
-	this.wookieAttachments = wookieAttachments;
-    }
-
-    /**
      * @hibernate.set lazy="true" inverse="true" cascade="none"
      * @hibernate.collection-key column="wookie_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.wookie.model.WookieSession"
@@ -377,9 +279,8 @@
 	return result;
     }
 
-    public static Wookie newInstance(Wookie fromContent, Long toContentId, IToolContentHandler wookieToolContentHandler) {
+    public static Wookie newInstance(Wookie fromContent, Long toContentId) {
 	Wookie toContent = new Wookie();
-	fromContent.toolContentHandler = wookieToolContentHandler;
 	toContent = (Wookie) fromContent.clone();
 	toContent.setToolContentId(toContentId);
 	toContent.setCreateDate(new Date());
@@ -394,17 +295,6 @@
 	    wookie = (Wookie) super.clone();
 	    wookie.setUid(null);
 
-	    if (wookieAttachments != null) {
-		// create a copy of the attachments
-		Iterator<WookieAttachment> iter = wookieAttachments.iterator();
-		Set<WookieAttachment> set = new HashSet<WookieAttachment>();
-		while (iter.hasNext()) {
-		    WookieAttachment originalFile = (WookieAttachment) iter.next();
-		    WookieAttachment newFile = (WookieAttachment) originalFile.clone();
-		    set.add(newFile);
-		}
-		wookie.wookieAttachments = set;
-	    }
 	    // create an empty set for the wookieSession
 	    wookie.wookieSessions = new HashSet<WookieSession>();
 
@@ -414,14 +304,6 @@
 	return wookie;
     }
 
-    public IToolContentHandler getToolContentHandler() {
-	return toolContentHandler;
-    }
-
-    public void setToolContentHandler(IToolContentHandler toolContentHandler) {
-	this.toolContentHandler = toolContentHandler;
-    }
-
     /**
      * @hibernate.property column="reflect_instructions" length="65535"
      */
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieAttachment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java
===================================================================
diff -u -r1b9cc5f77d2ca9a23335fd5dcfc7ee44b87f91b3 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java	(.../IWookieService.java)	(revision 1b9cc5f77d2ca9a23335fd5dcfc7ee44b87f91b3)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java	(.../IWookieService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -27,7 +27,6 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
-import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment;
 import org.lamsfoundation.lams.tool.wookie.model.WookieConfigItem;
 import org.lamsfoundation.lams.tool.wookie.model.WookieSession;
 import org.lamsfoundation.lams.tool.wookie.model.WookieUser;
@@ -66,28 +65,6 @@
     public Wookie getWookieByContentId(Long toolContentID);
 
     /**
-     * @param toolContentId
-     * @param file
-     * @param type
-     * @return
-     */
-    public WookieAttachment uploadFileToContent(Long toolContentId, FormFile file, String type);
-
-    /**
-     * @param uuid
-     * @param versionID
-     */
-    public void deleteFromRepository(Long uuid, Long versionID) throws WookieException;
-
-    /**
-     * @param contentID
-     * @param uuid
-     * @param versionID
-     * @param type
-     */
-    public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type);
-
-    /**
      * @param wookie
      */
     public void saveOrUpdateWookie(Wookie wookie);
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieContentVersionFilter.java
===================================================================
diff -u
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieContentVersionFilter.java	(revision 0)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieContentVersionFilter.java	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -0,0 +1,43 @@
+/**************************************************************** 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.wookie.service;
+
+import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.wookie.model.Wookie;
+
+/**
+ * Import filter class for different version of Wookie content.
+ */
+public class WookieContentVersionFilter extends ToolContentVersionFilter {
+    
+    /**
+     * Import 20081217 version content to 20140102 version tool server.
+     */
+    public void up20081217To20140102() {
+	this.removeField(Wookie.class, "runOffline");
+	this.removeField(Wookie.class, "onlineInstructions");
+	this.removeField(Wookie.class, "offlineInstructions");
+	this.removeField(Wookie.class, "wookieAttachments");
+    }
+}
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java
===================================================================
diff -u -r33da76d05725a84e191a5f6dca50b394cca3c1ee -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java	(.../WookieService.java)	(revision 33da76d05725a84e191a5f6dca50b394cca3c1ee)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java	(.../WookieService.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -29,17 +29,12 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
@@ -70,14 +65,12 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
-import org.lamsfoundation.lams.tool.wookie.dao.IWookieAttachmentDAO;
 import org.lamsfoundation.lams.tool.wookie.dao.IWookieConfigItemDAO;
 import org.lamsfoundation.lams.tool.wookie.dao.IWookieDAO;
 import org.lamsfoundation.lams.tool.wookie.dao.IWookieSessionDAO;
 import org.lamsfoundation.lams.tool.wookie.dao.IWookieUserDAO;
 import org.lamsfoundation.lams.tool.wookie.dto.WidgetData;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
-import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment;
 import org.lamsfoundation.lams.tool.wookie.model.WookieConfigItem;
 import org.lamsfoundation.lams.tool.wookie.model.WookieSession;
 import org.lamsfoundation.lams.tool.wookie.model.WookieUser;
@@ -91,14 +84,7 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
-import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
-import com.thoughtworks.xstream.XStream;
-
 /**
  * An implementation of the IWookieService interface.
  * 
@@ -117,18 +103,12 @@
 
 	private IWookieUserDAO wookieUserDAO = null;
 
-	private IWookieAttachmentDAO wookieAttachmentDAO = null;
-
 	private ILearnerService learnerService;
 
 	private ILamsToolService toolService;
 
 	private IToolContentHandler wookieToolContentHandler = null;
 
-	private IRepositoryService repositoryService = null;
-
-	private IAuditService auditService = null;
-
 	private IExportToolContentService exportContentService;
 
 	private ICoreNotebookService coreNotebookService;
@@ -283,8 +263,7 @@
 			// create the fromContent using the default tool content
 			fromContent = getDefaultContent();
 		}
-		Wookie toContent = Wookie.newInstance(fromContent, toContentId,
-				wookieToolContentHandler);
+		Wookie toContent = Wookie.newInstance(fromContent, toContentId);
 
 		// Clone the wookie widget on the external server
 		String wookieUrl = getWookieURL();
@@ -359,28 +338,6 @@
 
 	}
 
-	public void setAsDefineLater(Long toolContentId, boolean value)
-			throws DataMissingException, ToolException {
-		Wookie wookie = wookieDAO.getByContentId(toolContentId);
-		if (wookie == null) {
-			throw new ToolException("Could not find tool with toolContentID: "
-					+ toolContentId);
-		}
-		wookie.setDefineLater(value);
-		wookieDAO.saveOrUpdate(wookie);
-	}
-
-	public void setAsRunOffline(Long toolContentId, boolean value)
-			throws DataMissingException, ToolException {
-		Wookie wookie = wookieDAO.getByContentId(toolContentId);
-		if (wookie == null) {
-			throw new ToolException("Could not find tool with toolContentID: "
-					+ toolContentId);
-		}
-		wookie.setRunOffline(value);
-		wookieDAO.saveOrUpdate(wookie);
-	}
-
 	public void removeToolContent(Long toolContentId, boolean removeSessionData)
 			throws SessionDataExistsException, ToolException {
 		// TODO Auto-generated method stub
@@ -409,18 +366,10 @@
 
 		// set ResourceToolContentHandler as null to avoid copy file node in
 		// repository again.
-		wookie = Wookie.newInstance(wookie, toolContentId, null);
-		wookie.setToolContentHandler(null);
+		wookie = Wookie.newInstance(wookie, toolContentId);
 		wookie.setWookieSessions(null);
 
-		Set<WookieAttachment> atts = wookie.getWookieAttachments();
-		for (WookieAttachment att : atts) {
-			att.setWookie(null);
-		}
 		try {
-			exportContentService.registerFileClassForExport(
-					WookieAttachment.class.getName(), "fileUuid",
-					"fileVersionId");
 			exportContentService.exportToolContent(toolContentId, wookie,
 					wookieToolContentHandler, rootPath);
 		} catch (ExportToolContentException e) {
@@ -439,10 +388,9 @@
 			String toolContentPath, String fromVersion, String toVersion)
 			throws ToolException {
 		try {
-			exportContentService.registerFileClassForImport(
-					WookieAttachment.class.getName(), "fileUuid",
-					"fileVersionId", "fileName", "fileType", null, null);
-
+		    // register version filter class
+		    exportContentService.registerImportVersionFilterClass(WookieContentVersionFilter.class);
+		
 			Object toolPOJO = exportContentService.importToolContent(
 					toolContentPath, wookieToolContentHandler, fromVersion,
 					toVersion);
@@ -592,8 +540,7 @@
 		Wookie defaultContent = getDefaultContent();
 		// create new wookie using the newContentID
 		Wookie newContent = new Wookie();
-		newContent = Wookie.newInstance(defaultContent, newContentID,
-				wookieToolContentHandler);
+		newContent = Wookie.newInstance(defaultContent, newContentID);
 		wookieDAO.saveOrUpdate(newContent);
 		return newContent;
 	}
@@ -634,38 +581,6 @@
 		return wookieUserDAO.getByUID(uid);
 	}
 
-	public WookieAttachment uploadFileToContent(Long toolContentId,
-			FormFile file, String type) {
-		if (file == null || StringUtils.isEmpty(file.getFileName())) {
-			throw new WookieException("Could not find upload file: " + file);
-		}
-
-		NodeKey nodeKey = processFile(file, type);
-
-		WookieAttachment attachment = new WookieAttachment(
-				nodeKey.getVersion(), type, file.getFileName(), nodeKey
-						.getUuid(), new Date());
-		return attachment;
-	}
-
-	public void deleteFromRepository(Long uuid, Long versionID)
-			throws WookieException {
-		ITicket ticket = getRepositoryLoginTicket();
-		try {
-			repositoryService.deleteVersion(ticket, uuid, versionID);
-		} catch (Exception e) {
-			throw new WookieException(
-					"Exception occured while deleting files from"
-							+ " the repository " + e.getMessage());
-		}
-	}
-
-	public void deleteInstructionFile(Long contentID, Long uuid,
-			Long versionID, String type) {
-		wookieDAO.deleteInstructionFile(contentID, uuid, versionID, type);
-
-	}
-
 	public void saveOrUpdateWookie(Wookie wookie) {
 		wookieDAO.saveOrUpdate(wookie);
 	}
@@ -684,72 +599,6 @@
 		return wookieUser;
 	}
 
-	public IAuditService getAuditService() {
-		return auditService;
-	}
-
-	public void setAuditService(IAuditService auditService) {
-		this.auditService = auditService;
-	}
-
-	private NodeKey processFile(FormFile file, String type) {
-		NodeKey node = null;
-		if (file != null && !StringUtils.isEmpty(file.getFileName())) {
-			String fileName = file.getFileName();
-			try {
-				node = getWookieToolContentHandler().uploadFile(
-						file.getInputStream(), fileName, file.getContentType(),
-						type);
-			} catch (InvalidParameterException e) {
-				throw new WookieException(
-						"InvalidParameterException occured while trying to upload File"
-								+ e.getMessage());
-			} catch (FileNotFoundException e) {
-				throw new WookieException(
-						"FileNotFoundException occured while trying to upload File"
-								+ e.getMessage());
-			} catch (RepositoryCheckedException e) {
-				throw new WookieException(
-						"RepositoryCheckedException occured while trying to upload File"
-								+ e.getMessage());
-			} catch (IOException e) {
-				throw new WookieException(
-						"IOException occured while trying to upload File"
-								+ e.getMessage());
-			}
-		}
-		return node;
-	}
-
-	/**
-	 * This method verifies the credentials of the SubmitFiles Tool and gives it
-	 * the <code>Ticket</code> to login and access the Content Repository.
-	 * 
-	 * A valid ticket is needed in order to access the content from the
-	 * repository. This method would be called evertime the tool needs to
-	 * upload/download files from the content repository.
-	 * 
-	 * @return ITicket The ticket for repostory access
-	 * @throws SubmitFilesException
-	 */
-	private ITicket getRepositoryLoginTicket() throws WookieException {
-		ICredentials credentials = new SimpleCredentials(
-				WookieToolContentHandler.repositoryUser,
-				WookieToolContentHandler.repositoryId);
-		try {
-			ITicket ticket = repositoryService.login(credentials,
-					WookieToolContentHandler.repositoryWorkspaceName);
-			return ticket;
-		} catch (AccessDeniedException ae) {
-			throw new WookieException("Access Denied to repository."
-					+ ae.getMessage());
-		} catch (WorkspaceNotFoundException we) {
-			throw new WookieException("Workspace not found." + we.getMessage());
-		} catch (LoginException e) {
-			throw new WookieException("Login failed." + e.getMessage());
-		}
-	}
-
 	public WookieConfigItem getConfigItem(String key) {
 		return wookieConfigItemDAO.getConfigItemByKey(key);
 	}
@@ -802,9 +651,6 @@
 		wookie.setInstructions(WebUtil.convertNewlines((String) importValues
 				.get(ToolContentImport102Manager.CONTENT_BODY)));
 		wookie.setLockOnFinished(Boolean.TRUE);
-		wookie.setOfflineInstructions(null);
-		wookie.setOnlineInstructions(null);
-		wookie.setRunOffline(Boolean.FALSE);
 		wookie.setTitle((String) importValues
 				.get(ToolContentImport102Manager.CONTENT_TITLE));
 		wookie.setToolContentId(toolContentId);
@@ -836,14 +682,6 @@
 	// =========================================================================================
 	/* ********** Used by Spring to "inject" the linked objects ************* */
 
-	public IWookieAttachmentDAO getWookieAttachmentDAO() {
-		return wookieAttachmentDAO;
-	}
-
-	public void setWookieAttachmentDAO(IWookieAttachmentDAO attachmentDAO) {
-		wookieAttachmentDAO = attachmentDAO;
-	}
-
 	public IWookieDAO getWookieDAO() {
 		return wookieDAO;
 	}
@@ -926,14 +764,6 @@
 		this.wookieConfigItemDAO = wookieConfigItemDAO;
 	}
 
-	public IRepositoryService getRepositoryService() {
-		return repositoryService;
-	}
-
-	public void setRepositoryService(IRepositoryService repositoryService) {
-		this.repositoryService = repositoryService;
-	}
-
 	public MessageService getMessageService() {
 		return messageService;
 	}
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java
===================================================================
diff -u -rccc06a304397824e204b7b52ce6e3361cee18bbd -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java	(.../WookieConstants.java)	(revision ccc06a304397824e204b7b52ce6e3361cee18bbd)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java	(.../WookieConstants.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -39,8 +39,6 @@
     public static final Integer SESSION_COMPLETED = new Integer(2);
 
     public static final String AUTHORING_DEFAULT_TAB = "1";
-    public static final String ATTACHMENT_LIST = "attachmentList";
-    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
     public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter";
     public static final String AUTH_SESSION_ID = "authoringSessionId";
 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java
===================================================================
diff -u -rfb5248530c656fdc6731a15e6493fa9050dfbebd -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision fb5248530c656fdc6731a15e6493fa9050dfbebd)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -46,7 +46,6 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.wookie.dto.WidgetDefinition;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
-import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment;
 import org.lamsfoundation.lams.tool.wookie.service.IWookieService;
 import org.lamsfoundation.lams.tool.wookie.service.WookieServiceProxy;
 import org.lamsfoundation.lams.tool.wookie.util.WookieConstants;
@@ -83,11 +82,6 @@
 	private static final String KEY_TOOL_CONTENT_ID = "toolContentID";
 	private static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
 	private static final String KEY_MODE = "mode";
-	private static final String KEY_ONLINE_FILES = "onlineFiles";
-	private static final String KEY_OFFLINE_FILES = "offlineFiles";
-	private static final String KEY_UNSAVED_ONLINE_FILES = "unsavedOnlineFiles";
-	private static final String KEY_UNSAVED_OFFLINE_FILES = "unsavedOfflineFiles";
-	private static final String KEY_DELETED_FILES = "deletedFiles";
 
 	/**
 	 * Default method when no dispatch parameter is specified. It is expected
@@ -286,27 +280,6 @@
 		// update wookie content using form inputs.
 		updateWookie(wookie, authForm, mode);
 
-		// remove attachments marked for deletion.
-		Set<WookieAttachment> attachments = wookie.getWookieAttachments();
-		if (attachments == null) {
-			attachments = new HashSet<WookieAttachment>();
-		}
-
-		for (WookieAttachment att : getAttList(
-				AuthoringAction.KEY_DELETED_FILES, map)) {
-			// remove from db, leave in repository
-			attachments.remove(att);
-		}
-
-		// add unsaved attachments
-		attachments.addAll(getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES,
-				map));
-		attachments.addAll(getAttList(
-				AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map));
-
-		// set attachments in case it didn't exist
-		wookie.setWookieAttachments(attachments);
-
 		// set the update date
 		wookie.setUpdateDate(new Date());
 
@@ -333,173 +306,8 @@
 		return mapping.findForward("success");
 	}
 
-	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return uploadFile(mapping, (AuthoringForm) form,
-				IToolContentHandler.TYPE_ONLINE, request);
-	}
-
-	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return uploadFile(mapping, (AuthoringForm) form,
-				IToolContentHandler.TYPE_OFFLINE, request);
-	}
-
-	public ActionForward deleteOnline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(mapping, (AuthoringForm) form,
-				IToolContentHandler.TYPE_ONLINE, request);
-	}
-
-	public ActionForward deleteOffline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(mapping, (AuthoringForm) form,
-				IToolContentHandler.TYPE_OFFLINE, request);
-	}
-
-	public ActionForward removeUnsavedOnline(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		return removeUnsaved(mapping, (AuthoringForm) form,
-				IToolContentHandler.TYPE_ONLINE, request);
-	}
-
-	public ActionForward removeUnsavedOffline(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		return removeUnsaved(mapping, (AuthoringForm) form,
-				IToolContentHandler.TYPE_OFFLINE, request);
-	}
-
 	/* ========== Private Methods ********** */
 
-	private ActionForward uploadFile(ActionMapping mapping,
-			AuthoringForm authForm, String type, HttpServletRequest request) {
-		SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-		FormFile file;
-		List<WookieAttachment> unsavedFiles;
-		List<WookieAttachment> savedFiles;
-		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			file = authForm.getOfflineFile();
-			unsavedFiles = getAttList(
-					AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
-
-			savedFiles = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-		} else {
-			file = authForm.getOnlineFile();
-			unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES,
-					map);
-
-			savedFiles = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-		}
-
-		// validate file max size
-		ActionMessages errors = new ActionMessages();
-		FileValidatorUtil.validateFileSize(file, true, errors);
-		if (!errors.isEmpty()) {
-			request.setAttribute(WookieConstants.ATTR_SESSION_MAP, map);
-			this.saveErrors(request, errors);
-			return mapping.findForward("success");
-		}
-
-		if (file.getFileName().length() != 0) {
-
-			// upload file to repository
-			WookieAttachment newAtt = wookieService.uploadFileToContent(
-					(Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID), file,
-					type);
-
-			// Add attachment to unsavedFiles
-			// check to see if file with same name exists
-			WookieAttachment currAtt;
-			Iterator<WookieAttachment> iter = savedFiles.iterator();
-			while (iter.hasNext()) {
-				currAtt = (WookieAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())
-						&& StringUtils.equals(currAtt.getFileType(), newAtt
-								.getFileType())) {
-					// move from this this list to deleted list.
-					getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(
-							currAtt);
-					iter.remove();
-					break;
-				}
-			}
-			unsavedFiles.add(newAtt);
-
-			request.setAttribute(WookieConstants.ATTR_SESSION_MAP, map);
-			request.setAttribute("unsavedChanges", new Boolean(true));
-		}
-		return mapping.findForward("success");
-	}
-
-	private ActionForward deleteFile(ActionMapping mapping,
-			AuthoringForm authForm, String type, HttpServletRequest request) {
-		SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-		List<WookieAttachment> fileList;
-		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			fileList = getAttList(AuthoringAction.KEY_OFFLINE_FILES, map);
-		} else {
-			fileList = getAttList(AuthoringAction.KEY_ONLINE_FILES, map);
-		}
-
-		Iterator<WookieAttachment> iter = fileList.iterator();
-
-		while (iter.hasNext()) {
-			WookieAttachment att = (WookieAttachment) iter.next();
-
-			if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-				// move to delete file list, deleted at next updateContent
-				getAttList(AuthoringAction.KEY_DELETED_FILES, map).add(att);
-
-				// remove from this list
-				iter.remove();
-				break;
-			}
-		}
-
-		request.setAttribute(WookieConstants.ATTR_SESSION_MAP, map);
-		request.setAttribute("unsavedChanges", new Boolean(true));
-
-		return mapping.findForward("success");
-	}
-
-	private ActionForward removeUnsaved(ActionMapping mapping,
-			AuthoringForm authForm, String type, HttpServletRequest request) {
-		SessionMap<String, Object> map = getSessionMap(request, authForm);
-
-		List<WookieAttachment> unsavedFiles;
-
-		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			unsavedFiles = getAttList(
-					AuthoringAction.KEY_UNSAVED_OFFLINE_FILES, map);
-		} else {
-			unsavedFiles = getAttList(AuthoringAction.KEY_UNSAVED_ONLINE_FILES,
-					map);
-		}
-
-		Iterator<WookieAttachment> iter = unsavedFiles.iterator();
-		while (iter.hasNext()) {
-			WookieAttachment att = (WookieAttachment) iter.next();
-
-			if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
-				// delete from repository and list
-				wookieService.deleteFromRepository(att.getFileUuid(), att
-						.getFileVersionId());
-				iter.remove();
-				break;
-			}
-		}
-
-		request.setAttribute(WookieConstants.ATTR_SESSION_MAP, map);
-		request.setAttribute("unsavedChanges", new Boolean(true));
-
-		return mapping.findForward("success");
-	}
-
 	/**
 	 * Updates Wookie content using AuthoringForm inputs.
 	 * 
@@ -512,8 +320,6 @@
 		wookie.setTitle(authForm.getTitle());
 		wookie.setInstructions(authForm.getInstructions());
 		if (mode.isAuthor()) { // Teacher cannot modify following
-			wookie.setOfflineInstructions(authForm.getOnlineInstruction());
-			wookie.setOnlineInstructions(authForm.getOfflineInstruction());
 			wookie.setLockOnFinished(authForm.isLockOnFinished());
 			wookie.setReflectOnActivity(authForm.isReflectOnActivity());
 			wookie.setReflectInstructions(authForm.getReflectInstructions());
@@ -535,8 +341,6 @@
 	private void updateAuthForm(AuthoringForm authForm, Wookie wookie) {
 		authForm.setTitle(wookie.getTitle());
 		authForm.setInstructions(wookie.getInstructions());
-		authForm.setOnlineInstruction(wookie.getOnlineInstructions());
-		authForm.setOfflineInstruction(wookie.getOfflineInstructions());
 		authForm.setLockOnFinished(wookie.isLockOnFinished());
 		authForm.setReflectOnActivity(wookie.isReflectOnActivity());
 		authForm.setReflectInstructions(wookie.getReflectInstructions());
@@ -563,32 +367,7 @@
 		map.put(AuthoringAction.KEY_MODE, mode);
 		map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
 		map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
-		map.put(AuthoringAction.KEY_ONLINE_FILES,
-				new LinkedList<WookieAttachment>());
-		map.put(AuthoringAction.KEY_OFFLINE_FILES,
-				new LinkedList<WookieAttachment>());
-		map.put(AuthoringAction.KEY_UNSAVED_ONLINE_FILES,
-				new LinkedList<WookieAttachment>());
-		map.put(AuthoringAction.KEY_UNSAVED_OFFLINE_FILES,
-				new LinkedList<WookieAttachment>());
-		map.put(AuthoringAction.KEY_DELETED_FILES,
-				new LinkedList<WookieAttachment>());
 
-		Iterator<WookieAttachment> iter = wookie.getWookieAttachments()
-				.iterator();
-		while (iter.hasNext()) {
-			WookieAttachment attachment = (WookieAttachment) iter.next();
-			String type = attachment.getFileType();
-			if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-				getAttList(AuthoringAction.KEY_OFFLINE_FILES, map).add(
-						attachment);
-			}
-			if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-				getAttList(AuthoringAction.KEY_ONLINE_FILES, map).add(
-						attachment);
-			}
-		}
-
 		return map;
 	}
 
@@ -612,20 +391,6 @@
 	}
 
 	/**
-	 * Retrieves a List of attachments from the map using the key.
-	 * 
-	 * @param key
-	 * @param map
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	private List<WookieAttachment> getAttList(String key,
-			SessionMap<String, Object> map) {
-		List<WookieAttachment> list = (List<WookieAttachment>) map.get(key);
-		return list;
-	}
-
-	/**
 	 * Retrieve the SessionMap from the HttpSession.
 	 * 
 	 * @param request
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -75,7 +75,6 @@
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm"
  * @struts.action-forward name="wookie" path="tiles:/learning/main"
- * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  * @struts.action-forward name="notebook" path="/pages/learning/notebook.jsp"
  */
@@ -133,11 +132,6 @@
 	
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
 		.getServletContext());
-	
-	// check runOffline
-	if (wookie.isRunOffline()) {
-	    return mapping.findForward("runOffline");
-	}
 
 	// get the user
 	WookieUser wookieUser;
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -81,13 +81,6 @@
     
     String mode;
     
-    // flag of this item has attachment or not
-    private boolean hasFile;
-    private Long fileUuid;
-    private Long fileVersionId;
-    private String fileName;
-    private FormFile file;
-    
     // Wookie widget paramerters
     String widgetAuthorUrl;
     Integer widgetHeight;
@@ -208,46 +201,6 @@
         this.reflectOnActivity = reflectOnActivity;
     }
 
-    public boolean isHasFile() {
-        return hasFile;
-    }
-
-    public void setHasFile(boolean hasFile) {
-        this.hasFile = hasFile;
-    }
-
-    public Long getFileUuid() {
-        return fileUuid;
-    }
-
-    public void setFileUuid(Long fileUuid) {
-        this.fileUuid = fileUuid;
-    }
-
-    public Long getFileVersionId() {
-        return fileVersionId;
-    }
-
-    public void setFileVersionId(Long fileVersionId) {
-        this.fileVersionId = fileVersionId;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public FormFile getFile() {
-        return file;
-    }
-
-    public void setFile(FormFile file) {
-        this.file = file;
-    }
-
     public String getContentFolderID() {
         return contentFolderID;
     }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java
===================================================================
diff -u -rb33e717f9a734d318eefab07a17234f07c770c92 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision b33e717f9a734d318eefab07a17234f07c770c92)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -87,30 +87,6 @@
 	return FILENAME;
     }
 
-    protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
-	    Cookie[] cookies) {
-	if (toolContentID == null && toolSessionID == null) {
-	    logger.error("Tool content Id or and session Id are null. Unable to activity title");
-	} else {
-	    if (wookieService == null) {
-		wookieService = WookieServiceProxy.getWookieService(getServletContext());
-	    }
-
-	    Wookie content = null;
-	    if (toolContentID != null) {
-		content = wookieService.getWookieByContentId(toolContentID);
-	    } else {
-		WookieSession session = wookieService.getSessionBySessionId(toolSessionID);
-		if (session != null)
-		    content = session.getWookie();
-	    }
-	    if (content != null) {
-		activityTitle = content.getTitle();
-	    }
-	}
-	return super.doOfflineExport(request, response, directoryName, cookies);
-    }
-
     private void doLearnerExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
 	    Cookie[] cookies) throws WookieException {
 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml
===================================================================
diff -u -r08622dbb2e6672584f1cfcb52a239a46b3d667b1 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	(.../wookieApplicationContext.xml)	(revision 08622dbb2e6672584f1cfcb52a239a46b3d667b1)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	(.../wookieApplicationContext.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -26,19 +26,16 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.tool.wookie.service.WookieService">
-				<property name="wookieAttachmentDAO"><ref bean="wookieAttachmentDAO"/></property>
 				<property name="wookieSessionDAO"><ref bean="wookieSessionDAO"/></property>
 				<property name="wookieUserDAO"><ref bean="wookieUserDAO"/></property>
 				<property name="wookieConfigItemDAO"><ref bean="wookieConfigItemDAO"/></property>
 				<property name="wookieDAO"><ref bean="wookieDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="wookieToolContentHandler"><ref bean="wookieToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="wookieOutputFactory"><ref bean="wookieOutputFactory"/></property>
-		   		<property name="repositoryService"><ref bean="repositoryService" /></property>
 		   		<property name="messageService"><ref bean="wookieMessageService"/></property>
 		   		<property name="userManagementService"><ref bean="userManagementService"/></property>
 			</bean>
@@ -54,8 +51,6 @@
 				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="add*">PROPAGATION_REQUIRED</prop>
 				<prop key="leaveToolSession">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsDefineLater">PROPAGATION_REQUIRED</prop>
-                <prop key="setAsRunOffline">PROPAGATION_REQUIRED</prop>
                 <prop key="exportToolSession">PROPAGATION_REQUIRED</prop>
 
 				<prop key="importToolContent">PROPAGATION_REQUIRED</prop>
@@ -79,10 +74,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="wookieAttachmentDAO" class="org.lamsfoundation.lams.tool.wookie.dao.hibernate.WookieAttachmentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
  	<bean id="wookieToolContentHandler" class="org.lamsfoundation.lams.tool.wookie.util.WookieToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
Index: lams_tool_wookie/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_wookie/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -86,10 +86,6 @@
 	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/wookie.jsp" />
 	</definition>
-
-	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/runOffline.jsp" />
-	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
Index: lams_tool_wookie/web/includes/javascript/authoring.js
===================================================================
diff -u -r857f9a4afbdb784f3cd9508d1eeec864e368f221 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
+++ lams_tool_wookie/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -17,8 +17,3 @@
 	document.authoringForm.dispatch.value = method;
 	document.authoringForm.submit();
 }
-function deleteAttachment(dispatch, uuid) {
-	document.authoringForm.dispatch.value = dispatch;
-	document.authoringForm.deleteFileUuid.value = uuid;
-	document.authoringForm.submit();
-}
Index: lams_tool_wookie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -6,9 +6,7 @@
 <html:form action="/authoring" styleId="authoringForm" method="post"
 	enctype="multipart/form-data">
 
-	<c:set var="formBean"
-		value="<%=request
-										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 
 	<c:set var="defineLater" value="no" />
@@ -23,7 +21,6 @@
 			<lams:Tab id="1" key="button.basic" />
 			<c:if test="${sessionMap.mode == 'author'}">
 				<lams:Tab id="2" key="button.advanced" />
-				<lams:Tab id="3" key="button.instructions" />
 			</c:if>
 		</lams:Tabs>
 
@@ -39,9 +36,6 @@
 		<html:hidden property="contentFolderID" />
 		
 		<div id="message" style="text-align: center;">
-			<c:if test="${unsavedChanges}">
-				<fmt:message key="message.unsavedChanges" />
-			</c:if>
 			<logic:messagesPresent>
 				<p class="warning">
 				        <html:messages id="error">
@@ -51,15 +45,12 @@
 			</logic:messagesPresent>			
 		</div>
 
-		<lams:help toolSignature="<%=WookieConstants.TOOL_SIGNATURE%>"
-			module="authoring" />
+		<lams:help toolSignature="<%=WookieConstants.TOOL_SIGNATURE%>" module="authoring" />
 
 		<%-- Page tabs --%>
 		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 		<c:if test="${sessionMap.mode == 'author'}">
 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.instructions"
-				page="instructions.jsp" />
 		</c:if>
 
 		<lams:AuthoringButton formID="authoringForm"
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/learning/runOffline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8b97231e320c0c5b674f07c14da711f232ba9e1c refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/monitoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r8b97231e320c0c5b674f07c14da711f232ba9e1c
--- lams_tool_wookie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
@@ -4,9 +4,8 @@
 <div id="header">
 	<lams:Tabs>
 		<lams:Tab id="1" key="button.summary" />
-		<lams:Tab id="2" key="button.instructions" />
-		<lams:Tab id="3" key="button.editActivity" />
-		<lams:Tab id="4" key="button.statistics" />
+		<lams:Tab id="2" key="button.editActivity" />
+		<lams:Tab id="3" key="button.statistics" />
 	</lams:Tabs>
 	<script type="text/javascript">
 		var initialTabId = "${wookieDTO.currentTab}";
@@ -17,9 +16,8 @@
 	<lams:help toolSignature="<%= WookieConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 
 	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.instructions" page="instructions.jsp" />
-	<lams:TabBody id="3" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="4" titleKey="button.statistics" page="statistics.jsp" />
+	<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+	<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
 </div>
 
 <div id="footer"></div>